From 7cb807e1c6f103de1056e8774c2e6ee86aaa23ad Mon Sep 17 00:00:00 2001
From: Andy Yang <yang@cockroachlabs.com>
Date: Wed, 25 Jan 2023 20:12:45 -0500
Subject: [PATCH] sql: add a mixed version test for system.role_members user
 ids upgrade

This patch adds a mixed version logictest that ensures that GRANT ROLE
continues to work properly in a cluster with both 22.2 and 23.1 nodes
(i.e. nodes that have run the system.role_members user ids upgrade).

Release note: None
---
 ...er_22.2_23.1_role_members_user_ids_upgrade | 129 ++++++++++++++++++
 .../BUILD.bazel                               |   2 +-
 .../generated_test.go                         |   7 +
 3 files changed, 137 insertions(+), 1 deletion(-)
 create mode 100644 pkg/sql/logictest/testdata/logic_test/testserver_22.2_23.1_role_members_user_ids_upgrade

diff --git a/pkg/sql/logictest/testdata/logic_test/testserver_22.2_23.1_role_members_user_ids_upgrade b/pkg/sql/logictest/testdata/logic_test/testserver_22.2_23.1_role_members_user_ids_upgrade
new file mode 100644
index 000000000000..842a380706ea
--- /dev/null
+++ b/pkg/sql/logictest/testdata/logic_test/testserver_22.2_23.1_role_members_user_ids_upgrade
@@ -0,0 +1,129 @@
+# LogicTest: cockroach-go-testserver-22.2-master
+
+# Verify that all nodes are running 22.2 binaries.
+
+query T nodeidx=0
+SELECT crdb_internal.node_executable_version()
+----
+22.2
+
+query T nodeidx=1
+SELECT crdb_internal.node_executable_version()
+----
+22.2
+
+query T nodeidx=2
+SELECT crdb_internal.node_executable_version()
+----
+22.2
+
+# Create test users.
+
+statement ok
+CREATE USER testuser1
+
+statement ok
+CREATE USER testuser2
+
+statement ok
+CREATE USER testuser3
+
+query TO
+SELECT username, user_id FROM system.users
+----
+root       1
+admin      2
+testuser   100
+testuser1  101
+testuser2  102
+testuser3  103
+
+# Create a role membership that will be checked again later on 23.1.
+
+query TTB
+SELECT * FROM system.role_members
+----
+admin      root       true
+
+statement ok
+GRANT testuser1 TO testuser2
+
+query TTB
+SELECT * FROM system.role_members
+----
+admin      root       true
+testuser1  testuser2  false
+
+upgrade 1
+
+# Test that there are no problems creating role memberships on a mixed 22.2/23.1 cluster.
+
+query B nodeidx=1
+SELECT crdb_internal.node_executable_version() SIMILAR TO '1000022.2-%'
+----
+true
+
+user root nodeidx=1
+
+statement ok
+GRANT testuser1 TO testuser3
+
+user root nodeidx=0
+
+query TTB
+SELECT * FROM system.role_members
+----
+admin      root       true
+testuser1  testuser2  false
+testuser1  testuser3  false
+
+statement ok
+GRANT testuser2 TO testuser3
+
+query TTB
+SELECT * FROM system.role_members
+----
+admin      root       true
+testuser1  testuser2  false
+testuser1  testuser3  false
+testuser2  testuser3  false
+
+upgrade 0
+
+upgrade 2
+
+# Verify that all nodes are now running 23.1 binaries.
+
+query B nodeidx=0
+SELECT crdb_internal.node_executable_version() SIMILAR TO '1000022.2-%'
+----
+true
+
+query B nodeidx=1
+SELECT crdb_internal.node_executable_version() SIMILAR TO '1000022.2-%'
+----
+true
+
+query B nodeidx=2
+SELECT crdb_internal.node_executable_version() SIMILAR TO '1000022.2-%'
+----
+true
+
+# Wait for migrations to run.
+
+sleep 10s
+
+query B retry
+SELECT crdb_internal.is_at_least_version('1000022.2-14')
+----
+true
+
+# Verify that ID columns are now present.
+
+query TTBOO
+SELECT * FROM system.role_members
+----
+admin      root       true   2    1
+testuser1  testuser2  false  101  102
+testuser1  testuser3  false  101  103
+testuser2  testuser3  false  102  103
diff --git a/pkg/sql/logictest/tests/cockroach-go-testserver-22.2-master/BUILD.bazel b/pkg/sql/logictest/tests/cockroach-go-testserver-22.2-master/BUILD.bazel
index 7a30857f20ff..9adbf6bf5969 100644
--- a/pkg/sql/logictest/tests/cockroach-go-testserver-22.2-master/BUILD.bazel
+++ b/pkg/sql/logictest/tests/cockroach-go-testserver-22.2-master/BUILD.bazel
@@ -11,7 +11,7 @@ go_test(
         "//pkg/cmd/cockroach-short",  # keep
         "//pkg/sql/logictest:testdata",  # keep
     ],
-    shard_count = 1,
+    shard_count = 2,
     tags = ["cpu:2"],
     deps = [
         "//pkg/build/bazel",
diff --git a/pkg/sql/logictest/tests/cockroach-go-testserver-22.2-master/generated_test.go b/pkg/sql/logictest/tests/cockroach-go-testserver-22.2-master/generated_test.go
index f3ef70ef01ed..7df2cedb5282 100644
--- a/pkg/sql/logictest/tests/cockroach-go-testserver-22.2-master/generated_test.go
+++ b/pkg/sql/logictest/tests/cockroach-go-testserver-22.2-master/generated_test.go
@@ -72,6 +72,13 @@ func TestLogic_tmp(t *testing.T) {
 	logictest.RunLogicTests(t, logictest.TestServerArgs{}, configIdx, glob)
 }
 
+func TestLogic_testserver_22_2_23_1_role_members_user_ids_upgrade(
+	t *testing.T,
+) {
+	defer leaktest.AfterTest(t)()
+	runLogicTest(t, "testserver_22.2_23.1_role_members_user_ids_upgrade")
+}
+
 func TestLogic_testserver_upgrade_node(
 	t *testing.T,
 ) {