mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-01-06 13:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

statesync: convert snapshot hashes to hex strings for logging (#9471)

Browse Source
This commit is contained in:
Callum Waters
2022-09-26 17:58:52 +02:00
committed by GitHub
parent ed68aadd2b
commit af5281d704
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
statesync/syncer.go
View File

@@ -117,7 +117,7 @@ func (s *syncer) AddSnapshot(peer p2p.Peer, snapshot *snapshot) (bool, error) {
} }
if added { if added {
s.logger.Info("Discovered new snapshot", "height", snapshot.Height, "format", snapshot.Format, s.logger.Info("Discovered new snapshot", "height", snapshot.Height, "format", snapshot.Format,
"hash", snapshot.Hash) "hash", log.NewLazySprintf("%X", snapshot.Hash))
} }
return added, nil return added, nil
} }
@@ -144,7 +144,7 @@ func (s *syncer) SyncAny(discoveryTime time.Duration, retryHook func()) (sm.Stat
} }
if discoveryTime > 0 { if discoveryTime > 0 {
s.logger.Info("sync any", "msg", log.NewLazySprintf("Discovering snapshots for %v", discoveryTime)) s.logger.Info("Discovering snapshots", "discoverTime", discoveryTime)
time.Sleep(discoveryTime) time.Sleep(discoveryTime)
} }
@@ -189,18 +189,18 @@ func (s *syncer) SyncAny(discoveryTime time.Duration, retryHook func()) (sm.Stat
case errors.Is(err, errRetrySnapshot): case errors.Is(err, errRetrySnapshot):
chunks.RetryAll() chunks.RetryAll()
s.logger.Info("Retrying snapshot", "height", snapshot.Height, "format", snapshot.Format, s.logger.Info("Retrying snapshot", "height", snapshot.Height, "format", snapshot.Format,
"hash", snapshot.Hash) "hash", log.NewLazySprintf("%X", snapshot.Hash))
continue continue
case errors.Is(err, errTimeout): case errors.Is(err, errTimeout):
s.snapshots.Reject(snapshot) s.snapshots.Reject(snapshot)
s.logger.Error("Timed out waiting for snapshot chunks, rejected snapshot", s.logger.Error("Timed out waiting for snapshot chunks, rejected snapshot",
"height", snapshot.Height, "format", snapshot.Format, "hash", snapshot.Hash) "height", snapshot.Height, "format", snapshot.Format, "hash", log.NewLazySprintf("%X", snapshot.Hash))
case errors.Is(err, errRejectSnapshot): case errors.Is(err, errRejectSnapshot):
s.snapshots.Reject(snapshot) s.snapshots.Reject(snapshot)
s.logger.Info("Snapshot rejected", "height", snapshot.Height, "format", snapshot.Format, s.logger.Info("Snapshot rejected", "height", snapshot.Height, "format", snapshot.Format,
"hash", snapshot.Hash) "hash", log.NewLazySprintf("%X", snapshot.Hash))
case errors.Is(err, errRejectFormat): case errors.Is(err, errRejectFormat):
s.snapshots.RejectFormat(snapshot.Format) s.snapshots.RejectFormat(snapshot.Format)
@@ -208,7 +208,7 @@ func (s *syncer) SyncAny(discoveryTime time.Duration, retryHook func()) (sm.Stat
case errors.Is(err, errRejectSender): case errors.Is(err, errRejectSender):
s.logger.Info("Snapshot senders rejected", "height", snapshot.Height, "format", snapshot.Format, s.logger.Info("Snapshot senders rejected", "height", snapshot.Height, "format", snapshot.Format,
"hash", snapshot.Hash) "hash", log.NewLazySprintf("%X", snapshot.Hash))
for _, peer := range s.snapshots.GetPeers(snapshot) { for _, peer := range s.snapshots.GetPeers(snapshot) {
s.snapshots.RejectPeer(peer.ID()) s.snapshots.RejectPeer(peer.ID())
s.logger.Info("Snapshot sender rejected", "peer", peer.ID()) s.logger.Info("Snapshot sender rejected", "peer", peer.ID())
@@ -308,7 +308,7 @@ func (s *syncer) Sync(snapshot *snapshot, chunks *chunkQueue) (sm.State, *types.
// Done! 🎉 // Done! 🎉
s.logger.Info("Snapshot restored", "height", snapshot.Height, "format", snapshot.Format, s.logger.Info("Snapshot restored", "height", snapshot.Height, "format", snapshot.Format,
"hash", snapshot.Hash) "hash", log.NewLazySprintf("%X", snapshot.Hash))
return state, commit, nil return state, commit, nil
} }
@@ -317,7 +317,7 @@ func (s *syncer) Sync(snapshot *snapshot, chunks *chunkQueue) (sm.State, *types.
// response, or nil if the snapshot was accepted. // response, or nil if the snapshot was accepted.
func (s *syncer) offerSnapshot(snapshot *snapshot) error { func (s *syncer) offerSnapshot(snapshot *snapshot) error {
s.logger.Info("Offering snapshot to ABCI app", "height", snapshot.Height, s.logger.Info("Offering snapshot to ABCI app", "height", snapshot.Height,
"format", snapshot.Format, "hash", snapshot.Hash) "format", snapshot.Format, "hash", log.NewLazySprintf("%X", snapshot.Hash))
resp, err := s.conn.OfferSnapshotSync(abci.RequestOfferSnapshot{ resp, err := s.conn.OfferSnapshotSync(abci.RequestOfferSnapshot{
Snapshot: &abci.Snapshot{ Snapshot: &abci.Snapshot{
Height: snapshot.Height, Height: snapshot.Height,
@@ -334,7 +334,7 @@ func (s *syncer) offerSnapshot(snapshot *snapshot) error {
switch resp.Result { switch resp.Result {
case abci.ResponseOfferSnapshot_ACCEPT: case abci.ResponseOfferSnapshot_ACCEPT:
s.logger.Info("Snapshot accepted, restoring", "height", snapshot.Height, s.logger.Info("Snapshot accepted, restoring", "height", snapshot.Height,
"format", snapshot.Format, "hash", snapshot.Hash) "format", snapshot.Format, "hash", log.NewLazySprintf("%X", snapshot.Hash))
return nil return nil
case abci.ResponseOfferSnapshot_ABORT: case abci.ResponseOfferSnapshot_ABORT:
return errAbort return errAbort
@@ -462,7 +462,7 @@ func (s *syncer) requestChunk(snapshot *snapshot, chunk uint32) {
peer := s.snapshots.GetPeer(snapshot) peer := s.snapshots.GetPeer(snapshot)
if peer == nil { if peer == nil {
s.logger.Error("No valid peers found for snapshot", "height", snapshot.Height, s.logger.Error("No valid peers found for snapshot", "height", snapshot.Height,
"format", snapshot.Format, "hash", snapshot.Hash) "format", snapshot.Format, "hash", log.NewLazySprintf("%X", snapshot.Hash))
return return
} }
s.logger.Debug("Requesting snapshot chunk", "height", snapshot.Height, s.logger.Debug("Requesting snapshot chunk", "height", snapshot.Height,