revert the change for keep

Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
etcd-io · Jun 13, 2024 · 30eaf12 · 30eaf12
1 parent 891e412
commit 30eaf12
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/server/storage/mvcc/key_index.go b/server/storage/mvcc/key_index.go
@@ -233,7 +233,14 @@ func (ki *keyIndex) keep(atRev int64, available map[Revision]struct{}) {
 		return
 	}
 
-	ki.doCompact(atRev, available)
+	genIdx, revIndex := ki.doCompact(atRev, available)
+	g := &ki.generations[genIdx]
+	if !g.isEmpty() {
+		// remove any tombstone
+		if revIndex == len(g.revs)-1 && genIdx != len(ki.generations)-1 {
+			delete(available, g.revs[revIndex])
+		}
+	}
 }
 
 func (ki *keyIndex) doCompact(atRev int64, available map[Revision]struct{}) (genIdx int, revIndex int) {