gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-16 19:14:41 -07:00
Code Issues Packages Projects Releases Wiki Activity

Prep for restore config override

Browse Source 
Signed-off-by: Derek Collison <derek@nats.io>
This commit is contained in:
Derek Collison
2021-02-28 05:15:38 -08:00
parent f5cbd55b46
commit 09467bd9ae
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/jetstream_api.go
View File

@@ -2237,6 +2237,10 @@ func (s *Server) jsStreamRestoreRequest(sub *subscription, c *client, subject, r
stream := streamNameFromSubject(subject)
if stream != req.Config.Name {
req.Config.Name = stream
}
if s.JetStreamIsClustered() {
s.jsClusteredStreamRestoreRequest(ci, acc, &req, stream, subject, reply, rmsg)
return
@@ -2248,10 +2252,10 @@ func (s *Server) jsStreamRestoreRequest(sub *subscription, c *client, subject, r
return
}
s.processStreamRestore(ci, acc, stream, subject, reply, string(msg))
s.processStreamRestore(ci, acc, &req.Config, subject, reply, string(msg))
}
func (s *Server) processStreamRestore(ci *ClientInfo, acc *Account, streamName, subject, reply, msg string) <-chan error {
func (s *Server) processStreamRestore(ci *ClientInfo, acc *Account, cfg *StreamConfig, subject, reply, msg string) <-chan error {
var resp = JSApiStreamRestoreResponse{ApiResponse: ApiResponse{Type: JSApiStreamRestoreResponseType}}
// FIXME(dlc) - Need to close these up if we fail for some reason.
@@ -2263,6 +2267,7 @@ func (s *Server) processStreamRestore(ci *ClientInfo, acc *Account, streamName,
return nil
}
streamName := cfg.Name
s.Noticef("Starting restore for stream '%s > %s'", acc.Name, streamName)
start := time.Now()