Merge pull request #105061 from cockroachdb/blathers/backport-release…

…-22.2-98082 release-22.2: spanconfig: deflake spanconfigreconcilerccl/TestDataDriven
cockroachdb · Jun 27, 2023 · 6030b8d · 6030b8d
2 parents 1090bb3 + 2078e33
commit 6030b8d
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/pkg/ccl/spanconfigccl/spanconfigreconcilerccl/testdata/protectedts b/pkg/ccl/spanconfigccl/spanconfigreconcilerccl/testdata/protectedts
@@ -124,16 +124,23 @@ state limit=2
 /System/NodeLiveness{-Max}                 ttl_seconds=600 num_replicas=5
 ...
 
+# Take another look at the remaining protected spans.
+state offset=51
+----
+...
+/Table/10{6-7}                             protection_policies=[{ts: 3} {ts: 4}]
+/Table/10{7-8}                             protection_policies=[{ts: 3} {ts: 4}]
+
 # Release the schema object records.
 release record-id=3
 ----
 
 release record-id=4
 ----
 
-mutations
+# Observe that they're no longer protected.
+state offset=51
 ----
-delete /Table/10{6-7}
-upsert /Table/10{6-7}                      range default
-delete /Table/10{7-8}
-upsert /Table/10{7-8}                      range default
+...
+/Table/10{6-7}                             range default
+/Table/10{7-8}                             range default