Shut down RAFT groups when disabling JetStream

Signed-off-by: Neil Twigg <neil@nats.io>

server/jetstream.go

@@ -578,6 +578,9 @@ func (s *Server) DisableJetStream() error {
 	// Normal shutdown.
 	s.shutdownJetStream()
 
+	// Shut down the RAFT groups.
+	s.shutdownRaftNodes()
+
 	return nil
 }
 

server/jetstream_cluster_3_test.go

@@ -3364,3 +3364,42 @@ func TestNoRaceJetStreamClusterDifferentRTTInterestBasedStreamPreAck(t *testing.
 	})
 
 }
+
+func TestJetStreamInterestLeakOnDisableJetStream(t *testing.T) {
+	c := createJetStreamClusterExplicit(t, "R3S", 3)
+	defer c.shutdown()
+
+	nc, js := jsClientConnect(t, c.leader())
+	defer nc.Close()
+
+	for i := 1; i <= 5; i++ {
+		_, err := js.AddStream(&nats.StreamConfig{
+			Name:     fmt.Sprintf("test_%d", i),
+			Subjects: []string{fmt.Sprintf("test_%d", i)},
+			Replicas: 3,
+		})
+		require_NoError(t, err)
+	}
+
+	c.waitOnAllCurrent()
+
+	server := c.randomNonLeader()
+	account := server.SystemAccount()
+
+	server.DisableJetStream()
+
+	var sublist []*subscription
+	account.sl.localSubs(&sublist, false)
+
+	var danglingJSC, danglingRaft int
+	for _, sub := range sublist {
+		if strings.HasPrefix(string(sub.subject), "$JSC.") {
+			danglingJSC++
+		} else if strings.HasPrefix(string(sub.subject), "$NRG.") {
+			danglingRaft++
+		}
+	}
+	if danglingJSC > 0 || danglingRaft > 0 {
+		t.Fatalf("unexpected dangling interests for JetStream assets after shutdown (%d $JSC, %d $NRG)", danglingJSC, danglingRaft)
+	}
+}

server/tmp/jetstream/meta.key

@@ -0,0 +1,2 @@
+���&��I1
gID>��
+A5[��R�q�XӖ�T�&�pl3�I�R�ke~b�hy�GQ��v��

server/tmp/jetstream/meta.sum

@@ -0,0 +1 @@
+3f9c23e7cce9ee35

server/tmp/jetstream/msgs/1.idx

@@ -0,0 +1 @@
+��}X,a��mC�8~�gg����Ү�)5r
4�

server/tmp/jetstream/msgs/1.key

@@ -0,0 +1 @@
+�$�Ž��#)��'H[F8WG@"3B�I��r\��}$LŲv��e�ڕ�������:��`��k

server/tmp/jetstream/obs/go-audit-api-aws/meta.key

@@ -0,0 +1 @@
+c���o����&�VؔvM}�]�WY9
s&�ËJSҖ�:��þ���Px溝g��$�sp��b��

server/tmp/jetstream/obs/go-audit-api-aws/meta.sum

@@ -0,0 +1 @@
+97ea54aec05fe45b

server/tmp/meta.key

@@ -0,0 +1 @@
+�`��-�"�}��.b�x8���K�j�Ux�ʠ��A�l���&^
B���?;o�����W�`�

server/tmp/meta.sum

@@ -0,0 +1 @@
+caa90bff1c2219ef

server/tmp/msgs/1.idx

@@ -0,0 +1 @@
+����6^-0�N}RjJ�r��jR@ED��

server/tmp/obs/go-audit-api-aws/meta.key

@@ -0,0 +1 @@
+]��۔P�Xh_(��(�ҋgܼcN"�9g^o�ʼƙ�f4�B�vT�(E��LH�Y�(�)b�d�<��

server/tmp/obs/go-audit-api-aws/meta.sum

@@ -0,0 +1 @@
+f81861c12a306979