feat(restore_test): reimplement TestRestoreFullAlternatorIntegration

Author: Michal-Leszczynski

pkg/service/restore/restore_integration_test.go

@@ -1454,6 +1454,83 @@ func TestRestoreTablesMethodIntegration(t *testing.T) {
 	}
 }
 
+func TestRestoreFullAlternatorIntegration(t *testing.T) {
+	h := newTestHelper(t, ManagedSecondClusterHosts(), ManagedClusterHosts())
+
+	ni, err := h.srcCluster.Client.AnyNodeInfo(context.Background())
+	if err != nil {
+		t.Fatal(err)
+	}
+	if ok, err := ni.SupportsAlternatorSchemaBackupFromAPI(); err != nil {
+		t.Fatal(err)
+	} else if !ok {
+		t.Skip("This test assumes that alternator tables are backed up and restored with alternator api")
+	}
+
+	Print("Prepare alternator schema")
+	altTab1 := "alt_full_1_" + AlternatorProblematicTableChars
+	altTab2 := "alt_full_2_" + AlternatorProblematicTableChars
+	altGSI1 := "gsi_1_" + AlternatorProblematicTableChars
+	altGSI2 := "gsi_2_" + AlternatorProblematicTableChars
+	CreateAlternatorTable(t, h.srcCluster.altClient, 2, altTab1, altTab2)
+	CreateAlternatorGSI(t, h.srcCluster.altClient, altTab1, altGSI1, altGSI2)
+	CreateAlternatorGSI(t, h.srcCluster.altClient, altTab2, altGSI1, altGSI2)
+
+	Print("Insert alternator rows")
+	const rowCnt = 100
+	InsertAlternatorTableData(t, h.srcCluster.altClient, rowCnt, altTab1, altTab2)
+
+	Print("Prepare simple clq schema")
+	ExecStmt(t, h.srcCluster.rootSession, "CREATE KEYSPACE cql_ks WITH replication = {'class': 'NetworkTopologyStrategy', 'dc1': 2} and tablets = {'enabled': false}")
+	createTable(t, h.srcCluster.rootSession, "cql_ks", "cql_tab")
+	CreateMaterializedView(t, h.srcCluster.rootSession, "cql_ks", "cql_tab", "cql_mv_1")
+	CreateMaterializedView(t, h.srcCluster.rootSession, "cql_ks", "cql_tab", "cql_mv_2")
+	CreateSecondaryIndex(t, h.srcCluster.rootSession, "cql_ks", "cql_tab", "cql_si_1")
+
+	Print("Insert simple cql rows")
+	fillTable(t, h.srcCluster.rootSession, rowCnt, "cql_ks", "cql_tab")
+
+	Print("Run backup")
+	loc := testLocation("alternator-full", "")
+	S3InitBucket(t, loc.Path)
+	backupProps := defaultTestBackupProperties(loc, "")
+	tag := h.runBackup(t, backupProps)
+
+	Print("Restore schema")
+	grantRestoreSchemaPermissions(t, h.dstCluster.rootSession, h.dstUser)
+	props := defaultTestProperties(loc, tag, false)
+	h.runRestore(t, props)
+
+	Print("Reset user permissions")
+	dropNonSuperUsers(t, h.dstCluster.rootSession)
+	createUser(t, h.dstCluster.rootSession, h.dstUser, h.dstPass)
+
+	Print("Restore data")
+	grantRestoreTablesPermissions(t, h.dstCluster.rootSession, nil, h.dstUser)
+	props = defaultTestProperties(loc, tag, true)
+	h.runRestore(t, props)
+
+	Print("Validate restored alternator data")
+	ValidateAlternatorTableData(t, h.dstCluster.altClient, rowCnt, 2, altTab1, altTab2)
+	ValidateAlternatorGSIData(t, h.dstCluster.altClient, rowCnt, altTab1, altGSI1, altGSI2)
+	ValidateAlternatorGSIData(t, h.dstCluster.altClient, rowCnt, altTab2, altGSI1, altGSI2)
+
+	Print("Validate restored simple cql data")
+	cqlTabs := []table{
+		{ks: "cql_ks", tab: "cql_tab"},
+		{ks: "cql_ks", tab: "cql_mv_1"},
+		{ks: "cql_ks", tab: "cql_mv_2"},
+		{ks: "cql_ks", tab: "cql_si_1_index"},
+	}
+	for _, tab := range cqlTabs {
+		srcCnt := rowCount(t, h.srcCluster.rootSession, tab.ks, tab.tab)
+		dstCnt := rowCount(t, h.dstCluster.rootSession, tab.ks, tab.tab)
+		if srcCnt != dstCnt {
+			t.Fatalf("Expected %d rows in cql table %q.%q, got %d", srcCnt, tab.ks, tab.tab, dstCnt)
+		}
+	}
+}
+
 func getDCFromRemoteSSTableDir(t *testing.T, remoteSSTableDir string) string {
 	t.Helper()
 	// hacky way of extracting value of dc_name from  /dc/{dc_name}/node/

pkg/service/restore/service_restore_integration_test.go

@@ -1480,71 +1480,6 @@ func restoreAllTables(t *testing.T, schemaTarget, tablesTarget Target, keyspace
 	dstH.validateRestoreSuccess(dstSession, srcSession, tablesTarget, toValidate)
 }
 
-func TestRestoreFullAlternatorIntegration(t *testing.T) {
-	testBucket, _, testUser := getBucketKeyspaceUser(t)
-	const (
-		testTable          = "Tab_le-With1.da_sh2-aNd.d33ot.-"
-		testKeyspace       = "alternator_" + testTable
-		testBatchSize      = 1
-		testParallel       = 3
-		testAlternatorPort = 8000
-	)
-	schemaTarget := defaultTestTarget("dc1", testBucket, "", testBatchSize, testParallel, false)
-	tablesTarget := defaultTestTarget("dc1", testBucket, "", testBatchSize, testParallel, true)
-	restoreAlternator(t, schemaTarget, tablesTarget, testKeyspace, testTable, testUser, testAlternatorPort)
-}
-
-func restoreAlternator(t *testing.T, schemaTarget, tablesTarget Target, testKeyspace, testTable, user string, alternatorPort int) {
-	var (
-		ctx          = context.Background()
-		cfg          = defaultTestConfig()
-		srcClientCfg = scyllaclient.TestConfig(ManagedSecondClusterHosts(), AgentAuthToken())
-		mgrSession   = CreateScyllaManagerDBSession(t)
-		dstH         = newRestoreTestHelper(t, mgrSession, cfg, schemaTarget.Location[0], nil, "", "")
-		srcH         = newRestoreTestHelper(t, mgrSession, cfg, schemaTarget.Location[0], &srcClientCfg, "", "")
-		dstSession   = CreateSessionAndDropAllKeyspaces(t, dstH.Client)
-		srcSession   = CreateSessionAndDropAllKeyspaces(t, srcH.Client)
-	)
-
-	dstH.skipImpossibleSchemaTest()
-	// SM can't restore Alternator table schema via CQL.
-	// See https://github.com/scylladb/scylladb/issues/19112
-	dstH.skipCQLSchemaTestAssumingSSTables()
-
-	// Restore should be performed on user with limited permissions
-	dropNonSuperUsers(t, dstSession)
-	createUser(t, dstSession, user, "pass")
-	dstH = newRestoreTestHelper(t, mgrSession, cfg, schemaTarget.Location[0], nil, user, "pass")
-
-	accessKeyID, secretAccessKey := GetAlternatorCreds(t, srcSession, "")
-	client := CreateAlternatorClient(t, srcH.Client, ManagedSecondClusterHosts()[0], accessKeyID, secretAccessKey)
-	CreateAlternatorTable(t, client, testTable)
-	FillAlternatorTable(t, client, testTable, 100)
-
-	schemaTarget.SnapshotTag = srcH.simpleBackup(schemaTarget.Location[0])
-
-	Print("Restore schema on different cluster")
-	grantRestoreSchemaPermissions(t, dstSession, user)
-	if err := dstH.service.Restore(ctx, dstH.ClusterID, dstH.TaskID, dstH.RunID, dstH.targetToProperties(schemaTarget)); err != nil {
-		t.Fatal(err)
-	}
-
-	toValidate := []table{{ks: testKeyspace, tab: testTable}}
-	dstH.validateRestoreSuccess(dstSession, srcSession, schemaTarget, toValidate)
-
-	tablesTarget.SnapshotTag = schemaTarget.SnapshotTag
-	dstH.TaskID = uuid.MustRandom()
-	dstH.RunID = uuid.MustRandom()
-	grantRestoreTablesPermissions(t, dstSession, tablesTarget.Keyspace, user)
-
-	Print("Restore tables on different cluster")
-	if err := dstH.service.Restore(ctx, dstH.ClusterID, dstH.TaskID, dstH.RunID, dstH.targetToProperties(tablesTarget)); err != nil {
-		t.Fatal(err)
-	}
-
-	dstH.validateRestoreSuccess(dstSession, srcSession, tablesTarget, toValidate)
-}
-
 func (h *restoreTestHelper) targetToProperties(target Target) json.RawMessage {
 	props, err := json.Marshal(target)
 	if err != nil {