From 4a5b76b0e840a4b335beb755307d385014e71d69 Mon Sep 17 00:00:00 2001 From: Derek Collison Date: Sun, 3 Sep 2023 13:28:18 -0700 Subject: [PATCH] Print out restore time for streams to nearest millisecond. Signed-off-by: Derek Collison --- server/jetstream.go | 4 +++- server/jetstream_api.go | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server/jetstream.go b/server/jetstream.go index ce4ae376..686ffdf4 100644 --- a/server/jetstream.go +++ b/server/jetstream.go @@ -1311,6 +1311,7 @@ func (a *Account) EnableJetStream(limits map[string]JetStreamAccountLimits) erro } s.Noticef(" Starting restore for stream '%s > %s'", a.Name, cfg.StreamConfig.Name) + rt := time.Now() // Log if we are converting from plaintext to encrypted. if encrypted { @@ -1341,7 +1342,8 @@ func (a *Account) EnableJetStream(limits map[string]JetStreamAccountLimits) erro } state := mset.state() - s.Noticef(" Restored %s messages for stream '%s > %s'", comma(int64(state.Msgs)), mset.accName(), mset.name()) + s.Noticef(" Restored %s messages for stream '%s > %s' in %v", + comma(int64(state.Msgs)), mset.accName(), mset.name(), time.Since(rt).Round(time.Millisecond)) // Collect to check for dangling messages. // TODO(dlc) - Can be removed eventually. diff --git a/server/jetstream_api.go b/server/jetstream_api.go index e66e94ab..52ebb733 100644 --- a/server/jetstream_api.go +++ b/server/jetstream_api.go @@ -3468,7 +3468,7 @@ func (s *Server) processStreamRestore(ci *ClientInfo, acc *Account, cfg *StreamC TimeStamp: time.Now().UTC(), } s.Noticef("Completed restore of %s for stream '%s > %s' in %v", - friendlyBytes(int64(total)), streamName, acc.Name, end.Sub(start)) + friendlyBytes(int64(total)), streamName, acc.Name, end.Sub(start).Round(time.Millisecond)) } // On the last EOF, send back the stream info or error status.