From 157d92daf7df52c1d69cb90f4dace1f251fbe1bc Mon Sep 17 00:00:00 2001 From: "R.I.Pienaar" Date: Thu, 25 Feb 2021 12:57:41 +0100 Subject: [PATCH] ensure sources and mirror info is in clustered stream list Signed-off-by: R.I.Pienaar --- server/jetstream_api.go | 2 +- server/jetstream_cluster.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/jetstream_api.go b/server/jetstream_api.go index 2f4922fb..a983c342 100644 --- a/server/jetstream_api.go +++ b/server/jetstream_api.go @@ -1353,7 +1353,7 @@ func (s *Server) jsStreamListRequest(sub *subscription, c *client, subject, repl } for _, mset := range msets[offset:] { - resp.Streams = append(resp.Streams, &StreamInfo{Created: mset.createdTime(), State: mset.state(), Config: mset.config()}) + resp.Streams = append(resp.Streams, &StreamInfo{Created: mset.createdTime(), State: mset.state(), Config: mset.config(), Mirror: mset.mirrorInfo(), Sources: mset.sourcesInfo()}) if len(resp.Streams) >= JSApiListLimit { break } diff --git a/server/jetstream_cluster.go b/server/jetstream_cluster.go index 39dd9a8f..0dd81a13 100644 --- a/server/jetstream_cluster.go +++ b/server/jetstream_cluster.go @@ -1549,7 +1549,7 @@ func (js *jetStream) processStreamLeaderChange(mset *stream, isLeader bool) { resp.Error = jsError(err) s.sendAPIErrResponse(client, acc, subject, reply, _EMPTY_, s.jsonResponse(&resp)) } else { - resp.StreamInfo = &StreamInfo{Created: mset.createdTime(), State: mset.state(), Config: mset.config(), Cluster: js.clusterInfo(mset.raftGroup())} + resp.StreamInfo = &StreamInfo{Created: mset.createdTime(), State: mset.state(), Config: mset.config(), Cluster: js.clusterInfo(mset.raftGroup()), Sources: mset.sourcesInfo(), Mirror: mset.mirrorInfo()} s.sendAPIResponse(client, acc, subject, reply, _EMPTY_, s.jsonResponse(&resp)) if node := mset.raftNode(); node != nil { mset.sendCreateAdvisory() @@ -1831,7 +1831,7 @@ func (js *jetStream) processClusterUpdateStream(acc *Account, sa *streamAssignme resp.Error = jsError(err) s.sendAPIErrResponse(client, acc, subject, reply, _EMPTY_, s.jsonResponse(&resp)) } else { - resp.StreamInfo = &StreamInfo{Created: mset.createdTime(), State: mset.state(), Config: mset.config(), Cluster: js.clusterInfo(mset.raftGroup())} + resp.StreamInfo = &StreamInfo{Created: mset.createdTime(), State: mset.state(), Config: mset.config(), Cluster: js.clusterInfo(mset.raftGroup()), Mirror: mset.mirrorInfo(), Sources: mset.sourcesInfo()} s.sendAPIResponse(client, acc, subject, reply, _EMPTY_, s.jsonResponse(&resp)) } } @@ -4065,7 +4065,7 @@ func (mset *stream) handleClusterStreamInfoRequest(sub *subscription, c *client, s, js, config := mset.srv, mset.srv.js, mset.cfg mset.mu.RUnlock() - si := &StreamInfo{Created: mset.createdTime(), State: mset.state(), Config: config, Cluster: js.clusterInfo(mset.raftGroup())} + si := &StreamInfo{Created: mset.createdTime(), State: mset.state(), Config: config, Cluster: js.clusterInfo(mset.raftGroup()), Sources: mset.sourcesInfo(), Mirror: mset.mirrorInfo()} b, _ := json.Marshal(si) s.sendInternalMsgLocked(reply, _EMPTY_, nil, b) }