Skip to content

Commit

Permalink
Merge pull request #18979 from serathius/fix-gofump
Browse files Browse the repository at this point in the history
Fix gofump error due to merge race
  • Loading branch information
serathius authored Dec 1, 2024
2 parents 278a9a2 + 093df6f commit 3d46df1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion server/etcdserver/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -1197,7 +1197,7 @@ func (s *EtcdServer) ForceSnapshot() {
}

func (s *EtcdServer) snapshotIfNeededAndCompactRaftLog(ep *etcdProgress) {
//TODO: Remove disk snapshot in v3.7
// TODO: Remove disk snapshot in v3.7
shouldSnapshotToDisk := s.shouldSnapshotToDisk(ep)
shouldSnapshotToMemory := s.shouldSnapshotToMemory(ep)
if !shouldSnapshotToDisk && !shouldSnapshotToMemory {
Expand Down

0 comments on commit 3d46df1

Please sign in to comment.