WIP remove the only usage of InitPut with FailOnTombstones

cockroachdb · Dec 20, 2024 · 5ec42e3 · 5ec42e3
1 parent 951d890
commit 5ec42e3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/pkg/sql/sqlliveness/slstorage/slstorage.go b/pkg/sql/sqlliveness/slstorage/slstorage.go
@@ -529,7 +529,7 @@ func (s *Storage) Insert(
 
 		}
 		v := encodeValue(expiration)
-		batch.InitPut(k, &v, true)
+		batch.InitPut(k, &v, false /* failOnTombstones */)
 
 		return txn.CommitInBatch(ctx, batch)
 	}); err != nil {

diff --git a/pkg/sql/sqlliveness/slstorage/slstorage_test.go b/pkg/sql/sqlliveness/slstorage/slstorage_test.go
@@ -269,6 +269,10 @@ func TestStorage(t *testing.T) {
 			require.False(t, exists)
 			require.Equal(t, int64(1), metrics.WriteFailures.Count())
 		}
+		// Ensure it cannot be inserted again.
+		{
+			require.Error(t, storage.Insert(ctx, id, exp))
+		}
 	})
 	t.Run("test-jitter", func(t *testing.T) {
 		// We want to test that the GC runs a number of times but is jitterred.