Merge #112913

112913: acceptance: deflake test_demo_node_cmds r=nvanbenschoten a=nvanbenschoten Fixes #112590. In cc1dd90, we unskipped a collection of assertions in the acceptance test `test_demo_node_cmds` which relied on timely gossip propagation. We missed one in that commit. It's not clear whether that was an accidental omission or intentional. Regardless, the test is now flaky. This commit switches all remaining uses of the `gossip_liveness` virtual table over to `kv_node_liveness`, which provides a consistent view of the system's liveness state. Release note: None Co-authored-by: Nathan VanBenschoten <[email protected]>
cockroachdb · Oct 24, 2023 · aabfe2e · aabfe2e
2 parents f3c7285 + 023a151
commit aabfe2e
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/pkg/cli/interactive_tests/test_demo_node_cmds.tcl b/pkg/cli/interactive_tests/test_demo_node_cmds.tcl
@@ -41,12 +41,12 @@ send "\\demo shutdown 3\r"
 eexpect "node 3 has been shutdown"
 eexpect "defaultdb>"
 
-send "select node_id, draining, decommissioning, membership from crdb_internal.gossip_liveness ORDER BY node_id;\r"
-eexpect "1 |    f     |        f        | active"
-eexpect "2 |    f     |        f        | active"
-eexpect "3 |    t     |        f        | active"
-eexpect "4 |    f     |        f        | active"
-eexpect "5 |    f     |        f        | active"
+send "select node_id, draining, membership from crdb_internal.kv_node_liveness ORDER BY node_id;\r"
+eexpect "1 |    f     | active"
+eexpect "2 |    f     | active"
+eexpect "3 |    t     | active"
+eexpect "4 |    f     | active"
+eexpect "5 |    f     | active"
 eexpect "defaultdb>"
 
 # Cannot shut it down again.
@@ -64,12 +64,12 @@ send "\\demo restart 3\r"
 eexpect "node 3 has been restarted"
 eexpect "defaultdb>"
 
-send "select node_id, draining, decommissioning, membership from crdb_internal.gossip_liveness ORDER BY node_id;\r"
-eexpect "1 |    f     |        f        | active"
-eexpect "2 |    f     |        f        | active"
-eexpect "3 |    f     |        f        | active"
-eexpect "4 |    f     |        f        | active"
-eexpect "5 |    f     |        f        | active"
+send "select node_id, draining, membership from crdb_internal.kv_node_liveness ORDER BY node_id;\r"
+eexpect "1 |    f     | active"
+eexpect "2 |    f     | active"
+eexpect "3 |    f     | active"
+eexpect "4 |    f     | active"
+eexpect "5 |    f     | active"
 eexpect "defaultdb>"
 
 # Try decommissioning commands