From fbdcca5cd26f3eb3338fd16c6e531530d077e787 Mon Sep 17 00:00:00 2001 From: adityamaru Date: Thu, 22 Dec 2022 00:56:38 +0530 Subject: [PATCH] backupccl: update `cluster` fixture and remove 20.1 zcfg fixutre This change removes old cluster restore fixtures, and replaces them with a cluster backup from 22.2.0. It also removes a 20.1 fixture that tested restore of a zoneconfig privilege that was overwritten as the usage privilege in 20.2+ versions. This test has been migrated to a regular test instead. Release note: None --- .../backupccl/restore_old_versions_test.go | 111 +----------------- .../testdata/backup-restore/regression-tests | 48 ++++++++ .../BACKUP-LOCK-824468910992424961} | 0 .../2022/12/22-030544.02/BACKUP-STATISTICS | Bin 0 -> 4138 bytes .../2022/12/22-030544.02/BACKUP_MANIFEST | Bin 0 -> 3130 bytes .../12/22-030544.02/BACKUP_MANIFEST-CHECKSUM | 1 + .../22-030544.02/data/824468911158099969.sst | Bin 0 -> 2458 bytes ...abbcdf92c2d4cecdcad1cfcacfc6cac6ccc8c6fffe | Bin 0 -> 3115 bytes ...2d4cecdcad1cfcacfc6cac6ccc8c6fffe-CHECKSUM | 1 + ...abbcdf92c2d4cecdcad1cfcccccac9c9cfcdc8fffe | Bin 0 -> 2975 bytes ...2d4cecdcad1cfcccccac9c9cfcdc8fffe-CHECKSUM | 1 + ...abbcdf92c2d4cecdcad1cfc8cecfc7cbc6cecafffe | 1 + .../create.sql} | 0 .../cluster/v20.1.7/599877416589295618.sst | Bin 3409 -> 0 bytes .../cluster/v20.1.7/599877416589328386.sst | Bin 998 -> 0 bytes .../cluster/v20.1.7/599877416589590532.sst | Bin 1059 -> 0 bytes .../cluster/v20.1.7/599877416589754372.sst | Bin 1105 -> 0 bytes .../cluster/v20.1.7/599877416590540803.sst | Bin 952 -> 0 bytes .../cluster/v20.1.7/599877416590573571.sst | Bin 1177 -> 0 bytes .../cluster/v20.1.7/599877416590606339.sst | Bin 938 -> 0 bytes .../cluster/v20.1.7/599877416591523844.sst | Bin 1353 -> 0 bytes .../cluster/v20.1.7/599877416595816451.sst | Bin 1009 -> 0 bytes .../cluster/v20.1.7/599877416596144131.sst | Bin 934 -> 0 bytes .../cluster/v20.1.7/599877416597553155.sst | Bin 938 -> 0 bytes .../cluster/v20.1.7/BACKUP | Bin 5674 -> 0 bytes ...KUP-CHECKPOINT-779898255398535169-CHECKSUM | 1 - .../v21.1.19/BACKUP-CHECKPOINT-CHECKSUM | 1 - .../cluster/v21.1.19/BACKUP-STATISTICS | 0 .../cluster/v21.1.19/BACKUP_MANIFEST | Bin 2506 -> 0 bytes .../cluster/v21.1.19/BACKUP_MANIFEST-CHECKSUM | 1 - .../v21.1.19/data/779898260043694084.sst | Bin 1465 -> 0 bytes .../v21.1.19/data/779898260043792387.sst | Bin 991 -> 0 bytes .../v21.1.19/data/779898260043825153.sst | Bin 1061 -> 0 bytes .../v21.1.19/data/779898260043890689.sst | Bin 1118 -> 0 bytes .../v21.1.19/data/779898260044513282.sst | Bin 1182 -> 0 bytes .../v21.1.19/data/779898260045299713.sst | Bin 1361 -> 0 bytes .../v21.1.19/data/779898260664254465.sst | Bin 1012 -> 0 bytes .../v21.1.19/data/779898260732018689.sst | Bin 977 -> 0 bytes .../BACKUP-CHECKPOINT-780216800973717505 | Bin 2724 -> 0 bytes ...KUP-CHECKPOINT-780216800973717505-CHECKSUM | 1 - ...KUP-CHECKPOINT-780216804883595265-CHECKSUM | 1 - .../v21.2.13/BACKUP-CHECKPOINT-CHECKSUM | 1 - .../cluster/v21.2.13/BACKUP-STATISTICS | 0 .../cluster/v21.2.13/BACKUP_MANIFEST | Bin 2907 -> 0 bytes .../cluster/v21.2.13/BACKUP_MANIFEST-CHECKSUM | 1 - .../v21.2.13/data/780216812180635650.sst | Bin 1264 -> 0 bytes .../v21.2.13/data/780216812182700033.sst | Bin 1154 -> 0 bytes .../v21.2.13/data/780216812748275713.sst | Bin 1361 -> 0 bytes .../v21.2.13/data/780216813191069697.sst | Bin 2565 -> 0 bytes .../cluster/v22.1.3/BACKUP-STATISTICS | 0 .../cluster/v22.1.3/BACKUP_MANIFEST | Bin 3176 -> 0 bytes .../cluster/v22.1.3/BACKUP_MANIFEST-CHECKSUM | 1 - .../v22.1.3/data/780220991158943746.sst | Bin 991 -> 0 bytes .../v22.1.3/data/780220991161040897.sst | Bin 3169 -> 0 bytes .../v22.1.3/data/780220991337857025.sst | Bin 1547 -> 0 bytes .../cluster/v22.1.3/fileinfo.sst | Bin 1195 -> 0 bytes .../cluster/v22.1.3/metadata.sst | Bin 5232 -> 0 bytes ...cecfd1cac9cecbcccddfd4cfcfcfcfdfaaabbcfffe | Bin 3041 -> 0 bytes ...9cecbcccddfd4cfcfcfcfdfaaabbcfffe-CHECKSUM | 1 - ...cecfd1cdccc7cbc6c9dfd4cfcfcfcfdfaaabbcfffe | Bin 2994 -> 0 bytes ...cc7cbc6c9dfd4cfcfcfcfdfaaabbcfffe-CHECKSUM | 1 - .../create_with_privileges.sql | 20 ---- .../privileges/v20.1.6/657900117481816066.sst | Bin 1118 -> 0 bytes .../privileges/v20.1.6/657900117481848836.sst | Bin 938 -> 0 bytes .../privileges/v20.1.6/657900117481881604.sst | Bin 952 -> 0 bytes .../privileges/v20.1.6/657900117481914372.sst | Bin 1063 -> 0 bytes .../privileges/v20.1.6/657900117482045442.sst | Bin 968 -> 0 bytes .../privileges/v20.1.6/657900117482078210.sst | Bin 2475 -> 0 bytes .../privileges/v20.1.6/657900117485420546.sst | Bin 1138 -> 0 bytes .../privileges/v20.1.6/657900117485879300.sst | Bin 1356 -> 0 bytes .../privileges/v20.1.6/657900117486469124.sst | Bin 938 -> 0 bytes .../privileges/v20.1.6/657900117486829572.sst | Bin 1062 -> 0 bytes .../privileges/v20.1.6/BACKUP | Bin 6218 -> 0 bytes 73 files changed, 53 insertions(+), 140 deletions(-) rename pkg/ccl/backupccl/testdata/restore_old_versions/cluster/{v22.1.3/BACKUP-LOCK-780220986219692033 => 22.2.0/2022/12/22-030544.02/BACKUP-LOCK-824468910992424961} (100%) create mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/BACKUP-STATISTICS create mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/BACKUP_MANIFEST create mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/BACKUP_MANIFEST-CHECKSUM create mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/data/824468911158099969.sst create mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdcddfcfccc5cfcac5cbcbd1cfc7cdc9cec8c6ccc8dfd4cfcfcfcfdfaaabbcdf92c2d4cecdcad1cfcacfc6cac6ccc8c6fffe create mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdcddfcfccc5cfcac5cbcbd1cfc7cdc9cec8c6ccc8dfd4cfcfcfcfdfaaabbcdf92c2d4cecdcad1cfcacfc6cac6ccc8c6fffe-CHECKSUM create mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdcddfcfccc5cfcac5cbcbd1cfc9cacdcdcbcac7cadfd4cfcfcfcfdfaaabbcdf92c2d4cecdcad1cfcccccac9c9cfcdc8fffe create mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdcddfcfccc5cfcac5cbcbd1cfc9cacdcdcbcac7cadfd4cfcfcfcfdfaaabbcdf92c2d4cecdcad1cfcccccac9c9cfcdc8fffe-CHECKSUM create mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/metadata/latest/LATEST-13cdcfcdcdd2cecdd2cdcddfcfccc5cfcac5cbcbd1cecfcdc8cbcccbc6dfd4cfcfcfcfdfaaabbcdf92c2d4cecdcad1cfc8cecfc7cbc6cecafffe rename pkg/ccl/backupccl/testdata/restore_old_versions/{create_cluster.sql => cluster/create.sql} (100%) delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v20.1.7/599877416589295618.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v20.1.7/599877416589328386.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v20.1.7/599877416589590532.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v20.1.7/599877416589754372.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v20.1.7/599877416590540803.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v20.1.7/599877416590573571.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v20.1.7/599877416590606339.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v20.1.7/599877416591523844.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v20.1.7/599877416595816451.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v20.1.7/599877416596144131.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v20.1.7/599877416597553155.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v20.1.7/BACKUP delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.1.19/BACKUP-CHECKPOINT-779898255398535169-CHECKSUM delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.1.19/BACKUP-CHECKPOINT-CHECKSUM delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.1.19/BACKUP-STATISTICS delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.1.19/BACKUP_MANIFEST delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.1.19/BACKUP_MANIFEST-CHECKSUM delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.1.19/data/779898260043694084.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.1.19/data/779898260043792387.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.1.19/data/779898260043825153.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.1.19/data/779898260043890689.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.1.19/data/779898260044513282.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.1.19/data/779898260045299713.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.1.19/data/779898260664254465.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.1.19/data/779898260732018689.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.2.13/BACKUP-CHECKPOINT-780216800973717505 delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.2.13/BACKUP-CHECKPOINT-780216800973717505-CHECKSUM delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.2.13/BACKUP-CHECKPOINT-780216804883595265-CHECKSUM delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.2.13/BACKUP-CHECKPOINT-CHECKSUM delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.2.13/BACKUP-STATISTICS delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.2.13/BACKUP_MANIFEST delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.2.13/BACKUP_MANIFEST-CHECKSUM delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.2.13/data/780216812180635650.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.2.13/data/780216812182700033.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.2.13/data/780216812748275713.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.2.13/data/780216813191069697.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/BACKUP-STATISTICS delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/BACKUP_MANIFEST delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/BACKUP_MANIFEST-CHECKSUM delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/data/780220991158943746.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/data/780220991161040897.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/data/780220991337857025.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/fileinfo.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/metadata.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cfc8d2cec7dfcdcfc5cfc6c5cecfd1cac9cecbcccddfd4cfcfcfcfdfaaabbcfffe delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cfc8d2cec7dfcdcfc5cfc6c5cecfd1cac9cecbcccddfd4cfcfcfcfdfaaabbcfffe-CHECKSUM delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cfc8d2cec7dfcdcfc5cfc6c5cecfd1cdccc7cbc6c9dfd4cfcfcfcfdfaaabbcfffe delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cfc8d2cec7dfcdcfc5cfc6c5cecfd1cdccc7cbc6c9dfd4cfcfcfcfdfaaabbcfffe-CHECKSUM delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/create_with_privileges.sql delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117481816066.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117481848836.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117481881604.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117481914372.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117482045442.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117482078210.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117485420546.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117485879300.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117486469124.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117486829572.sst delete mode 100644 pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/BACKUP diff --git a/pkg/ccl/backupccl/restore_old_versions_test.go b/pkg/ccl/backupccl/restore_old_versions_test.go index 2fc4bc9ae406..a5472e88bbf2 100644 --- a/pkg/ccl/backupccl/restore_old_versions_test.go +++ b/pkg/ccl/backupccl/restore_old_versions_test.go @@ -68,7 +68,6 @@ func TestRestoreOldVersions(t *testing.T) { var ( exportDirsWithoutInterleave = testdataBase + "/exports-without-interleaved" clusterDirs = testdataBase + "/cluster" - privilegeDirs = testdataBase + "/privileges" multiRegionDirs = testdataBase + "/multi-region" publicSchemaDirs = testdataBase + "/public-schema-remap" systemUsersDirs = testdataBase + "/system-users-restore" @@ -94,12 +93,6 @@ func TestRestoreOldVersions(t *testing.T) { exportDir, err := filepath.Abs(filepath.Join(clusterDirs, dir.Name())) require.NoError(t, err) - // TODO(adityamaru): Figure out how to generate a 20.1.7 fixture using the - // updated `create_cluster.sql` file. - if strings.Contains(dir.Name(), "v20.1.7") { - t.Run(dir.Name(), deprecatedRestoreOldVersionClusterTest(exportDir)) - continue - } t.Run(dir.Name(), restoreOldVersionClusterTest(exportDir)) } }) @@ -116,17 +109,6 @@ func TestRestoreOldVersions(t *testing.T) { } }) - t.Run("zoneconfig_privilege_restore", func(t *testing.T) { - dirs, err := os.ReadDir(privilegeDirs) - require.NoError(t, err) - for _, dir := range dirs { - require.True(t, dir.IsDir()) - exportDir, err := filepath.Abs(filepath.Join(privilegeDirs, dir.Name())) - require.NoError(t, err) - t.Run(dir.Name(), restoreV201ZoneconfigPrivilegeTest(exportDir)) - } - }) - t.Run("public_schema_remap", func(t *testing.T) { dirs, err := os.ReadDir(publicSchemaDirs) require.NoError(t, err) @@ -300,97 +282,6 @@ func restoreOldVersionTest(exportDir string) func(t *testing.T) { } } -// restoreV201ZoneconfigPrivilegeTest checks that privilege descriptors with -// ZONECONFIG from tables and databases are correctly restored. -// The ZONECONFIG bit was overwritten to be USAGE in 20.2 onwards. -// We only need to test restoring with full cluster backup / restore as -// it is the only form of restore that restores privileges. -func restoreV201ZoneconfigPrivilegeTest(exportDir string) func(t *testing.T) { - return func(t *testing.T) { - const numAccounts = 1000 - _, _, tmpDir, cleanupFn := backupRestoreTestSetup(t, multiNode, numAccounts, InitManualReplication) - defer cleanupFn() - - _, sqlDB, cleanup := backupRestoreTestSetupEmpty(t, singleNode, tmpDir, - InitManualReplication, base.TestClusterArgs{}) - defer cleanup() - err := os.Symlink(exportDir, filepath.Join(tmpDir, "foo")) - require.NoError(t, err) - sqlDB.Exec(t, `RESTORE FROM $1`, localFoo) - testDBGrants := [][]string{ - {"test", "admin", "ALL", "true"}, - {"test", "root", "ALL", "true"}, - {"test", "testuser", "ZONECONFIG", "false"}, - } - sqlDB.CheckQueryResults(t, `show grants on database test`, testDBGrants) - - testTableGrants := [][]string{ - {"test", "public", "test_table", "admin", "ALL", "true"}, - {"test", "public", "test_table", "root", "ALL", "true"}, - {"test", "public", "test_table", "testuser", "ZONECONFIG", "false"}, - } - sqlDB.CheckQueryResults(t, `show grants on test.test_table`, testTableGrants) - - testTable2Grants := [][]string{ - {"test", "public", "test_table2", "admin", "ALL", "true"}, - {"test", "public", "test_table2", "root", "ALL", "true"}, - {"test", "public", "test_table2", "testuser", "ALL", "false"}, - } - sqlDB.CheckQueryResults(t, `show grants on test.test_table2`, testTable2Grants) - } -} - -func deprecatedRestoreOldVersionClusterTest(exportDir string) func(t *testing.T) { - return func(t *testing.T) { - externalDir, dirCleanup := testutils.TempDir(t) - ctx := context.Background() - tc := testcluster.StartTestCluster(t, singleNode, base.TestClusterArgs{ - ServerArgs: base.TestServerArgs{ - // Disabling the test tenant due to test failures. More - // investigation is required. Tracked with #76378. - DisableDefaultTestTenant: true, - ExternalIODir: externalDir, - }, - }) - sqlDB := sqlutils.MakeSQLRunner(tc.Conns[0]) - defer func() { - tc.Stopper().Stop(ctx) - dirCleanup() - }() - err := os.Symlink(exportDir, filepath.Join(externalDir, "foo")) - require.NoError(t, err) - - // Ensure that the restore succeeds. - sqlDB.Exec(t, `RESTORE FROM $1`, localFoo) - - sqlDB.CheckQueryResults(t, "SHOW USERS", [][]string{ - {"admin", "", "{}"}, - {"craig", "", "{}"}, - {"root", "", "{admin}"}, - }) - sqlDB.CheckQueryResults(t, "SELECT comment FROM system.comments ORDER BY object_id", [][]string{ - {"database comment string"}, - {"table comment string"}, - }) - // In the backup, Public schemas for non-system databases have ID 29. - // These should all be updated to explicit public schemas. - sqlDB.CheckQueryResults(t, `SELECT - if((id = 29), 'system', 'non-system') AS is_system_schema, count(*) as c -FROM - system.namespace -WHERE - "parentSchemaID" = 0 AND name = 'public' -GROUP BY - is_system_schema -ORDER BY - c ASC`, [][]string{ - {"system", "1"}, - {"non-system", "3"}, - }) - sqlDB.CheckQueryResults(t, "SELECT * FROM data.bank", [][]string{{"1"}}) - } -} - func restoreOldVersionClusterTest(exportDir string) func(t *testing.T) { return func(t *testing.T) { externalDir, dirCleanup := testutils.TempDir(t) @@ -412,7 +303,7 @@ func restoreOldVersionClusterTest(exportDir string) func(t *testing.T) { require.NoError(t, err) // Ensure that the restore succeeds. - sqlDB.Exec(t, `RESTORE FROM $1`, localFoo) + sqlDB.Exec(t, `RESTORE FROM LATEST IN $1`, localFoo) sqlDB.CheckQueryResults(t, "SHOW DATABASES", [][]string{ {"data", "root", "NULL", "NULL", "{}", "NULL"}, diff --git a/pkg/ccl/backupccl/testdata/backup-restore/regression-tests b/pkg/ccl/backupccl/testdata/backup-restore/regression-tests index 6f085c0ad295..01eccecef9d5 100644 --- a/pkg/ccl/backupccl/testdata/backup-restore/regression-tests +++ b/pkg/ccl/backupccl/testdata/backup-restore/regression-tests @@ -34,3 +34,51 @@ SELECT count(*) FROM [SHOW DATABASES] WHERE database_name = 'db1' 1 subtest end + +subtest privileges-zone-config + +exec-sql +CREATE DATABASE test; +SET database = test; +CREATE USER testuser; +CREATE TABLE test_table(); +CREATE TABLE test_table2(); +GRANT ZONECONFIG ON DATABASE test TO testuser; +GRANT ZONECONFIG ON test_table TO testuser; +GRANT ALL ON test_table2 TO testuser; +---- + +exec-sql +BACKUP INTO 'nodelocal://1/priv-zone-cfg' +---- + +new-cluster name=s3 share-io-dir=s2 +---- + +exec-sql +RESTORE FROM LATEST IN 'nodelocal://1/priv-zone-cfg'; +---- + +query-sql +show grants on database test; +---- +test admin ALL true +test public CONNECT false +test root ALL true +test testuser ZONECONFIG false + +query-sql +show grants on test.test_table +---- +test public test_table admin ALL true +test public test_table root ALL true +test public test_table testuser ZONECONFIG false + +query-sql +show grants on test.test_table2 +---- +test public test_table2 admin ALL true +test public test_table2 root ALL true +test public test_table2 testuser ALL false + +subtest end diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/BACKUP-LOCK-780220986219692033 b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/BACKUP-LOCK-824468910992424961 similarity index 100% rename from pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/BACKUP-LOCK-780220986219692033 rename to pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/BACKUP-LOCK-824468910992424961 diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/BACKUP-STATISTICS new file mode 100644 index 0000000000000000000000000000000000000000..635cd4a79bf30929f9ecc0dbeaf59fc34068d930 GIT binary patch literal 4138 zcmai1e{2**6yDkGU8i#`-7W>nMWn3?rAj>&O{<_yG=y9ia&&+flI)dRTF6MU7F0Np&xOe7N3Mer}7ml}A-17#?r zO{~-=HX=|g#k%S7&$Qr|;jF1&v; zqhlke<$-Cuh_7Ha93N?5a=jN7IZ<{(ZW$efKi{%2o^9$y+C(v(CNi5zW?S)SlRe$w zW|CIK)>Fb!!_Vv3PwrRuQ$= zN22li#q1h6XTV&xcXY{fX_Wh%72)D9iB-V@ z#W_;RpsimhP~8nR<=S;5Ya{Q_yLOqd0mJk9Sd&^%u z_;#nzuvc|VtKlQN5EE$~QbeeGl1PJ7baqoTvff_2!H&hBfZ4S`d4|;#TO76<Ej}vF48N zzj*`&X}7t1hC?q6Dp0YU3aD$XcT{hjR-j^O%miJ;68`*x3^kB0>5?)Q+IdzE<<|0J z36pX18SaxKnW-s(%msNUC17CZz0Pz7@@g0!{q3m1pss@ss8VPmv0sLYf)r5MdkWoo zOHma?lL=bJRFmT}G_~Lu*2!<%m>ii>YMDe9;KyiL4IEU5Ho5$FUH@h&tk^WJ`Lq%z z)_NM3rur5#S0(6cs`<&pQPt(itviEe6+@2SRgmJ4#E@yLmWqzw zR-oc^kqOH4ZT?q*ilat`d>imO5FH#$elJ~pX_>tD5xx5Mw4B*uuuID_IHe$e&VApT zbBDvv!J#ST>r&}!f*z|~wHwMIHdEU-q^QwalhvMau1M9u%r8rcsZZa*sl5>PM}B8% s+3u~?-pMjsw|n6NZjhBs=AWMw8G6W&WfnO{C1SG63ThFzB6$G%e~fi=uK)l5 literal 0 HcmV?d00001 diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/BACKUP_MANIFEST new file mode 100644 index 0000000000000000000000000000000000000000..ae64d79bed7e3a0d14b938f17b356d209e060efb GIT binary patch literal 3130 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 literal 0 HcmV?d00001 diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdcddfcfccc5cfcac5cbcbd1cfc7cdc9cec8c6ccc8dfd4cfcfcfcfdfaaabbcdf92c2d4cecdcad1cfcacfc6cac6ccc8c6fffe b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdcddfcfccc5cfcac5cbcbd1cfc7cdc9cec8c6ccc8dfd4cfcfcfcfdfaaabbcdf92c2d4cecdcad1cfcacfc6cac6ccc8c6fffe new file mode 100644 index 0000000000000000000000000000000000000000..f661934d7a92831d1d45fa395b624dc76010c70d GIT binary patch literal 3115 zcmV+`4Ak=*rUIF z`P^2H=FsV;fKESRjvj3a=+TGG(V3=z&RC}Q$Uxk(F;uhyLnffdW}}048aZ3z*)?g8boSdF6(N$%nlqkaY-eGA-O?% z&=KMyVeO-4AA&eutCuQr{R9J9D0o(hEr3M_i|Fp3HhE%9SRCL%3Z%g#$bvagLp7pC zo+N3&JDR=?$tNKE0gTZg30Uwn1eYMV48c_hUW4FGh^|2}w}3ZUTuaXOQb}245DNuQ zA351UV^|mQ1O%OR!D|p4Ar=B*agAWF5nfnWpWLumg7B2J-zE6JK23o0Na9>@Jmkp~ zc?s^oo9E?WEd@Lu zWF*f-2dwF$Wk~et1LXMNDv4htF|DhHQK}YnHrD2b?U?K}jfj{!CYKwk<%ce7{~r&O zW!*SjQ)EL`7=jz3DM#Y>w3S0PRkh=(?bFlKhwi!W?t_Q++;^aTmtmZ+G#)xpQ>}~= z)EeP^YIdn5qgcj?Hf}KpN%VJKzg*I9Y}}8xnNg6IOtg{(ObTF?d=da>S;W~EaY2hX z-y$CJh$nb51(qRPV+egf;P(lP8YOl^TkxbXaa29A>e%UW@{Dwgop#5Qv-PmwO1}wEou|XB1kGAo#&%u(M-u;m#EG(&myMEE z)!8j=9#7)|^XqcSIB{=pp3mSRSK(tRVr%L&{;Mr zVh!_v?xCO^#tALApymy;PeMHvz?jG7mo3S}>Vb2tGi;(Ji{$ zn$eyn%y{n*@%^N}(e{{#)f%~SDbMgM=o%qALJ?wG!1)$%jsGIE(DQQ(nt`~F$wwUUZ!* z+MW?T(!~}!#V}K18wq0AKCuP*%AIN#Y8eL1&@TzmlJRWpWd+EfpBTcPa{nJM_ znZ%UElUcb3yuf+zxE7ju$WwgGJn0rOr5Q!F&Ok2gGtTuHXZwr`dxmTC3>Wqc*WwvF zgYj{m<`XFNV)y3OTYk<-2C-UnvC7$hGEwrHn}vKnr!=NbgLJs)Gw$2@MW zPd>N6<@V+vx6XwROu=OcUV-2}$kLEe*z4D?Uyt)j3S>wV!S=J4y;aq!>{aqyQ!q~o5wN6c{r((OV z%DPsyDu6E6&hgprww#teci|i8kTGHaljx}HRx6ul+>LndzXkD>eYfOU(t0`Vnj!gC zNDgO!^9cxFSceGU0t9dl0d6sDpI~cGB)=r_DaiF;6T_R;MZ;8HmhxJ)s^;z1eylB`#_&defz)eYW&QRD^_SPi|r4 zM$`{)5y*GrWI)R8XsE7@hTqM#rrC%nj?ezIC5l@~_B#=m2C>x|F#@R5w{-6=ZbYmX zgR$OfpkKDT26C+iauEhPMgDr{RyCQ&2}PZk8)ZYuF$$N)1Fo@%MR>@ LxmfU#pa zVo}l>S+Bl)|NOh3ylB7rGVR^^B@wM=!G17@7$6=LK2Ix2=NncPMmlNvCfTCJUd19Y zpeAjQGSz0eYg!V~3n2?iAq$G01*QHhcz@}_QjdF>0$(C9nUkwW*$Q8@jvsH=nQa)#ZAE*;ebO+7IRzx4>3if6qltq|J6CIK-T*d1-@4WZA&48DFy9ZYw_42{g3uO-GI2)q- z)4_@<)1%)_nWgrWIZY=42WG&2kcIo1!<72NS9ALhUjYT`g=PNhbITCZ1#M(_WNLUM zdE2o}W;ipP-kDPkc{sCkBt5x%XF*jmnF)D(_rwHuQzo6s>>A1J%8c+MQ`4F8>G3Hc zMXN3IU!Aq?X;HfEL0nF?pL`u{qYcUD;uv9 z%6#!*2p)$FX!*Mc;bpjmCX<_H_Uyg)@PVBN5A8X0&%s0Y>^*4CQyu1G9p*Q5nBUT2 zertz$w!{4G9p>-oFu$Y2e7eJYro;SbhxxG%^OcDCHy};l%pf!C{W|~v|Nlc1_b?4D F006=j66yc| literal 0 HcmV?d00001 diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdcddfcfccc5cfcac5cbcbd1cfc7cdc9cec8c6ccc8dfd4cfcfcfcfdfaaabbcdf92c2d4cecdcad1cfcacfc6cac6ccc8c6fffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdcddfcfccc5cfcac5cbcbd1cfc7cdc9cec8c6ccc8dfd4cfcfcfcfdfaaabbcdf92c2d4cecdcad1cfcacfc6cac6ccc8c6fffe-CHECKSUM new file mode 100644 index 000000000000..3cc9130265a1 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdcddfcfccc5cfcac5cbcbd1cfc7cdc9cec8c6ccc8dfd4cfcfcfcfdfaaabbcdf92c2d4cecdcad1cfcacfc6cac6ccc8c6fffe-CHECKSUM @@ -0,0 +1 @@ +MI= \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdcddfcfccc5cfcac5cbcbd1cfc9cacdcdcbcac7cadfd4cfcfcfcfdfaaabbcdf92c2d4cecdcad1cfcccccac9c9cfcdc8fffe b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdcddfcfccc5cfcac5cbcbd1cfc9cacdcdcbcac7cadfd4cfcfcfcfdfaaabbcdf92c2d4cecdcad1cfcccccac9c9cfcdc8fffe new file mode 100644 index 0000000000000000000000000000000000000000..a67d6611b69001cd2f3d59a020c5e6f37bbb82c2 GIT binary patch literal 2975 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 diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v20.1.7/599877416589328386.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v20.1.7/599877416589328386.sst deleted file mode 100644 index ac69005894d7773dc90a3e9e1e3a4abcc1737d62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 998 zcmah|J!lj`6rQ={a(kD{<>!)!Q6x%AGsNE%;ZXc7Y{UdCLRe;Z-(A+s&a5-DceepU z8X@?D>5Pqqc2+imppCs)ieP7HWhI0lac1vw+K5x_d+&SieeZj3(YgH72V*MneSiQ0 zgvWQ?$3F&k%TLC3emRTe*-Bv(Z=uNx_YQxleHbWW)Oqihx8C$sPvnPo$KSq27Ww?s z&o1)F#`hQdJ>9&O@RXi$7kxj|LrI1|HFhM6_+%c8cYk zkRNbBGyPKdYs#QJWW2=_oB3iB&YE_#(b#`HzK@(W*%<1{_^9$2To0`x_YjX?JW>Pl@eeHUw24y|# zN(ZiW8&t^u_<`Fg0}CmZu>@*65gkT=oFWdWrbLD7po@bT7-%DlnNlI=m;-GyKc~!9 zO1nl4APpuwYr|ch?I07Z(BA}U$H^Jf8N?mkvZAO|!R<~(!hkpQDk=_PAtS0uHwift zxU&H(Zm3A2Kw1i@(vK~%qm@bAq%1LuQX~Lo_yYHZy*#IaBajUsA_hr$pis51U{vP` zW3iUbFy=`_vJtbjD_kyM;97>Da^+!cavCseYC@(yG6{kOpmetAjzklM?l~AWB=t>o z!f6EE7Nyavwzp1+xda9_td^IIwwFZ0gC&pMlp?--5W1G-rzfvuLf^98{{dNX%&KTB z<6%X(Q!aHyuvW?Hp8Xs3Z!eo@tase8>1NoN@wV|^zK6Q;${pG+9M^}e=RfcE-sZ!Z HWky~(a9 zPx0dCMNsfP5Kn>#x%ogv{{a=ec=F)En>VkDX!mUVxM&@QuIj4#{pwde{}mE6Qo4R+ z1x->W5Wb8Cx1W3eZ{x3fK1MzseRpZ$b`aD`SFh|HMvWaeYn5V9TXJpxFdF~+pYdb3 zP#h}7in5kJT{~Z0R|((Lr^AcY{~y<i1%mG>Oq9rJcd;Jvx5DW5Uhk;LvEFlJRM6vzpu8J+mX~75+o>QkG-bR?SmGF#1Fx25R8b>U zY{8VI@oW^!@3FAFM1j^!iX(z%S$DvTBAFTM>v_vX&PPpV^yG$(;}Z=IbHFDzZ`!(L z>qJ8v+Y?&d$+3xsois{VY@%k@fOe6y+9Z(++bkx2#zD9#6PMzLSOIlN#IO{Q=NA%c zDADXJEMUJM0|#Suv14lFt@fZ}1rU@+TARqq0i?xc)A?{lNT-&wp>p3GC^t{RdR{;7 z372<8K?Qeu9SH}~GPB5Eils`aA&W)GtK;4ZoVrYtwg%-Wph_Qh%tk7Mc#iV6-IOK? za7!3OEE7nOSHUT$77&?%q9V~~pjfuDi#F$(QQk5v+9}Cr%=fNwSjHfXVxawS8MZYo z*kF4?EK=z}y2L&O4(?h{AGPA{lx>k5 zZSq4(X1l&$?ak}E>v!iuA9m=!Njd3-1x4p`9!`YIg)mrD!MS5j`1}vp{OrqdwBpC} n&McgzW9NH;zm$GtJ^bK3c~xG!fLFTEpY6ow3)e>5``&&7R^Cc( diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v20.1.7/599877416589754372.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v20.1.7/599877416589754372.sst deleted file mode 100644 index a613ebeb70b1757d5b548aa5b5aedc2c9f3dda6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1105 zcmaJ=O^6&t6t0?{ak^*Q$?RV?j1$>N2zyA%b$4{ZbusZLdPtVV1QHNwYr5agHmR;| zt7>*9lrJJ9|P3ABBH8aA*%MK9{JfRO?kJ9)vJpKh(Go0*H`u)m>w(LyolW1pLlp_ z;)~~xH*WjCeOz(Is-+_@Hi&<9!x^DRnj4KJdYTe6`=BeeZ|{+c^AQ>Tdtl`5qeJrU zH!ocvLvE;|7BiY9yt`A~E4Z=Tk%8T_2@uD=9+HK<{5+w^j;M(Mcp*=1DAiERHP0a>X4>GOoBuRfx@0 z%EOf)Om|{_`3VJD$EiFad6xA?-5^LagT7uvF6mm(ij7`4^jvd(Qot&Rh1r?87v|JP8nH<=TimTc48(@fVf^E;)XLF zpM_284N(waP!}9i6ZdHsx+s9;BGB3dCMP+uQUQUIhX6SigM|#eF61$mnEC zEU7emb?4}4p5Ht8S}yckw)=lT-f{hc;%hk%E5aS>R|*3atb6_OFYwc`?|&yFkM4Jd n{g4k1_$U3VWcQOp*X!55+bZwdqTOlM@OhRa(X;TS;{5ClUgZ@ z@M|=C=hfN!H+RDjqYyVgKfLy-GBG`Ra=bZ@mcRYHvV=>>8TQ}wk9TiTrSt(!{OTE6 zADp4D9~Y{q8YG&<#2S*)?gelu;Bw%g=CD@DzHwQxa6crb1{kq47C^XU&?Pp{z{Ads z<4nUY?~+|EENCuUOLJ4Wv!`6@KIDIegYl6>iFPWas0FW_2)zWjiIsh{f6su9Y!Jt2vlbZ4A4b7A!hUDAY%; zKnVuM7K`plG*j+h2d9Rni9;unrqFLunb`2XZBE=x5a5r^vmK}Hx@t?d6N_!FvU`K0 z&7wZPe!md*mzo?SqLg`o-es`b!KaLdk%zm7hWF6USG z)ldF(*)He%FMe2heE{>`77&iC)wS=nqsi5g1?}ja_ufCd|06s#dmdjsxitC35o8WF zzwsY47f`n6659D!_n=Fu%}4aaW8eISa+WWG8c~uoXnPA=$_jbms0N`kMx(tV@|UI7 zsxkeC)To4jC|YAcLLNYysH6$TZE*)~3Rn!=WHDq4M9Ayo#X;O!inQu7B>xgyJJNo{ z;sz&+v=Op|gn`L0leO}VCKXgg!q>q>MExbtk2YmaW}5&hb>AN0wAoAsEzgUZO5bHm z=MuHNTBzjo*ujZPiNOl6=|lG%o;+MBN!=?2^<;XyQqq-rLFg;5mMD-$az?7aGh(e3 z@_*#OO_hOBu^lXcnn*;24M3Ki3aFw)hG$?sW#=$3P@0P_QzC1R1#Jz0Q|3vjJdFcL zokcZshi7?YXqi*Y^say~^_ad`Iot);@rts2xZU+g81TAULiTnXi3U|%}IsJNgQEg|b+8N|FGWP8hf!1rQ*s4>v&6f#}&6lm`+G_GC169y8Wd z!s^F7ZjermoxV%#WU!g}5ac$eA8VUBjA@_H!H={-!~(rTolbWdxtWc5&@=?~wRgg4 z12#frcRpZZtAyxLU|^o*lk*zxu_)%je2vZNy}WPp>3GLJIdFdm^us3lf2cfVIVnL~ zojeSLTiD5_x)jXyidl`$exTB^N(~Kc&3Ds$2ZYiEUQhj*-qQMok1v024X>weH=_SP OkN)w(`O)~qSAPTPIB^L8 diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v20.1.7/599877416590606339.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v20.1.7/599877416590606339.sst deleted file mode 100644 index e5b3f5f892aed2f430acf10955316f51dd162630..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 938 zcmah|&2AGh5Vrf5O&ZcaTBHi0NaRSZ0;N?|RUiuGilB%CLM!ijl3MlJi|sVoiUUVf zBn}9v5*PXoJOF1NpeK$zMh`IFBrO-joIK;1Z|3{PCauY@$MaldQWH9Fjq!xOCrkI= z{`zwKpjxG5U^i!Xvhi>%1E1DUc1dmQl+67e7+Jfx`<9=5Ceu-BMZ&ye8Sh_!jYU$A z9MYPwCOvSNl_)&0ggX$-^F#rYT0o!qB8LFGJWF#6ZP{mSsXSPzJFCkJw6||C^#F>$ z!qMzxYE(DVtj#m23MNGuuu_YzW;wUq8=GP?Yk0aJr)CtZSEejDCyjotd7c*wQ5>7x zqwjh+i|NIQ^lp3Q_S#lc!6B&ayLUF$H@2G2BPMi;?bWR&GL3~yeVh~?T!NEuf9%Vt6jzl*i=p%p4RqULPQ4L@n zWs=~-8*PGE!Imo%hhPJpG4!HoI?$~ICA9|a4-lCG-SPXRdW9OBanFWDBwD0{4Fqwe zV_gR}j6fO_Gz@mVu|yBK>f)jt6QFQj(5Vq1NYtPi*bXq0gXLN{vM^pj)pb{?+}mh| z>TbqLisjlJtyd^$ZzbSyhGI& z5rQ`vbT9vgxcB2bnI9iL?i{<}G)V8o`DN1F$?3ug AE&u=k diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v20.1.7/599877416591523844.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v20.1.7/599877416591523844.sst deleted file mode 100644 index 4fc853612b0295933e0e11e1cff542f3e022b07b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1353 zcmaJ>UuYaf7~j21yuH0M&7UTXvDGVvQ=vC*lKYbogP1f)8`>h8HnycKv%6m|+sw|c zGqd+6`cM!=5z_~K(Pv8^RPaF%q%ZNINFJ0@P{bEOd~Tr+3W_?jmpl8S^KjgJ^Ud%3 zeZSu~tDUIrzBBBSml1*LMO>XznaFqAf3t6G_zsa9%p)$y+q)K72!n3AyRr!N4N zyd&mwK*V=}a_E-$I>$1-5~HOn*UjRh%Sg#8Ew7!i%JKHf>Wj<%Y3p3$;NRsE?W99TmN#~=s= z*d91>y)L^)LFo0E>|Jgi?J;@&-ri$oF^y@v19kuAuBo7oJ}GhdL%M(X-kl@8Th?2@ zeqt8QVZ%5)sE=y}ts}(GU;K7k3K1xC5{q_h@jx@v*R`R)J4^dE-80?4Nxw2){=pkOBk^@zcy-$I){ zkw(bQt%(u6xfROPZD>CfHU|6Mki-E+n>g@E8~L7Mm@$pRL4+9=A#=M^WxHWFmd`xG zfGb^Ip*V`#BZh5D7$WCp~ zcZKb=1#lJF;li_3SZ4Y3-#Ad!rKeJ|d7VM>5|Ho%(2Q)#!vZ7j@4(%3Hm3stA$5^$ za?NoAXkBb+ z*+=z|1z4c&a2TU{#{#9U&rvJ~P*KnZ`gFzY*ua?Hz$BJVapVD!gn_zp7(LAx&;wv~ zKw$(7Q;%yS>5P<}#)L$I8HaQl2Po+=@ty1Wj4t07^MUv059#tw9ZC`t68SZGAtauB z?TOPJjYcyE^B~n=*p=vr;s6dxm_y5|wrC?c3IxKa;1C{5*5~##wE+H{X%0C;7+*@2CIj fSN4uy6Ody9ak9 z20M?ae*uk@T2o?StZZ!TG*&jo!a^Gp3Y@(Iv@uR{$<6G{eBXRC?$Q%@~NQO{jww{1% zJKReX4NFmtEk(kDqdhjDFvY za^1An>c|Ahid`nzE~<3QEjuV8-XLvlz=<0fRyCj<1=5|Oj##m~Kv%h_;-U--K_Fj{ zfeIlcUN?uitoC}Stj4T4Vsq_=<}(z}QAc1>`5uZj6&S^y z&{Usbff6AY+gx-@qQT6;IiMPv2iToSjyK(c$o0)QY+Gk|2?E@+xxa|oUQ<;WE|$fd zR>}3lr`cwG{p^jV(03jBKT;lexGKKZ7%SG9XsP&nNu6bUF1J@Z}0Kbk?PG)zX2UbLfilV diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v20.1.7/599877416596144131.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v20.1.7/599877416596144131.sst deleted file mode 100644 index 1f2d4bf4db02d697a051ffb78f87c6a83ea254d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 934 zcmah|OKVgy6i(V{Z)Q49A7d*Nts``4W2@E*r3lss?y4=g5V_>uoK8b?lWUUc%q<9l z8^wkA6T~0kN^$KH#vO#8p}A|1 zzkS&JXsQ_X?d|KWAGPL4aLUlD)u-oBZR9n+bT<|1`*QaG?7a%dfo zL)d2t^(PK0u;d}7TE_-hm_(h(0Ff%@%rR=kA*@y>Fi3D-7SGZmvOu8c`70)4YhCQs z0NR#12|hehI*1i)KB^pm33S5B$OP`|RyIYo2JZDcQVFW<_E7Z%)+S?)4vG+&#r+Kg zafPKF3noB7jS3FHPB-T80h1lSC`&m=j~7&`IdDW8I0MrLs&g<*af_Oxkyl-Hq|BWm zlUQ{!T2d_6ZgD-rpqvrlkCWKfv|-8jgi?Lv3$)~5UAgGKM6=Q0Ie0Y;OMQ2$SO$X; zwdtE-wkxQA2@=A!eX!%Ty{}M-XA5 zUK@xIyeQ~i{*9}j-kd=*qr=CY`)MAHr+4>g>^SM=%-Qds$6KqXLgYVo|LDn!#m?=o FzX2<}Colj2 diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v20.1.7/599877416597553155.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v20.1.7/599877416597553155.sst deleted file mode 100644 index ddaaf2606e4a8d8a7c76dd99f8ee93b29ab44ea4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 938 zcmah|&2AGh5VqTtY|@ba(IORua>$Wd1qxLaRUm$^2+EIy(8{}>rdGZ7VmnQ?;s7^9 zB~D04T<8OE;{iDH06lT!F?xXUCTY1K=HwaAd^6uSHfc|NIheP`ctYp7$fPFp9a*~h z`q$_8w`w&?hIXOSc{>@7Wgvh0{41$X9Fn=;LnCV^ci-}(k7PPZtw@-6EaQU{u!%_O zu|wJwYtmhZS&6~}OSl8UJWmubsRay}FLDU5%d<4Muq_8{TPhD$>h9|D0`2b@Ox=az zuW&Rwl^WH{G~4ExR0WeF3|Os4=dzqz?u|{cnKeA!iBmIMWPA+G=UPUa`ak2}Y1I1SQ!a(tRJ_v!G%(V5o9`B3&Bdv^Thpxt}$^AD&R BCQJYT diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v20.1.7/BACKUP b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v20.1.7/BACKUP deleted file mode 100644 index 695e0dc1f5938449965de13aa5e9c66e021a8c88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5674 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 diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.1.19/BACKUP-CHECKPOINT-779898255398535169-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.1.19/BACKUP-CHECKPOINT-779898255398535169-CHECKSUM deleted file mode 100644 index ca88195a3625..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.1.19/BACKUP-CHECKPOINT-779898255398535169-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -×ïÿ9 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.1.19/BACKUP-CHECKPOINT-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.1.19/BACKUP-CHECKPOINT-CHECKSUM deleted file mode 100644 index ca88195a3625..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.1.19/BACKUP-CHECKPOINT-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -×ïÿ9 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.1.19/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.1.19/BACKUP-STATISTICS deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.1.19/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.1.19/BACKUP_MANIFEST deleted file mode 100644 index 47a570432079c997a2e0b5f7efa9a76699b7cdc8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2506 zcmV;*2{rZ~iwFP!00000|GZdlY#h}QfA8(y-FjjtnFO5)DrKptvtU3a$832~nt!+7H#+KXoznOV&7El_vSN{FMOV57(+T#ZV zP9PW7C34{@y1KY7k&E8y>2--b?X8|$m&kM8>iKnvJb!_%F0V`EvbXorx

`_O7f; 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 Z%gjTUT|pxL{~~?7d;PZ)b4@F!{sI2F=nMb= diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.1.19/data/779898260043792387.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.1.19/data/779898260043792387.sst deleted file mode 100644 index 6fe624f70e6795c268e0aece882f857144a17231..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 991 zcmah|OKTKC5boYbc6PIFvYW(63=+xW$uw&eb69fFXq0#fnw!edGgFxi>FFN3d$T*a zsQ4f;Cx3zQKhJXlycJCv45eo*Us;lbz>Z|TI_z|k-U+vdu5Jw#0 zniN7KyoaVU-M8KBy~83#MO=TkcCK5hPL3Sxug;?S*P~MnoWb+?7te2^`uzAxoHfot zt+-uXTvMoVI@f%hMaHoG+Bbfzqf+J&Re$vjdBZdGNql&SMjc-U9?^=#v~!G`aUwo+ zP(3GwzpYG`$IK7$sDglK>MPInt*LPGmaApn^A{sMofc@c-WYk!0jzzQnw-f zE9{KteZg8WCz~{mSW2S65-gOQ$vB~sY9W0CCI$7kTwe@h<-&*rr6R%aaGE6PgyXs* z(Z*M8!$q`RFVbpx;licn9D^NT%NG}yE-y9blr}vfOqUzYIWwsnM80;tRD-gSU8Mup zhD}z)|HOgYDFd5QEMp1OA`u)F05GAW(v6-kanDm@tjfI*R9tSl`6Q???@Q%P;a5)2`pqxH5n8kXA1W> zV8x9TX(^DF0;=S&B{o|*iFYV#nMElQ05g1n`yzk6fe>o2QaR6D-iiGee8%zRJq&-`)Lt&fda{Iqa3oVKC=m|f%d M&qvSRU-`E88*mCVk^lez diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.1.19/data/779898260043825153.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.1.19/data/779898260043825153.sst deleted file mode 100644 index 09d37929ef35ee650df8236e764a52a86b631e30..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1061 zcmaJ=O=uKJ6t0@dINhDjm@yMIG0_OQ2(gGUB!`fLx{7#FclBb(_SSU2OiHV(+Nzpl z#*2yw(cQgx@FJ*)cnOLZU6zGqFAL&DFP@dXxhD^TAc$7=#OOuep{e)k{e0i|s&5n$ zG+g@a$|jnmOd!01wiH(H-<|&FiI0(wM_*oga6JfWrK?vC4WW^J*J_nwP}}h9ks&mB z{QTreTqq8fVntb_XRi0r(&<-k`sc!n)yIDh%uNlU@c-ezj^?NFzwzpGjEVy#C8g;( z72dyfd)vUNt?&8GOMzdjKAIRpwXxGXUKIU)cbNpa^Tg{ zj4EoRitR8ZX}lQ4@^dUKZ&08$lj0{qv#j0cMUl*m_4TsFBA25&GkSLSp2?XJ4okpi z_fAYtP0x&IV|zlQJv%-#Vwpw>i%nE-8_+ItPMaihVVlLompBN=GI1$>h!s#bi5Qjw z^87+V4JDeLgH`NzW8h${E|#W7-gXaKRscbHq_v5x96%ae)}0S$g>-5;8!UG%fpUBb z*7Le?N4UHz3M#nO=}0(;hFL^@50)yWhO8AKuOD|-;M8TBG&Lv(0ad!NLpEI5jF%{H z+D&Pa0Jnfa#4>>dc@><3Y5MyUo2djpnvF%O-O<`?BP(A2on>MjefrGo&b0@60 z`(;xkC+hr|lG%aJSBLWY_Sg@(&_BBA-$lDPojbcp$G8~iqNX)MZ}W_3%%+=@FKP|Zxic92j1JA-+X`n zKEHYIm0m(4lUMh4_xI3<_x^_$et&D!$H>RK+js8Gm%?th`|PNFb-j~ia`1WORA~jR zqBi!1C-?T3>xfL&rZ3bHstnYFiMRLnmN*K&#MeKXsiUAo4#rQ+mM7m?o<+f5KkZD- z%p(8Bi4F9wbqp@wKKE5m^>f*(!W&i<{`lF%bg6Q>ayvxcaCme16bi1K|KQ^p`#V(m zVi*4w-kQs=k=aY**QZCW)k;I5zgQnf!KVk`uHwaK4#rpTDsCgUuzR*&yLuAUN^hcp z`@MyJarWX6eYbP-8`MW)l{Bc)G-GW`pos5#Bo#+E&=X}P;|*<94Q~I?2GfvG!x|iD zDiUZ@)5*bw9Sd=;U@dLawUirBsc4=Z8^l}d(n>d=^Di?AE3xFQOwcu!rMyGa#8p_W zk)bSSiW#Y5n@mX-uSc;wvIW&g6lk4F@rq!1-WeoOBy(f;ddt=#x1vUB^un2^&dpD8 z*aW`t^vqm+ZhlG|8xxwHg|qWhw$ms{V-qzx2DGzmYm-FIY*ndvXb0iCOq|3Iuma{X zQIlqXi0>uLFsjpSxQqQh3>=K*V%yaAS`cVk0D|#IYZF-o~9r9rt8P=6V_$|m}c z<4wj}c2b%qz-_@GVwpgKNI%X%HG#?;6cdR?gQcp)E?S)DMv-G!v@%-sSj=7Hpo&2l zm4fzzW7zsM;f#$51%6~5Bu_w_V$wZE!_~w4U}-28+vrrV3=UJ&23~ZzO^4d6z`-5s zOBXHN=VePI7aM#<$$atXXsPh;Jo!Qa`em2>KO~n);3>9M)Zrj}kAs@mqu{o89)1F! zq{o-gWB=Um+~%|O*ao}a-xW8XLV9KA{MYz(^7vgm>TLhN+#LV>;g2_NJ@@PG1MSXO A?*IS* diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.1.19/data/779898260044513282.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.1.19/data/779898260044513282.sst deleted file mode 100644 index 8cde6726b2410be573c6a790ae2b143733828e36..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1182 zcmaJ>TWDNG7@j%FcF*pfBu%m#?KY{~TBL{>5}Qp;LrT1rg(?J%!As>hd(NM;$IO|t z&dg@_v`>9V=|!*#K8Q5dM*7nB#amwlEBc_Ih-YWtxoNe~uI*<}4tSwT5FX%(hwuq>i*@nJ*y^!wGZkW(6N$Waft5|kAVIA4Djpu%zI1*fu>I&k>q`H%eDo=1gj@f3cj`O}ZiLDW|q z20GGozNDvXg(;^nx8v>9RK8Vy@9JKanc7o&;`dLFE}+4o;felB&R1`|bFENzj@{V( zY^t1Jxg$9A^Z86U-*@(6>7@b8yPGh=oo{ZG&*)5(E4vnSrdMA(cXZF2cxv`EzI3QI z`N@7{1e@Q(AHVww%66@y{=YhcR;`Uk^yK5$enUCi6MmH_Ng~?Xgw3);u9eHCWwg6n z#NLwBUR9?5kSdkn6Gf{GNXUI?5tY=zq%Cg6bpeZEi!6prfe3jpRvg65TC81{Ao-Ws z-kS1a)`&P+q*2Hc68fgYbk@#CbtUh4tIcSXGPgw-0EZ`40xbwDAR*u5m80fgOFXo z9SRJ(p(G6n!nA;TyRqqPq<07}Q`XQ-N#X<34FmULAADr@;s`_lMDMA-%p28Vx}` zotJ!~9B6yCYBxxMw_I5svX^LL2IDaegB{)w@S3)|SStt5)T!6XP>W_RD6C!U?% z%*>s=?kJD~1wk}WfMlo;kPt*cBpO6zDiewnDM1NPKog5J5oTu3cS!?NoNnH{`QG=w z@6B3AUU>KIUZ2&a0)Zn@Bb;s$MI&yZOV;C=FRt7x-r33{tGTwf|9a6GdTuuI*F;48 z)zS&#$x^v=T0}wJH`hwbAQk1c;zkjm14wo~F(JVhpjxQcZe3Yzqh9|( zY&k=RMyjLL5qH=v2VQloJUU)=%Mkv9af1qJb!`A z&YV2Evb4E4>(IIlZ>s--C))$tr%CD*W}GUI34>_)qkg^2Rz%a}?_G4j81W}RjTZ2{cqgJet zdqjXVy1c?k94CEtr4q$v*5tb860KJ}s^nDp=;&mLK?B&-$nf~F@yU`@8WU>Clsj3{ zomK+stBRK>kS4MzRZuZuokjVBIB?TtU{dl0Bp`hZSkVwHJD&-NB3RN*xS7p&Az+}i zF1k%=*-zWBp#|WCRisoEEeGHli#)T3i##%FnKhW}*!MZ3cXk(Q3YVfe?xZ17Mmka9>YjVA?3Zv3&Y9XO!Fm)Jm}B|+vKDtHs`FskWBN-H&$f={ z)BDMhmr|i$Hr4+l{45?NU7qldJ(beMMNH(_onHy`*xqZniH0QX**7{eHd+uabOfiwykg z7-{Ukk;kJKQl#4pbXZ~5u$VUvn5Dc(I>$kg@w8UKvcas1z(34U3z>rg7ReAA%r+Bn zZO8g)qG2&=u*FDNaHJ>425EgsVd^q8{|bBknLvqJEZHKDBhh40=m=)>UNKI%=2qzd z!L;JRl8-v<#R}O&8jOjQyd`;(GzUH3SBXX6)RBv-`<2L=xrtM!XUhUsK+H`~&77H; zbrNz5)#lvfY#Ar@!zi$RrD?&q$f~iS@4}cB$v<(BZpzT5J-m$S(XH8=ZY5vEyTx&LZ56G2{rri$ zm7yv=K*q5B-j4bQ$ju$1v0q(7Px@!*>cyigXxIs4=o76-Ogm?gIVa+M2VKca5o{@w zBi^V_R&cv1OzIY-e}$dV!9cK9 z%*iH=BbJgVv;+&Tb0JQsq*}Sc9af18#Y-H{}Tsp zrwnaMv4ka1i$ru319FNuq?!^H?Z8HH7y|=sWHD1J#=dh45)udO1oN?UUfE71Vq@_Sw z3aFgNme{3o6>n44GK*3q1ZMaG4@3wda>_Uc*#IIEkd%iCRR#)1b>3nu(b5^gycLsd z#BA*fmkJoTmJz6d(g-#+4VX4PAyXfj0>MI1I$LyCqVYoSIv6!14NP~!X$(CGcWl*S z>y((Az`!1>jdi2#9ns?9y3Za-k=*Sc-OK9JYb%-1YZm<~9zauG$I@<}OCV#7ke^-`36NRx|T9#!;dvlx( zbJ7dn2hB~UMUqnEb?>g6ZN=+!NOdexh|u_aJ9o)ABq`!q^Bn~tlka}eKwvM8mf z>$<^7h((NTnl2~h7{gSxJS8CZ#Seb^_Df%T{juQ!oB^kS_%V$>qEV{hXttAQcvzq+ zh<)p~@7{QvXf->ESn`vhtZN*^gKUNac_4xL+m`_kB(Mf7umLVW@HhmQA()*&`_>d^ zO;hI;$2n)(Do5c#mJK!?SOz?dZz`g+?kt#fjid1(3xdTQkszj4l)9tE_RKL0Cdyd0 zzOLAt9Lz%@gei6)5QD=dqAy2|$AAX~Ac1Kx1D1eAS@d~^1$=P&CCFTc@VhY0f*i<$ z7a`b&;57)AsfX`Gs7daJG|C3-en>azy#V3kkiJZI+}=V5aEOhE1+WcA(7_dDT`tNo zsyd+aRDs%t|BnXA@(DR4DbR?g3-mR}{1}42K=2V{2;hH1aDf8PP~h8C#MavsxJH2+ z)E#e7;5`a_NCELr6#65DQs+%WbMh%37GNc^VfF~3bk(ysYW=O(|T(VH})8hU zeni{6Y5(YvcE@}9M^e^ZX*Vvxm1NsbHrXDGhBJZW$1_F)emplR@qzkT^)Nc%XVrEN zqDt&3zg{0guMHvQVYBMw_s1+cm7HG1eGNlD+t6g&Jg2LLqlxL(aTT}W^pgQ*P^M;U zdx`!Ll(Ce}x~ZsM>_Za_Ha7*`0FtbH86xpS# zT&9D?ggujptJM{KU3N6b(M^MFV|xQEqXYgn-EdsRsA*(hwzs%Z#2Srt*=`sPhk7p` zLoD$+vYs30v{OQg9bEW5Ot?mUzYv=y7n_z7L!*eDe2eW=iZPbNI00g)n;630Ie%Lz zD{W;g*2-GQ8t5ndmn<|)B1iUhlA9=Xb%UewKnQddnz~AqL{GyRkc^^TB1stu5-&q^ z*b~`7k=(|Rhk(ulp_56WgUJA)l$J8xfpwNPU7)=}p_~WJZWtaTjt7Iu10iOx7&R>; zMGP0Ws>HT9>;iVcLRPj9z>h&60)OfOzHr2D7=~`F9;s9+XBHPuJ@BOw{)nwTs@ZPm ztfd)hY))x7+NiCaZD@|Gscpa22=sc=k4KkNH*H(A7?dYbHOhO2h%TxXCSU zh8XU22i)!s&H8{(^BMnUY9&gD!!e&Kq_*LGDCL=lqj1c;IBq!{niYqp=2APeM0E|D|49LR78QM$ zjUbiVfXYpra*GXsqnhD%&2Xq0ZfSN43fl`Q^dANd+Gbso*R}PkW;^-eq#lT@=*NkU zp|pQaKi)HfGP-lZ<23fT&_{jiff53FV)Lk-?cLV}C!<4AMr7|l&FjsRD#2-L5BFIO z4YvvK|AzNhppryQce%Rz5wgtOjL+T~t+71~I{AE(`+4mEjCXjo-5HiT=MJ$5!&eKqTeye-yaFD@lIgL%%->^@?iltYHL;Wvw^PJs!{8Hmoq9JWVt2JEH_MZTrd*{cAxq*fEJIlO?yNK9(hDCO1r@l*a@qIwL&e5De}hl81bXPm`>_fl{Wsrr8|C?N(_uUcOau zJNG!oJ#Ob7cW@sxWf{L+A~i0xyA<^vjoziv|EY?rR24__tGV#Se?8+*vpyqK z*iw#6=O=}o4-+GYN&bi926osIH;L)0;_~GJC?W)Ba!|JM^JWhtsKly{#OGdErPj}oCG!YXM55~CIN{mpe}uZct}AB|S1U|7XIlxDHNV_=3P z#{;vH&H)T&!3;djaoM-89R2y+KYwuj&ktSy`!|P|eh3k}YL1VMm&eLE_R-?_SaEE8 z0^e4Yip6`Rse7bJe!Ntfn5vYt>ujw_|(6UR&HczL{5t4&HPTB#;YPL<1Q zNu8{gi)C@>WL+^<`EhAX8k6|qpsLvCbc0vc)pDsqpFDZrY{u5=n&N1u_nRv#dQDgA zqgCBd?9GKk8`EXETpCp@tFDduJI9YNWg5mKhI!7Y0-G*Ql%9a#8OVW-f3HCJ8a%`@ zxdXE&PTu?A{OFm*6N{(LES@@fhRmnB%%{7|@9Q$ZzsvlgF7v}(=JQ?V@9HvtcbEB* eF7wj~^KU|yJw%Eg9{e`|0RR7{VEk>LBLDyw2v9`; diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.2.13/BACKUP-CHECKPOINT-780216800973717505-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.2.13/BACKUP-CHECKPOINT-780216800973717505-CHECKSUM deleted file mode 100644 index 5347a0e7e2d0..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.2.13/BACKUP-CHECKPOINT-780216800973717505-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -ŸT± \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.2.13/BACKUP-CHECKPOINT-780216804883595265-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.2.13/BACKUP-CHECKPOINT-780216804883595265-CHECKSUM deleted file mode 100644 index 44783301a15e..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.2.13/BACKUP-CHECKPOINT-780216804883595265-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -ôv’U \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.2.13/BACKUP-CHECKPOINT-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.2.13/BACKUP-CHECKPOINT-CHECKSUM deleted file mode 100644 index ff186e0aee65..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.2.13/BACKUP-CHECKPOINT-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -+ï½ \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.2.13/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.2.13/BACKUP-STATISTICS deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.2.13/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.2.13/BACKUP_MANIFEST deleted file mode 100644 index a2ffb80cd3a3858d4e22b5986ef1439bb52038df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2907 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 diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.2.13/data/780216812182700033.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v21.2.13/data/780216812182700033.sst deleted file mode 100644 index 60ba099647ef8c291070a9f799043e3e05bd3d7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1154 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 O0RR6d4$jynD*yoNiBLHJ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/BACKUP_MANIFEST-CHECKSUM deleted file mode 100644 index 6ca648b5c78e..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/BACKUP_MANIFEST-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -ßêŽ \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/data/780220991158943746.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/data/780220991158943746.sst deleted file mode 100644 index cfefd9de8aef04ac2f1ef3a4ac1f5eb30805c829..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 991 zcmah|&ubGw6rRbCW|O9AleSiBkw{DNV24=6f}sbk7HK_*dJ|b^cVD+lXJ^)#Nt5*A zZ)oj7yn4}_h!=07e}mxFvwwkyf*^vNp{Bm%#firkE|Frh-3aZbJt;AX5 z?T>6#7uOVO9LqHyWRWp!zsl7+Z%`@o3RQpg40(ey^htcUhlU+r1|HFh#I$pWn{gsO zaL`;%3V%zPERUHV;!yh{065<(j9kP zS0vi_s%^N4w(CV&Eiart+pII#2DW@=ap~Mrv#zx131N4+(X5+E-5~O{>vc6K8`)7h zaBbLRMf^`3xScYvDaA6DKrIr{Q4Gi_;(%&ORI~$OaTo&wZDcW1D&!n@pkwCel(|Z2 z*Qfy`WWuvP+~vZGWo^2U+XiXJ$r#TW#y#EArl?fGonA-6fQNb$6-Tg;G1a7Bgq%s- z+kh1}QlzCoS_-I=!##k>`hbi{P+3YQBQxRw#9TzM3mnh+LDPe|2Ara-U&luj4jlW4NgzYazXNqy6u za2i7&qEx+Xv2~Z2o4~*xt6MjXwiiW<2RA)-O^Re?aI~7%cTZhPg}!dl|B-UrDQ6^Y zr#!3(&vCibSHZfIR(Sh3(6jR|=27kNb|(hT&@uBp!awteS?eDgGx%}gL^x$b|1rD9 N@1GBzyua{u_cx<9G1mY9 diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/data/780220991161040897.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/data/780220991161040897.sst deleted file mode 100644 index e5acd7f18948c5106290800f8207e05f9571d9c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3169 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 QhwJ#~_kZmBa`WZ#KaEi4W&i*H diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/fileinfo.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/fileinfo.sst deleted file mode 100644 index 1fc585174d03a7f168465ffe6ef5510eca0a6484..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1195 zcmaJ>L2MgE6#cVy;y{$)(|JJZ3DWS4YQkNDR zOVvufTD!i*X7`D)KWsh%ZbQ+YG(WM}oN?v#-_zxTRRQ*QG)?WQVI2_dpn0sjv+T6_ zp*7{CtA|Gp%pMYQ_~qLVq2>TJ@E4;3Z0Z9u!Q+iDE@}xk5Q@N|x9E@^$U8yg>N|cGM%pcX<}>LHO!Pe3bn_e=8#k&7xoOrP zSL6YP9kmYGDHbJNq4;SMm>1c21=?L-@}9&*w*b>=raOCS`USQjf*x&3at{M)7{hkt zp$FzP>tfPD9>ti5(34O|Wytoh7X-0N%=0Ylb@^z<(cUG?XBdVm@lj^;=NaX6@G{lJ zk^MjkQQ)CeqfL)Jx|lhA59CH7+Ekr~qKl^zxeM=VZ8hNZ6av(+{OBf`+l+dlche1S zBvE|z3|bxK4;HSCjDAn6{|Dt`GjAkfbJT}6VVKJ2jIj&)`a?=PuRjj(z4gX5n0fZT rW74C3Xuv;>Unicie#9I1*)QfRkBvDU`~Rc&`1I!|cOJa++ZX=;%*0^+ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/metadata.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/metadata.sst deleted file mode 100644 index 6080d69e762acf22a61d62569cefa5519fe683b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5232 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 diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cfc8d2cec7dfcdcfc5cfc6c5cecfd1cac9cecbcccddfd4cfcfcfcfdfaaabbcfffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cfc8d2cec7dfcdcfc5cfc6c5cecfd1cac9cecbcccddfd4cfcfcfcfdfaaabbcfffe-CHECKSUM deleted file mode 100644 index f259ad96a160..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cfc8d2cec7dfcdcfc5cfc6c5cecfd1cac9cecbcccddfd4cfcfcfcfdfaaabbcfffe-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -q_É« \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cfc8d2cec7dfcdcfc5cfc6c5cecfd1cdccc7cbc6c9dfd4cfcfcfcfdfaaabbcfffe b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cfc8d2cec7dfcdcfc5cfc6c5cecfd1cdccc7cbc6c9dfd4cfcfcfcfdfaaabbcfffe deleted file mode 100644 index 639eece667de66b2077cb002d520184f35f0bbec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2994 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 diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117481881604.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117481881604.sst deleted file mode 100644 index fa68149d7e22c7fb9e1fd1748b2eb73772a54dac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 952 zcmah|J8u**5VkLm+k0@yN*I-J^W(!CAIkNa@zayd1+@I_=d~qVK+drLT3^&BR4%+j^Iu^Psz#c>VBa3!Bgnx@%w5QZwX&Np4hMRmi7TeIG}wY=64a0p`k&h6Ee)wPDP z4innh`qEm%O&T&D+c3&37#}$@mW4j-vbg*c2kEC|KBZK}8mR9?EKdLhCCsR$#PB27 zDpfEDuuc{?r9r{<0D5kINkwRk4V@Z5+CoL%hZjnj|?J1zzDE7n_YIFFIijG^9Aq<4$3o=#= z7z%1Q0o?|oQqWW~gQiD{PIcK4BDFf0z_OE&e8hb123Lz1q}3cup*n$GO&eMc6LR&D zD^P-gvH7C=63rF|*TJcwY3$I6qzMdKlZ<`T!69o8U^K9E`yP-OgZAapfR_Wd0 z(Pmzs-Mp6z{ls_wN6K#CRzbf~LZoK$n b>@w;3*=O}*ys>rFNB(0w7ssc~&er$eT+}W- diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117481914372.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117481914372.sst deleted file mode 100644 index f521799b4946c241d424eb7e7f4339d4e5ad6978..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1063 zcmaJ=J8u**5Vr4f-0tSMyzUT02?Ugqm;g~Iq7=Ll6>p>fS$ylsWr^2bY+vq<0+48U z7En+j8YHMlL4^c}iUuJe3K}TjFVGI-(jy-uACG>zvUE2HDuwIU_6?ztop&nbd{9|+#LyZC5(@?`V%jOVnS;GJRWKK~ z$Xv_~s94m;2M2I-UfR?JX#W-VdJB={jYN<+n#8#R8b>UWQQq9qxmqB zzhkB1Dg|1{QXCaDP1^%r7|PUGUpFll*$iv3(bHpFC#FU?ECQe2zHP_kj;RrCY)`1S zr^ly8EYpz1kqK*UE3S)N(1wLBY_nqVCl11~WG=-oVFlDpA|_4%d47&jLy3+rz!U6u zW8h${E|#W7-g*yORscbHsI>{L96;(^)|?OLg>-5;8!UD$f^vLv*7Le?N4Tsj3d*?E z=}0(;x|v7*YAjVk4OuQiUKMwqz^NN+;ugh0K;LMnW=<*}H38Dq;{u#i0FC54JUR7_&VglONdv z$(dc&?4>&zRg25}VAW7GvfYWG2`rBY`u4inrcLZBaB$c9)G;gWF4++5SdAZ2GTr_A zYF}30-n=Ih`iPtUkCZcBDW_;N!{J1@oht>)DmZuC37`D|XAeJniTYR8JGJ919Lw)5 f{!v)T8f06V?}{6r;I%IFe>?g8@{Q5P{*S)^u>4H@ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117482045442.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117482045442.sst deleted file mode 100644 index 7b2f468a506c9e11d3a45ebe199ccdb5472bd6e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 968 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 diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117486469124.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117486469124.sst deleted file mode 100644 index 780aa8a82a06032ec05cfbc2c40deb027b089262..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 938 zcmah|O>Yx15Vf1O*`y);qD86@L?Qt#}z?Q52#vs*VELh*IsO=$@YM_ zfk5Jb5FF`GK;pOb1c&~Q9$>slS}uq=dB!tu=Do2=d*a*sIW97(37xaXctYQi#n-!E zPEX(N)F>I)jhU^i5{_ly=Iu|vNPX;>%>Eu2Sv|k|k)M1fQ&DO~!n|V{@1KK>MN*F( z(jK=aJ#d(nC_J!)I}ptCL;;gpK%e;{hXA`YLvsszvd{LU@?fRztSrsb-oC-q11SCq zM>7+tQQb_lJ)TKbFe$=-)p~R}%em#=*c6*t!_)mZHKSOgI%&ZWTOfOEPcbm(1RySG-4nb|+ySsLOZKLHpVnV0bT-j(L(^$yV$4TMAg~*ZfA`W59 zlKLVJIg(k6%%Y^gea2sY3eLob@51KmncQg71!0Ff!s9luX%m#DEB_iR{1q6IqGKoD0t z)^%XR2&6eq!(dmNi}aAIE-uP30Se~@of-jxL`|B3?Eo`5SgwU5^OY*9uDeR*-bT|@ zcQaN}EZ6R6qe?-0D*=zw6l*%LjF?cWPq4r!0nV3;9!RuM9X_4`1_U1#o`{d^zYc?nh diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117486829572.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117486829572.sst deleted file mode 100644 index cad6a9ec293b0ee3c844512a2e0296a7c111f94d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1062 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