From 7bf12b6929cf9d1c951e743a56699631a25290a1 Mon Sep 17 00:00:00 2001 From: Andy Yang Date: Fri, 24 Mar 2023 14:47:48 -0400 Subject: [PATCH 1/3] sql: add mixed version test for system.privileges user ID migration This patch adds a mixed version logic test that ensures granting of system privileges continues to work properly in a cluster that has both 22.2 and 23.1 nodes. The relevant version gate being tested here is V23_1SystemPrivilegesTableHasUserIDColumn. Release note: None --- .../mixed_version_system_privileges_user_id | 27 +++++++++++++++++++ .../BUILD.bazel | 2 +- .../generated_test.go | 7 +++++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 pkg/sql/logictest/testdata/logic_test/mixed_version_system_privileges_user_id 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 new file mode 100644 index 000000000000..00676b9724e1 --- /dev/null +++ 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 index 89a8eb52fbc5..61aaa697b225 100644 --- 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 = 5, tags = [ "cpu:2", ], 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 index 257083c4a40f..cb6376d2d537 100644 --- 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 @@ -99,3 +99,10 @@ func TestLogic_mixed_version_role_members_user_ids( defer leaktest.AfterTest(t)() runLogicTest(t, "mixed_version_role_members_user_ids") } + +func TestLogic_mixed_version_system_privileges_user_id( + t *testing.T, +) { + defer leaktest.AfterTest(t)() + runLogicTest(t, "mixed_version_system_privileges_user_id") +} From 0865a548c29963085d3d89c1ba379ae07e65ad45 Mon Sep 17 00:00:00 2001 From: Andy Yang Date: Fri, 24 Mar 2023 17:31:12 -0400 Subject: [PATCH 2/3] sql: add mixed version test for system.database_role_settings user IDs This patch adds a mixed version logic test that ensures setting default session variables continues to work properly in a cluster that has both 22.2 and 23.1 nodes. The relevant version gate being tested here is V23_1DatabaseRoleSettingsHasRoleIDColumn. Release note: None --- ...xed_version_database_role_settings_role_id | 27 +++++++++++++++++++ .../BUILD.bazel | 2 +- .../generated_test.go | 7 +++++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 pkg/sql/logictest/testdata/logic_test/mixed_version_database_role_settings_role_id 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 new file mode 100644 index 000000000000..fed783d3fe65 --- /dev/null +++ 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/tests/cockroach-go-testserver-upgrade-to-master/BUILD.bazel b/pkg/sql/logictest/tests/cockroach-go-testserver-upgrade-to-master/BUILD.bazel index 61aaa697b225..423f7e7b1745 100644 --- 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 = 5, + shard_count = 6, tags = [ "cpu:2", ], 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 index cb6376d2d537..48b3a2c8d7c9 100644 --- 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 @@ -79,6 +79,13 @@ func TestLogic_mixed_version_can_login( runLogicTest(t, "mixed_version_can_login") } +func TestLogic_mixed_version_database_role_settings_role_id( + t *testing.T, +) { + defer leaktest.AfterTest(t)() + runLogicTest(t, "mixed_version_database_role_settings_role_id") +} + func TestLogic_mixed_version_external_connections_owner_id( t *testing.T, ) { From 3b3b5730e9c2e4af8050072b7e91edac5ba6d045 Mon Sep 17 00:00:00 2001 From: Andy Yang Date: Fri, 24 Mar 2023 18:26:13 -0400 Subject: [PATCH 3/3] backupccl: update TestRestoreOldVersions subtest for system.privileges This patch updates the TestRestoreOldVersions subtest for the system.privileges table to also test that a row for the public role is correctly restored. Release note: None --- .../backupccl/restore_old_versions_test.go | 1 + .../create-system-privileges.sql | 2 ++ ...6059393 => BACKUP-LOCK-850743482728284161} | 0 .../v22.2.6/BACKUP-STATISTICS | Bin 3919 -> 3945 bytes .../v22.2.6/BACKUP_MANIFEST | Bin 2886 -> 2890 bytes .../v22.2.6/BACKUP_MANIFEST-CHECKSUM | 2 +- .../v22.2.6/data/849140167931461633.sst | Bin 1721 -> 0 bytes .../v22.2.6/data/849140168228208642.sst | Bin 1183 -> 0 bytes .../v22.2.6/data/849140168235778051.sst | Bin 1179 -> 0 bytes .../v22.2.6/data/850743486781980673.sst | Bin 0 -> 1888 bytes .../v22.2.6/data/850743487039143939.sst | Bin 0 -> 1069 bytes .../v22.2.6/data/850743487047237634.sst | Bin 0 -> 1259 bytes ...aaabbcdf92c2d4c6c6d1c7c6c7c6cec6c8cecffffe | Bin 0 -> 2821 bytes ...2c2d4c6c6d1c7c6c7c6cec6c8cecffffe-CHECKSUM | 1 + ...aaabbcdf92c2d4c6c6d1c9cfcccecbcdcccccafffe | Bin 0 -> 2727 bytes ...2c2d4c6c6d1c9cfcccecbcdcccccafffe-CHECKSUM | 1 + ...abbcdf92c2d4cccecbd1cccfcccbcbccc7c8c9fffe | Bin 2818 -> 0 bytes ...2d4cccecbd1cccfcccbcbccc7c8c9fffe-CHECKSUM | 1 - ...abbcdf92c2d4ccceccd1c6c8c6cbcac7c9cdc9fffe | Bin 2723 -> 0 bytes ...2d4ccceccd1c6c8c6cbcac7c9cdc9fffe-CHECKSUM | 1 - 20 files changed, 6 insertions(+), 3 deletions(-) rename pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/{BACKUP-LOCK-849140163936059393 => BACKUP-LOCK-850743482728284161} (100%) delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/data/849140167931461633.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/data/849140168228208642.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/data/849140168235778051.sst create mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/data/850743486781980673.sst create mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/data/850743487039143939.sst create mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/data/850743487047237634.sst create mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cdcbdfcdcdc5cdcac5cfc7d1cdc8c9cdcac6dfd4cfcfcfcfdfaaabbcdf92c2d4c6c6d1c7c6c7c6cec6c8cecffffe create mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cdcbdfcdcdc5cdcac5cfc7d1cdc8c9cdcac6dfd4cfcfcfcfdfaaabbcdf92c2d4c6c6d1c7c6c7c6cec6c8cecffffe-CHECKSUM create mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cdcbdfcdcdc5cdcac5cfc8d1c6c7cfcbc7cedfd4cfcfcfcfdfaaabbcdf92c2d4c6c6d1c9cfcccecbcdcccccafffe create mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cdcbdfcdcdc5cdcac5cfc8d1c6c7cfcbc7cedfd4cfcfcfcfdfaaabbcdf92c2d4c6c6d1c9cfcccecbcdcccccafffe-CHECKSUM delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cec6dfcfc9c5cccfc5cecbd1cdcdc7cbcbcbdfd4cfcfcfcfdfaaabbcdf92c2d4cccecbd1cccfcccbcbccc7c8c9fffe delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cec6dfcfc9c5cccfc5cecbd1cdcdc7cbcbcbdfd4cfcfcfcfdfaaabbcdf92c2d4cccecbd1cccfcccbcbccc7c8c9fffe-CHECKSUM delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cec6dfcfc9c5cccfc5ceccd1c6cfcbcbc9cddfd4cfcfcfcfdfaaabbcdf92c2d4ccceccd1c6c8c6cbcac7c9cdc9fffe delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cec6dfcfc9c5cccfc5ceccd1c6cfcbcbc9cddfd4cfcfcfcfdfaaabbcdf92c2d4ccceccd1c6c8c6cbcac7c9cdc9fffe-CHECKSUM diff --git a/pkg/ccl/backupccl/restore_old_versions_test.go b/pkg/ccl/backupccl/restore_old_versions_test.go index cd893abe06bf..00c52be2ab69 100644 --- 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 index 7859591ac733..1959ba9bf781 100644 --- 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/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/BACKUP-LOCK-849140163936059393 b/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/BACKUP-LOCK-850743482728284161 similarity index 100% rename from pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/BACKUP-LOCK-849140163936059393 rename to pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/BACKUP-LOCK-850743482728284161 diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/BACKUP-STATISTICS index 01a9f53c9703fb11d03bb09801a1b90f0b847c6c..3d9bbfe25409865d1134b90ca8514f0942f12a00 100644 GIT binary patch literal 3945 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 literal 2886 zcmV-M3%T?kiwFP!00000|IAu@Y#dkBzxU3}?)chHCflT$Z@w0$BU(07$C-WDUK@cN zJC%}@O2Ki9uuvznJ7as&_0D!@ws9&UT!|KMaYLz46@f~v7FDf8O9@4oq;D0qf`1SQ zA%TPf;!#0qc@$9ziJ*DUzP#(T6(L#j-8=W(^E)7j zqdBxz6VTe1?9oFt0X_7fJvvtt&^c%HXiY$mI-|#G0(#6DJzf*g<7@V4y(XY_XYQGr zfSz%7dA25?XPwatH37ZgJl&`XXu}y@tO@9%GrCk0&?RT|Vog9VJ}6{yfF|+(s$waJ za@p}zR!WWL(&=1U%8h2z!=`Da8NVoFh$^b)heuqzB6z+}ZR zEca7_EE%fCA_3EH|KN>p|L*1Yp4y*;li)ZIU!(BL6sD@CRxw$Uhe=`r(;Mp-A9(4t z_nz86br93`qmr_uF_0Ue;|ySd1Wx?lDZm2>EP^sv1}hM(LU0~}sSMt=sF;hIdO|VH zGe$*a5H~>6p3t6CfQQXOX&lqd8KbB%1UEnfZ!u$Q5UF{kXll(eLpW~Zl693KxdD2> z6XIIJI!etv0CBur(U+9USq8FD2&@tt0E-?L(cfRPd17o>9N<9`NFWC$!5k=~GEpY) zC27EWnjVJac?h3?F&ZQQ3!aAH0t6Q!col-TAovMHmm!!tjrTZQ%ii{~t}Zi(g+ic@ z%(c;2uZuVjL3>^BG6biH(~+>aOt6=UAS|3uepswPxa#b80e&Q;32*^PoDYtNJeedf zz#+VMURjdUa+9|k=;TonU4Yl&0eg8y4*cw~%o9ms1Cp;p@HPa0hoo)I2N0|v@CX85 zLy>U3fWQUc&}se6r*X0j9ylW-y;IrUMDbk&Jo z$V@t6vbS~g-i%`fqcpECbP=^jiJ3xuNFiMnJ^A)Avz2&pe2BL0!)u~GM7GnCAn-w2 z4ovjG+Ai9FM2|i|o)2Cn@k=D8P0h0O(t^pxn%r;zlij8f5mWal#j57`p~KoExWA~F z*6n3gu{4z-xIvooBz{RdIb=`CIFmduF)=ZF?6zA@&K|z)MDs4gxX;lzd$z1O86~Q< zh4-nMm4=Ms7$>^8#V8~(+w6j}|oen2Ys#EMVJD!}W)cf7W)ynOg z`TA;jdT%rf*dX0Bz~O#34frIv(A_+J6W-(I>3UY8W^FHH`>y^CiGNMvzM@f3EZr!X z?7k+COSs>DT-2?zw|3|GG#>ON?&vmq3}d>eSh`hJHOKt~vztvw;KVlvTdzN4gDx$& z0%T`_qtwi~hC~rHOQ=UI24KWcjRYk$3EBkHRZ1IoSCa{KZTsIFp6gO41 zU1Svpl;G(T{jD|+g{=m{++BEIlpWdm;MSwSMIgZ(+I}$#Y-I-CU#HCd@2DeK;F~I; zov40og{R1^hxv!2InyD4^KjXLX{XN*;X%KW^_}ZGXJ<0ww@Ca9iRpr|w4{|RlVw{) ztYsh2T@JKozwd@rdl(;O4Aay4Jn3k=VKjuA3c7a_IR@|NVsI>kSX6fyOG*} z)HcKAUnG8?^pc!WcF)oqw%f(ujAQOz-6Xo8-Xc0y&0Fr;Ki{Tl7d(7^-4*ugJ9|{l z6N*|Zc(V`AN0l!ZiS%jF6a@BGS*U?z}J zHA~TpCPR0nN?X6^P=xm z(e;cNkS;dRDb_P3HjyCK+b1?a-@H>VQ{`AWUZ%@^WxVB_GLHv*)ImB4?2xD(tABdP zCOJ$wJlU0d#0y*ik87Zrhdjl{?2~R8Q--yuRT#+C`;7B_#<@P@>OI3Xd4{X^4A%7+>%I$iLU5^Fa zI-f#rfzR!=QEt5pADDz25WEh-Zy`%VMrE&DxpF1Wt4WY1ZIn4U)f2D4N?fR_8E6I-uwF@9(V7S0!tb%r+qWz z&Int|5vWNe(*^p9Znf8nFdX zuW#wxU0jV=UyR0jqk&=B?iQolO)9K`g3ks3~o4`&ncd(!FQ^zbNmOS%U?n4bRRRJ@`UHO179?>6S=^@6Sx59alfQaL-bZ#g$Ak7f@l<#JIw=t`!> z=i=4UT_xj8DIcdV?P9KD=?bCFFFpvtBar#Vk;nVjK7NEf|LN8BJASbjJP+YTxQ`|i zd!`Og-+KFrgC}PX&mKEDdu;loJx{fnkF}ZK)n8U9I04E8S=l}o! diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/BACKUP_MANIFEST-CHECKSUM index 23204aa4b53d..2edeef319287 100644 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/BACKUP_MANIFEST-CHECKSUM +++ b/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/BACKUP_MANIFEST-CHECKSUM @@ -1 +1 @@ -UIS \ No newline at end of file + \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/data/849140167931461633.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/data/849140167931461633.sst deleted file mode 100644 index 95e19945871c3cd93cc426f2b55381da2585af16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1721 zcmaJ>Z)_7~7=PdXS+BQaYs+qQV;dbCbr^bSyR~bXOk^_37;`FYfRb|Uz3Yx$@5fL!$3>1O4Qi+@JTk z=Xu`e`8~hieMh!}MHPFqdxo=M(ZgIHcJRhzfF9iyr`^)o&<2)FuGx5*$C}^#e*zjFy%73>9y-`2h9c z#w!l5516M)dcfOl`0Mt|bu)8bvj*&CnZjO{ucphF>5Y#YFI#|)wj6D%0n|X?z5!jctMTMlIBAJoo7%TF9tjbFwfO|kCqTUF+KI=QIzGXdF zMLMgRq-c*UvC(cvD;rT9E=Rj8amgsGPdhdtMdihq{lW3G7pYSdV>5ZhP|05$R8Uk# zsAt{an<<)L06FT)Ve&rE?+$t@w<_)%iNim zJa%s{#EJBebs`a$n2>n|F#;b&qJpeZ>QLsJyL9yK`VY&$;7I41s4TeLuC*<#?z&`8 z^SYP4xdVT{2R=W!I8tNT;3^ zGv;fSTVGD^)5B}_vI-oj@WFm68vApUzO?$;n)73%le7^;u|;PG4q$G4;`)30F-&pb zT0EY$$tY%g(rrUYSxO*R3ghXq?xuQo+`2%wP41{Heuwm#>xNIS+&mgy4QO*+cEN#$ zsq+CqIm(iX3nQY+tl+UWQpr!u*Xc%TKNUJ^Y3y4#U>eo!eA1C@d{Q zY(77pxQW*wXs~B$MmwvlB8M(DE|HXJLmz&sTSu6(pr=^lHKhs1J$#?+ucwHtBk`h zhk&EX(iGR@&B%fttCvrCJ3-B2L&K0B6r0Xv_rQvx>HO>89}dt5LWSp^xCXC6fS1(( zfDS)l$S^#o9d9Cu zqIiOpSyhsw5A_s|N)K(6DNja^K7H8=#+ zi-c9R-g*QR|Y^T+9@d zQBM4f%Eu8P%sP%$Sw`Xe&@q!aA0h#%7#G~8f`3^AN@D;-RtPJK8pd!SCMHM`ZI5<| zl7^PHN==5G5+qR@29XcvfXihCWC2XiWn=^-#?)?LUH~OI&Z^9O5FltcHv$b^USX10 zlv)X(zyP(%$_t8NFDoSRq!flj0xlSdQ7ljn5Ct%fq?SlS~Nm;)@Ie#m6X=3869pin{A9$E+@IC$#wV3 zdrsP9J}8J_GX)U^QBY9XbPT}_MBM6&pD4&){CE&Q!1+|cA^I{z&q=!JlYcmH&+q&{ zfB)b8J#2zZwMzRr3%3v%<%=`l&w z`_CLqgYhGeO&*0IX=fzxJeFA2R-&&oQp;)j(vKI_Qb0JW`wdPCBcM(^$(&~+Qs)$ICtZ=BO7YzGZ-5v?;8Q5#{9X*+> zr)Gx^ygd1xTKYUQTNnX(_pKkkfdHno&iY-`h1Y7v zZ&?*groaj2l^8`zW!cHW_}USuS&k~4A7>}U-EY5(**#*So-ohx)}Jh-$_sVp8o(2W7ypg8v(uiOb#=?X~v-81l{ zbn_8ho5y#6(Qx3^PEoUpsy6>XRZNMA7_Qm`S*}T1h_!tpVus_;56FtuLMxWdNMO13 z@!>(Z*6_INDboHAEXVt5p51g@w1OSWZX?SSL7I?VUFlydSOpEjf zgi_0Mmt5@o?LpZvJfHD9UE{rYYev;#w77d>awcb!Rbm(S7N+i*n#obdbCP|rpz=1%)Ko4U!1sNN>jKf8Vm>)l@PNW0%Rp*Vulg5PLqzLL?N*W zkHvY#Wp^gVRA!Z>I(&kGP&-OW1HEyh;KwPl(^-DC`l}%?i{QZ1plC zo49q>0LlRL0tYj+6$IoI?5#ksYf&VGEm{DvFch6-V%y;=wwruY6q&^44HLKKnZyKg z3_2vJ6Xf|Mz^+NbpcLV>yG`5nSs-tNZqq^C8M}L@P>Vp~vcMuVu5E)nrcQSAoTN)X z-~pa(@}H}_=^jU^$d(>B8v(BI?8wCq*(#wXLZUWnBQ6D-h-Z58Az2Frc&(d6OmI!o z)KG5(alI@=+f^?3=@0fHNZt~sA9R!P?#@Xs_TBOte=~LgekAYeNJ9eqe-lgi?bY*_ G#Q6u|v|)Mx diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/data/849140168235778051.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/data/849140168235778051.sst deleted file mode 100644 index c74467daa9a7930c00c7b0784d285115410530a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1179 zcmaJ=U1(fI6rQ=e+xwH7bk`)CHBwottx>v@xQQ($Mk2*ZYl}*x6h$tx_nz!tI`=0t zv)SD~NL5;riav&b4@LSGNkPRv2t|D>)Q3Lklc2uz*{D$35Ti4@A@#|*4BT^O&N<)t zzB9jO+vwoP#>(G)x4!-O2ET}x(a4#b_q>hcZy)L?C&mw2im&7w=v@ShOFEIa4o` zpD#bFzRBD+dJF@>e;d*hN_HOY6=max&LZ;h)|@@9!O=>C)#MJ(cCEVG-0w zjj10}qXGgVX^jC1;{e)3lcW=l=5fklA#9U{kV)W5q>0f%+-fB1>Urq=$8F_ve!`kj zOcrPqvJMFYUEXx8A*CFrN`O6@y{?*FpKI>pAcSIfKBj5f8MHhvNwvIOwh>TCi3l&i<&52jm26V+qS_S5dfbAxA|R&B6GD254mCwAsc9P) z<3zKi*Ql9Y0mTvW9U_0?n=(&!zyb zA)tXQ*2oSF6!8*eO{J6|0Wbv^Vqd+209gY#0$vA_q`+w$2sD^674318u~c$vKaQIb z>Gs&wU0~P55KA6{*yrxYDy9wQylY`dGa4uH_n>wz^4l2Y0aR7`+y>x%zN8PyhaB6+N;yoGI@nQ|PW`)^eI$ dJ>TfF!-pdLo%O`!Oi7#nzqAOOSJ%JN`(GSUcGLg> diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/data/850743486781980673.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/data/850743486781980673.sst new file mode 100644 index 0000000000000000000000000000000000000000..f3ba542b86bb645e7c7e24774799bf7ce9769c2c GIT binary patch literal 1888 zcmaJ>eQXnD7=PYgOYd&Ct{rVR#=4a;LHr2#LHI*~7^4``h>?gfMjbkQZzJemzD?VEpL;%k zzvp>I91{5Ko3i<$l!z;U2B6^14HduMa%w(xbuaE$XYl?YASfu=oE-=p;7(;;J>)qv zu>QpN^^~)(udlI?{PbDMtn}~^8&55RPDmq*rzAUg{mF0`=n{5LYZ$=Bgxyf!+nn9r zrT}*g?RqU(2OLEY7rSaXqQ0Xo1l(VzH~NDiV8(J2MCRMw76$IV<2COE$v;J(way4x zoqLF)^Rst+b0}Md?IR~xJkGH;9=HeUUOupp2YA!Gu&4L3h_{Z`G0P+f%-ogD*KjPZ z5*G7uN>h_K&`V%$-|wurayIS{?H*k<%lj-FVrmBWFT8s=(g+@=CY!sZe$Nq-q`x?& z2clRpG*Pa)!?c-o7wu`_p5T^@*&4dGb-XW?ZUPTmG>C5R{qa240(nKnSoHOB6TOi3 zEZ{uLN)Ff-xYMDxk5(JZ0^Wbm_$M1yz;thMjZ5Js&aCS6gt$k3D_>&^x%;n+E&X{f z6LRP6dda^vA1UGQfF6#H5;x)gvK7S5&XLg#{2ORN#}ImXX;1jXLV&V@ec8WrPHL-v z9_ib>wfw?s5B2~6%0=0220Y#ooXK{c+xN@69C#Vlp2Uh2S7JGZucK_X|GAs1;Zn<% z+Ac49om*ck2XsR;NV#evDMk$fS>gLb#B#L%(<{hpRa6Ow?TtNZN|Q5Q3vKbv)uTOF zO37FX=xbXV;CKM1aWrM9n)eQNDSMldNn#l&{ki6q2;fn}V)hL&N*-F?50UbJ|b@yeX)Dt}d-zk+nr16YlRNi#^4{oBi=UX{!=QsAvy4n-QsVbyZBEE=GgY3D!Tm9 z^GwyfVZ`(N+!Yjf?T4}h`g`d9>iszLA2IE;MO8VKP=wWDA}(iyxMYU6v$UHqtBHi5YcxbA z*`Abf_Guc{b%OqKMNB3$)9FY=O`3h6_mW)H-bi=c&=&=&YU=$mUWesH)xp|uZM|P7 z(_!FPX3_k5e?m-0qcr^$vq)eS`6&j}r0E#F_blr#$I7pYtYPWgEYZcW*%REJP>pHBN z^$<>g&OuYaO?m~^fzneR1sN+bqX(E=q-qJ#5Uv^l?Lku%nCO!BH8-=F0ywP5%*^NT zqIII2B24Lmgk_R2R-$A|B%mEAfwdSG$hy%)Mbcq9WhbyJDOpY$8l8ufR6>}nagui( zadu>GnK;(VxI9E`VmLs2;z{^{7^t#D*48A`Qy6*dSNnmWp^GG-b3SH$@^{F;)|^RmZ)yg~?gx6i e?V46(?o$Hlcg*^jE;METe@qfCjl8(u{Qd(=;zrv5 literal 0 HcmV?d00001 diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/data/850743487039143939.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/data/850743487039143939.sst new file mode 100644 index 0000000000000000000000000000000000000000..7f03a8fc0082e19e531766dd17d514f7f2954fa7 GIT binary patch literal 1069 zcmaJ<&2Jk;6rWkg@p`jy?0i5JnvyCOf{ISQC>63SKp|;ewT(pFmQulLcK5{@Wp;L% z87JOy0SQ$Jy&|EWDseyvI3OXRO3*V0ZauXUe?Y~B&jXhVX6&@|#FIvvdGp@yz4!aQ z>xBE=!<8D8Xp!=bL{(r@vIwi78&4$T}?v{3z3Y& zfC&v!P`;q?BvPZdtIfaj%Kp^t=ieoN{NgnWco@y%;){hBj%ZN2t3WQ{jp+_gLz7c$ z`1em<+@5N@mH&R>q}QzCVeDUOtzCY7wcWbZYF{ay@kfr;m(RY2st;cI%q=gie7$n? z;ZI(3+C)yC-*}_7er5IC#m)BGo11IxcI(3FSzFN>w&%`|`e)=7en7Q<28KRy9(|(5 ztEWFg^&y!?J1P!I$jya>R6$Jo0}>`;=nl&0Fo6UediFWLh;(EWOm2o!qL{O1Q@WsGe|*~b#7twc0S0J&u+rkWDPuE9;GJc5CPHoTZI6>^Wd&>N^8 zD5V2K2atiHfr9r$YT2?jQySU@Y3H$|yCZl&TptyA72F#j5)PuHw^4Z%r!t|M93~-m z3J)Z(>@r2{_ShCsWeD5OW-CwOUCO&)KV#sgVGvOoLyX)CPC#~mq!~ymVudCOB}2RD za-M1Fj$zSFNPot@?h5-Q3_?o=s^pJhlhc6{1{3=9Ba@Kw*lciL=>bPmrNezNY)Bdz zbRuX1hb6q4V{7Z2m{s6lztz=uT;Gv&uMc7;_}uZm!x8K=wyfF3MZYf0zm3Kp?`9_Z kSf;t}oKK67qdL#dH1OThv764c_5HtD4Su`z<+t|y3#TMOQ~&?~ literal 0 HcmV?d00001 diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/data/850743487047237634.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/data/850743487047237634.sst new file mode 100644 index 0000000000000000000000000000000000000000..39ad36acd1c34888fabf84e2010567f8ac70a1e7 GIT binary patch literal 1259 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 literal 0 HcmV?d00001 diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cdcbdfcdcdc5cdcac5cfc7d1cdc8c9cdcac6dfd4cfcfcfcfdfaaabbcdf92c2d4c6c6d1c7c6c7c6cec6c8cecffffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cdcbdfcdcdc5cdcac5cfc7d1cdc8c9cdcac6dfd4cfcfcfcfdfaaabbcdf92c2d4c6c6d1c7c6c7c6cec6c8cecffffe-CHECKSUM new file mode 100644 index 000000000000..c99aa077d4f3 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cdcbdfcdcdc5cdcac5cfc7d1cdc8c9cdcac6dfd4cfcfcfcfdfaaabbcdf92c2d4c6c6d1c7c6c7c6cec6c8cecffffe-CHECKSUM @@ -0,0 +1 @@ +B:| \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cdcbdfcdcdc5cdcac5cfc8d1c6c7cfcbc7cedfd4cfcfcfcfdfaaabbcdf92c2d4c6c6d1c9cfcccecbcdcccccafffe b/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cdcbdfcdcdc5cdcac5cfc8d1c6c7cfcbc7cedfd4cfcfcfcfdfaaabbcdf92c2d4c6c6d1c9cfcccecbcdcccccafffe new file mode 100644 index 0000000000000000000000000000000000000000..a5b9a8c3ce17e2a023da02075f87fb30478222de GIT binary patch literal 2727 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 literal 0 HcmV?d00001 diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cdcbdfcdcdc5cdcac5cfc8d1c6c7cfcbc7cedfd4cfcfcfcfdfaaabbcdf92c2d4c6c6d1c9cfcccecbcdcccccafffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cdcbdfcdcdc5cdcac5cfc8d1c6c7cfcbc7cedfd4cfcfcfcfdfaaabbcdf92c2d4c6c6d1c9cfcccecbcdcccccafffe-CHECKSUM new file mode 100644 index 000000000000..ad1fd3872906 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cdcbdfcdcdc5cdcac5cfc8d1c6c7cfcbc7cedfd4cfcfcfcfdfaaabbcdf92c2d4c6c6d1c9cfcccecbcdcccccafffe-CHECKSUM @@ -0,0 +1 @@ +w \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cec6dfcfc9c5cccfc5cecbd1cdcdc7cbcbcbdfd4cfcfcfcfdfaaabbcdf92c2d4cccecbd1cccfcccbcbccc7c8c9fffe b/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cec6dfcfc9c5cccfc5cecbd1cdcdc7cbcbcbdfd4cfcfcfcfdfaaabbcdf92c2d4cccecbd1cccfcccbcbccc7c8c9fffe deleted file mode 100644 index f50d55fe0981b6a65fce489e05d38208b0367f61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2818 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 U!~!1tI{*Ox|HC>pkP0aP0Keda&Hw-a diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cec6dfcfc9c5cccfc5cecbd1cdcdc7cbcbcbdfd4cfcfcfcfdfaaabbcdf92c2d4cccecbd1cccfcccbcbccc7c8c9fffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cec6dfcfc9c5cccfc5cecbd1cdcdc7cbcbcbdfd4cfcfcfcfdfaaabbcdf92c2d4cccecbd1cccfcccbcbccc7c8c9fffe-CHECKSUM deleted file mode 100644 index 73a9cf3a075e..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cec6dfcfc9c5cccfc5cecbd1cdcdc7cbcbcbdfd4cfcfcfcfdfaaabbcdf92c2d4cccecbd1cccfcccbcbccc7c8c9fffe-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -^X \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cec6dfcfc9c5cccfc5ceccd1c6cfcbcbc9cddfd4cfcfcfcfdfaaabbcdf92c2d4ccceccd1c6c8c6cbcac7c9cdc9fffe b/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cec6dfcfc9c5cccfc5ceccd1c6cfcbcbc9cddfd4cfcfcfcfdfaaabbcdf92c2d4ccceccd1c6c8c6cbcac7c9cdc9fffe deleted file mode 100644 index 0ae37bb69d51c9fb33fa33d36d2ccc7f28494e78..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2723 zcmV;U3S9LciwFP!00000|IAu_Y#c`wpPAjgTaWEzb4{9MMPa+5<+63$_4y-?k&t7z zQj$_BI4%+vVzYNUwl_WRUT^mrrxL=IpyWy#N`AR z5_-nl<=Li$p7owyXiDe>@7wjJgx0;MOHBz~@}6F7O6W!J>7}NGUV2czy)cV&_G#N8 zD;yMV!h@L6^cBP8);NBR!vmPETbAR0D$u5-6CO#JedkASe)spUy!X`JBAffod6Yod8mdt>`aYTkVqocENS}xB37BI+0r22y2rfc!34+%kcpHMB zL39~{g_C%f$F&-4uNwL)hj=JO_UOqD7Spz<^AL2l1usKzf;yRy#bt`WOhvNrK83Pa zgYb;E-$nSbm?j`ZBncrn5sGw?z6gi#?nP}yEvaqMZlO~|MRXB<7!SD9N7X3K0m~v) zq}Cz*1_bXw@J~p)-h2ST8Ul|X@J*DE>qP|C5qJ&V@HPUM5m=+Z8H#$E0?$)GzMsPX zMVPtIGKtMIA}qqG#LAhEV`S)_dLcLM$z*r7dT+tGie)YuOI@h;Ff~_6O9~mf9IWrG zna$|Miy_*446jSZ5V=7sf+z+hHF7Zk>xO6@Qa#211u=My#xK*DwTa^x=910l+QP68 z)7_>K88i24)dun6u)*BhaDP>^ox5tf<`A8ugh7@GR{Vy>zI#t{^H8nMVge2;{rM?&n82t_1PB3%UQ5N=UI?@;&;6h;k$-_a(XBBt&pr#G#g z4NjhsjkMDqczUj$j=PI1E9_T`^|grf?qn8lLHcPx!2Nz22ubpx`+53iyvxtiX;zYM zZ7pMmq5dt6e?#NGs#Vb(!!m7tPg}$l-0yx}HJsCTbQk#&9t>A}rrYc>jM=K@7*0bc zUic|)Ctpy&v2PD%&%f0LZ7%r>=#3W~X6DYdB#NY4QW~)wfstb~3RKWE=pd$Rls4|c zB|mK>u&XKPYKUBo`2j-GS0U}I5cw*^zHVna`96c6XYfGXsuFdDtd!jXcW>6ICnE$V5j^aV+s)Dwo`gIMSpf@k`k0x`bM}QFEa)s%p&yV22u#ydf8wO{4 zGUIn>{0xoRinX#rOvmQ=EX6wR0o_GGJB<6R@<~#0+&&3)RRG(KvOAgDc=8a=2PoSL zrp!Eee`~?ydLhLCrNFivZtJRDp$*`}KgIuy{|j@7s2~zSW1{?87_k z$}-U#RidjWt+LJE)RwNMaep{R&1%Et9SzgCr$N-Zb;{6-`!eggXa`TiU8r&f=PPv* zRrP(r>|+P9i@PX4~qY9z|4{e?3SX~lj#k!e;+MhEMb=POXBy27 zGTPNoGPe%%HtjZheKNjC<0#<u$%}dslxP>_ zB%JAqR}k>}HwOQO!8;vdYNivvPNg<(hjCvpsk>YH@E&<9wQ0uO+wnkEvmLb&Tzk>I zT_oR%v45-TotjKn#de)&wq<%1zy{aO`MGbkoR%?n=^N;jGjalx9GKgvR(8+0Yw_NH z8RCQf-BRR9>*aLlh8laJ2AlyQCLn!bogzR;5Fi8ugvGFbf^9vK{FugX&=}Y1#=SFj>WgDxbX3u)-v*;su&htK8kZnEmQ#;a<@GEGwPTl=xL>^X*a z#uLD|+o@-HY zE6H&u64D^IdLw554f>XiyNhd~_2s12TOEwc_RvA0)j=V{!Jx?B?%YZW72KzjMXgbF z^fIRl3hob`MLfcT(Iws*#{-N5&k>Ib-jny!morbk`>#LxKYf{sZv6^~CDY(2SU?<* zk4v9s^+NCsPo$AfR=z~HSn+4^NKTkh{9oAUg)(MqmhCLniOntc1pVQ!J^8?&GN3P| zpf5(ymwJO9nF*kuD108%4zV3>xi`jt@Ys_tzTOVoNWor?U>iL$9-8rCPq76cfEjQU zOv9txfd0K-zyHK-XJ1|Y#F4lEtbb$SIf&UMYh-xj;P6->e{ZQYTpFGbt}7{}(OVVw ze{tmC)Y!<>SV=1Cp$_9phw)N}@zDDHhj<`@{{;X5|NpeP&4vFb001}{Vio`Z diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cec6dfcfc9c5cccfc5ceccd1c6cfcbcbc9cddfd4cfcfcfcfdfaaabbcdf92c2d4ccceccd1c6c8c6cbcac7c9cdc9fffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cec6dfcfc9c5cccfc5ceccd1c6cfcbcbc9cddfd4cfcfcfcfdfaaabbcdf92c2d4ccceccd1c6c8c6cbcac7c9cdc9fffe-CHECKSUM deleted file mode 100644 index 98cac927d12f..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cec6dfcfc9c5cccfc5ceccd1c6cfcbcbc9cddfd4cfcfcfcfdfaaabbcdf92c2d4ccceccd1c6c8c6cbcac7c9cdc9fffe-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -o{ \ No newline at end of file