Revert "etcdserver: a non-empty raft log snapshot should always be av…

…ailable" This reverts commit a0c0639.
etcd-io · Aug 25, 2024 · 86dc7a7 · 86dc7a7
1 parent a0c0639
commit 86dc7a7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 82 deletions.
diff --git a/server/etcdserver/server.go b/server/etcdserver/server.go
@@ -1210,10 +1210,7 @@ func (s *EtcdServer) triggerSnapshot(ep *etcdProgress) {
 }
 
 func (s *EtcdServer) shouldSnapshot(ep *etcdProgress) bool {
-	return (s.forceSnapshot && ep.appliedi != ep.snapi) ||
-		(ep.appliedi-ep.snapi > s.Cfg.SnapshotCount) ||
-		// ensures a non-empty snapshot always exists
-		(ep.snapi == 0 && ep.appliedi > ep.snapi)
+	return (s.forceSnapshot && ep.appliedi != ep.snapi) || (ep.appliedi-ep.snapi > s.Cfg.SnapshotCount)
 }
 
 func (s *EtcdServer) hasMultipleVotingMembers() bool {

diff --git a/tests/integration/raft_log_snapshot_test.go b/tests/integration/raft_log_snapshot_test.go