Merge pull request #100032 from andyyang890/backport23.1-99533

release-23.1: sql,backupccl: add more tests for user ID migrations
cockroachdb · Mar 30, 2023 · 88fc5f5 · 88fc5f5
2 parents 160e2c6 + a99b663
commit 88fc5f5
Show file tree

Hide file tree

Showing 24 changed files with 75 additions and 4 deletions.
diff --git a/pkg/ccl/backupccl/restore_old_versions_test.go b/pkg/ccl/backupccl/restore_old_versions_test.go
@@ -366,6 +366,7 @@ func fullClusterRestoreSystemPrivilegesWithoutIDs(exportDir string) func(t *test
 		sqlDB.Exec(t, fmt.Sprintf("RESTORE FROM '%s' WITH UNSAFE_RESTORE_INCOMPATIBLE_VERSION", localFoo))
 
 		sqlDB.CheckQueryResults(t, "SELECT * FROM system.privileges", [][]string{
+			{"public", "/vtable/crdb_internal/tables", "{}", "{}", "4"},
 			{"testuser1", "/global/", "{VIEWACTIVITY}", "{}", "100"},
 			{"testuser2", "/global/", "{MODIFYCLUSTERSETTING}", "{}", "101"},
 		})

diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/create-system-privileges.sql b/pkg/ccl/backupccl/testdata/restore_old_versions/create-system-privileges.sql
@@ -14,3 +14,5 @@ CREATE USER testuser2;
 GRANT SYSTEM VIEWACTIVITY TO testuser1;
 
 GRANT SYSTEM MODIFYCLUSTERSETTING TO testuser2;
+
+REVOKE SELECT ON crdb_internal.tables FROM public;
diff --git a/...re/v22.2.6/BACKUP-LOCK-849140163936059393 → ...re/v22.2.6/BACKUP-LOCK-850743482728284161 b/...re/v22.2.6/BACKUP-LOCK-849140163936059393 → ...re/v22.2.6/BACKUP-LOCK-850743482728284161
diff --git a/...ckupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/BACKUP-STATISTICS b/...ckupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/BACKUP-STATISTICS
diff --git a/...backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/BACKUP_MANIFEST b/...backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/BACKUP_MANIFEST
diff --git a/.../testdata/restore_old_versions/system-privileges-restore/v22.2.6/BACKUP_MANIFEST-CHECKSUM b/.../testdata/restore_old_versions/system-privileges-restore/v22.2.6/BACKUP_MANIFEST-CHECKSUM
@@ -1 +1 @@
-U�IS
+����
diff --git a/...stdata/restore_old_versions/system-privileges-restore/v22.2.6/data/849140167931461633.sst b/...stdata/restore_old_versions/system-privileges-restore/v22.2.6/data/849140167931461633.sst
diff --git a/...stdata/restore_old_versions/system-privileges-restore/v22.2.6/data/849140168228208642.sst b/...stdata/restore_old_versions/system-privileges-restore/v22.2.6/data/849140168228208642.sst
diff --git a/...stdata/restore_old_versions/system-privileges-restore/v22.2.6/data/849140168235778051.sst b/...stdata/restore_old_versions/system-privileges-restore/v22.2.6/data/849140168235778051.sst
diff --git a/...stdata/restore_old_versions/system-privileges-restore/v22.2.6/data/850743486781980673.sst b/...stdata/restore_old_versions/system-privileges-restore/v22.2.6/data/850743486781980673.sst
diff --git a/...stdata/restore_old_versions/system-privileges-restore/v22.2.6/data/850743487039143939.sst b/...stdata/restore_old_versions/system-privileges-restore/v22.2.6/data/850743487039143939.sst
diff --git a/...stdata/restore_old_versions/system-privileges-restore/v22.2.6/data/850743487047237634.sst b/...stdata/restore_old_versions/system-privileges-restore/v22.2.6/data/850743487047237634.sst
diff --git a/...bdfcdcdc5cdcac5cfc7d1cdc8c9cdcac6dfd4cfcfcfcfdfaaabbcdf92c2d4c6c6d1c7c6c7c6cec6c8cecffffe b/...bdfcdcdc5cdcac5cfc7d1cdc8c9cdcac6dfd4cfcfcfcfdfaaabbcdf92c2d4c6c6d1c7c6c7c6cec6c8cecffffe
diff --git a/...cdcac5cfc7d1cdc8c9cdcac6dfd4cfcfcfcfdfaaabbcdf92c2d4c6c6d1c7c6c7c6cec6c8cecffffe-CHECKSUM b/...cdcac5cfc7d1cdc8c9cdcac6dfd4cfcfcfcfdfaaabbcdf92c2d4c6c6d1c7c6c7c6cec6c8cecffffe-CHECKSUM
@@ -0,0 +1 @@
+B:�|
diff --git a/...bdfcdcdc5cdcac5cfc8d1c6c7cfcbc7cedfd4cfcfcfcfdfaaabbcdf92c2d4c6c6d1c9cfcccecbcdcccccafffe b/...bdfcdcdc5cdcac5cfc8d1c6c7cfcbc7cedfd4cfcfcfcfdfaaabbcdf92c2d4c6c6d1c9cfcccecbcdcccccafffe
diff --git a/...cdcac5cfc8d1c6c7cfcbc7cedfd4cfcfcfcfdfaaabbcdf92c2d4c6c6d1c9cfcccecbcdcccccafffe-CHECKSUM b/...cdcac5cfc8d1c6c7cfcbc7cedfd4cfcfcfcfdfaaabbcdf92c2d4c6c6d1c9cfcccecbcdcccccafffe-CHECKSUM
@@ -0,0 +1 @@
+�w 
diff --git a/...fcfc9c5cccfc5cecbd1cdcdc7cbcbcbdfd4cfcfcfcfdfaaabbcdf92c2d4cccecbd1cccfcccbcbccc7c8c9fffe b/...fcfc9c5cccfc5cecbd1cdcdc7cbcbcbdfd4cfcfcfcfdfaaabbcdf92c2d4cccecbd1cccfcccbcbccc7c8c9fffe
diff --git a/...cfc5cecbd1cdcdc7cbcbcbdfd4cfcfcfcfdfaaabbcdf92c2d4cccecbd1cccfcccbcbccc7c8c9fffe-CHECKSUM b/...cfc5cecbd1cdcdc7cbcbcbdfd4cfcfcfcfdfaaabbcdf92c2d4cccecbd1cccfcccbcbccc7c8c9fffe-CHECKSUM
diff --git a/...fcfc9c5cccfc5ceccd1c6cfcbcbc9cddfd4cfcfcfcfdfaaabbcdf92c2d4ccceccd1c6c8c6cbcac7c9cdc9fffe b/...fcfc9c5cccfc5ceccd1c6cfcbcbc9cddfd4cfcfcfcfdfaaabbcdf92c2d4ccceccd1c6c8c6cbcac7c9cdc9fffe
diff --git a/...cfc5ceccd1c6cfcbcbc9cddfd4cfcfcfcfdfaaabbcdf92c2d4ccceccd1c6c8c6cbcac7c9cdc9fffe-CHECKSUM b/...cfc5ceccd1c6cfcbcbc9cddfd4cfcfcfcfdfaaabbcdf92c2d4ccceccd1c6c8c6cbcac7c9cdc9fffe-CHECKSUM
diff --git a/pkg/sql/logictest/testdata/logic_test/mixed_version_database_role_settings_role_id b/pkg/sql/logictest/testdata/logic_test/mixed_version_database_role_settings_role_id
@@ -0,0 +1,27 @@
+# LogicTest: cockroach-go-testserver-upgrade-to-master
+
+# Set default session variables in a mixed version cluster.
+
+statement ok
+CREATE USER testuser1
+
+upgrade 1
+
+user root nodeidx=1
+
+statement ok
+ALTER ROLE ALL SET timezone = 'America/New_York'
+
+statement ok
+ALTER ROLE testuser1 SET application_name = 'my app'
+
+user root nodeidx=2
+
+statement ok
+ALTER ROLE testuser1 SET index_recommendations_enabled = false
+
+query TT
+SELECT role_name, settings FROM system.database_role_settings
+----
+·          {timezone=America/New_York}
+testuser1  {"application_name=my app",index_recommendations_enabled=false}
diff --git a/pkg/sql/logictest/testdata/logic_test/mixed_version_system_privileges_user_id b/pkg/sql/logictest/testdata/logic_test/mixed_version_system_privileges_user_id
@@ -0,0 +1,27 @@
+# LogicTest: cockroach-go-testserver-upgrade-to-master
+
+# Grant system privileges in a mixed version cluster.
+
+statement ok
+CREATE USER testuser1
+
+upgrade 1
+
+user root nodeidx=1
+
+statement ok
+REVOKE SELECT ON crdb_internal.tables FROM public
+
+statement ok
+GRANT SYSTEM MODIFYCLUSTERSETTING TO testuser1
+
+user root nodeidx=2
+
+statement ok
+GRANT SYSTEM CANCELQUERY TO testuser1
+
+query TTTT
+SELECT username, path, privileges, grant_options FROM system.privileges
+----
+public     /vtable/crdb_internal/tables  {}                                  {}
+testuser1  /global/                      {CANCELQUERY,MODIFYCLUSTERSETTING}  {}
diff --git a/pkg/sql/logictest/tests/cockroach-go-testserver-upgrade-to-master/BUILD.bazel b/pkg/sql/logictest/tests/cockroach-go-testserver-upgrade-to-master/BUILD.bazel
@@ -11,7 +11,7 @@ go_test(
         "//pkg/cmd/cockroach-short",  # keep
         "//pkg/sql/logictest:testdata",  # keep
     ],
-    shard_count = 4,
+    shard_count = 6,
     tags = ["cpu:2"],
     deps = [
         "//pkg/build/bazel",

diff --git a/pkg/sql/logictest/tests/cockroach-go-testserver-upgrade-to-master/generated_test.go b/pkg/sql/logictest/tests/cockroach-go-testserver-upgrade-to-master/generated_test.go
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,3 +14,5 @@ CREATE USER testuser2;
		GRANT SYSTEM VIEWACTIVITY TO testuser1;

		GRANT SYSTEM MODIFYCLUSTERSETTING TO testuser2;

		REVOKE SELECT ON crdb_internal.tables FROM public;