gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-17 03:24:40 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1424 from nats-io/fix_1421

Browse Source 
[FIXED] Possible removal of interest on queue subs with leaf nodes
This commit is contained in:
Ivan Kozlovic
2020-05-28 11:16:28 -06:00
committed by GitHub
parent 5512b45cba e9805a3109
commit 5d949bf1ea
3 changed files with 58 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/client.go
View File

@@ -3975,6 +3975,7 @@ func (c *client) teardownConn() {
// Update route as normal for a normal subscriber.
if sub.queue == nil {
srv.updateRouteSubscriptionMap(acc, sub, -1)
srv.updateLeafNodes(acc, sub, -1)
} else {
// We handle queue subscribers special in case we
// have a bunch we can just send one update to the
@@ -3989,8 +3990,6 @@ func (c *client) teardownConn() {
if srv.gateway.enabled {
srv.gatewayUpdateSubInterest(acc.Name, sub, -1)
}
// Now check on leafnode updates.
srv.updateLeafNodes(acc, sub, -1)
}
// Process any qsubs here.
for _, esub := range qsubs {

12
server/server_test.go
View File

@@ -1395,7 +1395,7 @@ func TestConnectErrorReports(t *testing.T) {
defer s.Shutdown()
// Wait long enough for the number of recurring attempts to happen
time.Sleep(10 * routeConnectDelay)
time.Sleep(50 * routeConnectDelay)
s.Shutdown()
content, err := ioutil.ReadFile(log)
@@ -1444,7 +1444,7 @@ func TestConnectErrorReports(t *testing.T) {
defer s.Shutdown()
// Wait long enough for the number of recurring attempts to happen
time.Sleep(10 * opts.LeafNode.ReconnectInterval)
time.Sleep(50 * opts.LeafNode.ReconnectInterval)
s.Shutdown()
content, err = ioutil.ReadFile(log)
@@ -1494,7 +1494,7 @@ func TestConnectErrorReports(t *testing.T) {
defer s.Shutdown()
// Wait long enough for the number of recurring attempts to happen
time.Sleep(10 * gatewayConnectDelay)
time.Sleep(50 * gatewayConnectDelay)
s.Shutdown()
content, err = ioutil.ReadFile(log)
@@ -1569,7 +1569,7 @@ func TestReconnectErrorReports(t *testing.T) {
cs.Shutdown()
// Wait long enough for the number of recurring attempts to happen
time.Sleep(DEFAULT_ROUTE_RECONNECT + 15*routeConnectDelay)
time.Sleep(DEFAULT_ROUTE_RECONNECT + 50*routeConnectDelay)
s.Shutdown()
content, err := ioutil.ReadFile(log)
@@ -1636,7 +1636,7 @@ func TestReconnectErrorReports(t *testing.T) {
cs.Shutdown()
// Wait long enough for the number of recurring attempts to happen
time.Sleep(opts.LeafNode.ReconnectInterval + 15*opts.LeafNode.ReconnectInterval)
time.Sleep(50 * opts.LeafNode.ReconnectInterval)
s.Shutdown()
content, err = ioutil.ReadFile(log)
@@ -1699,7 +1699,7 @@ func TestReconnectErrorReports(t *testing.T) {
cs.Shutdown()
// Wait long enough for the number of recurring attempts to happen
time.Sleep(2*gatewayReconnectDelay + 15*gatewayConnectDelay)
time.Sleep(50 * gatewayConnectDelay)
s.Shutdown()
content, err = ioutil.ReadFile(log)