test(1-1-restore): adjusts tests for 1-1-restore progress

Author: VAveryanov8

Diff for: pkg/service/one2onerestore/progress_integration_test.go

@@ -10,12 +10,10 @@ import (
 	"os"
 	"testing"
 
-	"github.com/scylladb/scylla-manager/v3/pkg/scyllaclient"
 	"github.com/scylladb/scylla-manager/v3/pkg/service/backup/backupspec"
 	"github.com/scylladb/scylla-manager/v3/pkg/testutils"
 	"github.com/scylladb/scylla-manager/v3/pkg/testutils/db"
 	"github.com/scylladb/scylla-manager/v3/pkg/testutils/testconfig"
-	"github.com/scylladb/scylla-manager/v3/pkg/util/timeutc"
 	"github.com/scylladb/scylla-manager/v3/pkg/util/uuid"
 )
 
@@ -65,172 +63,129 @@ func TestGetProgressIntegration(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Unexpected err, prepareHostWorkload: %v", err)
 	}
-
-	testutils.Print("ALTER_TGC Stage")
-	err = w.setTombstoneGCModeRepair(context.Background(), workload)
+	pr, err := w.getProgress(context.Background())
 	if err != nil {
-		t.Fatalf("Unexpected err, setTombstoneGCModeRepair: %v", err)
+		t.Fatalf("Unexpected err, getProgress: %v", err)
 	}
+	if !progressIsEmpty(pr) {
+		t.Fatalf("Expected empty progress, but got: %v", pr)
+	}
+
+	w.initProgress(context.Background(), workload)
 
-	pr, err := w.getProgress(context.Background(), target)
+	pr, err = w.getProgress(context.Background())
 	if err != nil {
 		t.Fatalf("Unexpected err, getProgress: %v", err)
 	}
-	if pr.Stage != StageAlterTGC {
-		t.Fatalf("Expected stage ALTER_TGC, but got %s", pr.Stage)
+	if progressIsEmpty(pr) {
+		t.Fatalf("Expected not empty progress, but got empty")
 	}
-	validateKeyspaces(t, pr.Keyspaces)
+	expectProgressStatus(t, pr, ProgressStatusNotStarted)
 
-	testutils.Print("DROP_VIEWS Stage")
-	views, err := w.dropViews(context.Background(), workload)
+	testutils.Print("ALTER_TGC Stage")
+	err = w.setTombstoneGCModeRepair(context.Background(), workload)
 	if err != nil {
-		t.Fatalf("Unexpected err, dropViews: %v", err)
+		t.Fatalf("Unexpected err, setTombstoneGCModeRepair: %v", err)
 	}
 
-	pr, err = w.getProgress(context.Background(), target)
+	testutils.Print("DROP_VIEWS Stage")
+	views, err := w.dropViews(context.Background(), workload)
 	if err != nil {
-		t.Fatalf("Unexpected err, getProgress: %v", err)
-	}
-	if pr.Stage != StageDropViews {
-		t.Fatalf("Expected stage DROP_VIEW, but got %s", pr.Stage)
+		t.Fatalf("Unexpected err, dropViews: %v", err)
 	}
-	validateViews(t, pr.Views, "")
 
 	testutils.Print("DATA Stage")
 	if err := w.restoreTables(context.Background(), workload, target.Keyspace); err != nil {
 		t.Fatalf("Unexpected err, restoreTables: %v", err)
 	}
-	pr, err = w.getProgress(context.Background(), target)
+
+	pr, err = w.getProgress(context.Background())
 	if err != nil {
 		t.Fatalf("Unexpected err, getProgress: %v", err)
 	}
-	if pr.Stage != StageData {
-		t.Fatalf("Expected stage DATA, but got %s", pr.Stage)
+	if progressIsEmpty(pr) {
+		t.Fatalf("Expected not empty progress, but got empty")
 	}
-	validateKeyspaces(t, pr.Keyspaces)
-	validateHosts(t, pr.Hosts)
+	expectTablesStatus(t, pr.Tables, ProgressStatusDone)
+	expectViewsStatus(t, pr.Views, ProgressStatusNotStarted)
 
 	testutils.Print("RECREATE_VIEWS Stage")
 	if err := w.reCreateViews(context.Background(), views); err != nil {
 		t.Fatalf("Unexpected err, reCreateViews: %v", err)
 	}
-	pr, err = w.getProgress(context.Background(), target)
+
+	pr, err = w.getProgress(context.Background())
 	if err != nil {
 		t.Fatalf("Unexpected err, getProgress: %v", err)
 	}
-	if pr.Stage != StageRecreateViews {
-		t.Fatalf("Expected stage RECREATE_VIEW, but got %s", pr.Stage)
+	if progressIsEmpty(pr) {
+		t.Fatalf("Expected not empty progress, but got empty")
 	}
-	validateViews(t, pr.Views, scyllaclient.StatusSuccess)
+	expectProgressStatus(t, pr, ProgressStatusDone)
+}
 
-	testutils.Print("DONE Stage")
-	w.progressDone(context.Background(), timeutc.Now(), timeutc.Now())
-	pr, err = w.getProgress(context.Background(), target)
-	if err != nil {
-		t.Fatalf("Unexpected err, getProgress: %v", err)
-	}
-	validateGetProgress(t, pr, snapshotTag)
+func progressIsEmpty(pr Progress) bool {
+	return len(pr.Tables) == 0 && len(pr.Views) == 0
 }
 
-func validateGetProgress(t *testing.T, pr Progress, tag string) {
+func expectProgressStatus(t *testing.T, pr Progress, status ProgressStatus) {
 	t.Helper()
-	if pr.SnapshotTag != tag {
-		t.Fatalf("Expected snapshot tag %s, but got %s", tag, pr.SnapshotTag)
-	}
-	if pr.Stage != StageDone {
-		t.Fatalf("Expected stage DONE, but got %s", pr.Stage)
-	}
-	validateProgress(t, pr.progress)
-	validateKeyspaces(t, pr.Keyspaces)
-	validateHosts(t, pr.Hosts)
-	validateViews(t, pr.Views, scyllaclient.StatusSuccess)
+	expectTablesStatus(t, pr.Tables, status)
+	expectViewsStatus(t, pr.Views, status)
 }
 
-func validateProgress(t *testing.T, p progress) {
+func expectTablesStatus(t *testing.T, tables []TableProgress, status ProgressStatus) {
 	t.Helper()
-	if p.Size != p.Restored {
-		t.Fatalf("Expected to restore %d, but restored %d", p.Size, p.Restored)
-	}
-	if p.Size != p.Downloaded {
-		t.Fatalf("Expected to download %d, but got %d", p.Size, p.Downloaded)
-	}
-	if p.Failed != 0 {
-		t.Fatalf("Expected failed to be 0, but got: %d", p.Failed)
-	}
-	if p.StartedAt == nil {
-		t.Fatalf("Expected StartedAt != nil, but got nil")
-	}
-	if p.CompletedAt == nil {
-		t.Fatalf("Expected CompletedAt != nil, but got nil")
+	for _, tp := range tables {
+		if tp.Status != status {
+			t.Fatalf("Expected table %q status, but got %q", status, tp.Status)
+		}
 	}
 }
 
-func validateKeyspaces(t *testing.T, keyspaces []KeyspaceProgress) {
+func expectViewsStatus(t *testing.T, views []ViewProgress, status ProgressStatus) {
 	t.Helper()
-	if len(keyspaces) == 0 {
-		t.Fatalf("Expected len(keyspaces) > 0, but got 0")
-	}
-	for _, kp := range keyspaces {
-		validateProgress(t, kp.progress)
-		if kp.Keyspace == "" {
-			t.Fatalf("Expected not empty keyspace name, but got ''")
-		}
-		if len(kp.Tables) == 0 {
-			t.Fatalf("Expected %s len(tables) > 0, but got 0", kp.Keyspace)
-		}
-		for _, tp := range kp.Tables {
-			validateProgress(t, tp.progress)
-			if tp.Table == "" {
-				t.Fatalf("Expected not empty %s table name, but got ''", kp.Keyspace)
-			}
-			if tp.TombstoneGC != modeRepair {
-				t.Fatalf("Expected tombstone_gc mode of %s.%s to be repair, but got %s", kp.Keyspace, tp.Table, tp.TombstoneGC)
-			}
+	for _, vp := range views {
+		if vp.Status != status {
+			t.Fatalf("Expected view %q status, but got %q", status, vp.Status)
 		}
 	}
 }
 
-func validateHosts(t *testing.T, hosts []HostProgress) {
+func validateGetProgress(t *testing.T, pr Progress) {
 	t.Helper()
-	if len(hosts) != 6 {
-		t.Fatalf("Expected len(hosts) == 6, but got %d", len(hosts))
+	validateTablesProgress(t, pr.Tables)
+	validateViewsProgress(t, pr.Views)
+
+}
+
+func validateTablesProgress(t *testing.T, tables []TableProgress) {
+	t.Helper()
+	for _, tp := range tables {
+		validateProgress(t, tp.progress)
 	}
-	for _, hp := range hosts {
-		if hp.Host == "" {
-			t.Fatalf("Expected not empty host, but got ''")
-		}
-		if hp.ShardCnt == 0 {
-			t.Fatalf("Expected %s host ShardCound != 0, but got 0", hp.Host)
-		}
-		if hp.DownloadedBytes == 0 {
-			t.Fatalf("Expected not empty %s host DownloadedBytes, but got 0", hp.Host)
-		}
-		if hp.DownloadDuration == 0 {
-			t.Fatalf("Expected not empty %s host DownloadDuration, but got 0", hp.Host)
-		}
+}
+
+func validateViewsProgress(t *testing.T, views []ViewProgress) {
+	t.Helper()
+
+	for _, vp := range views {
+		validateProgress(t, vp.progress)
 	}
 }
 
-func validateViews(t *testing.T, views []View, expectedBuildStatus scyllaclient.ViewBuildStatus) {
+func validateProgress(t *testing.T, p progress) {
 	t.Helper()
-	if len(views) == 0 {
-		t.Fatalf("Expected len(views) > 0, but got 0")
+	if p.Size != p.Restored {
+		t.Fatalf("Expected to restore %d, but restored %d", p.Size, p.Restored)
 	}
-	for _, v := range views {
-		if v.Keyspace == "" {
-			t.Fatalf("Expected not empty view.Keyspace, but got ''")
-		}
-		if v.BaseTable == "" {
-			t.Fatalf("Expected not empty view.BaseTable, but got ''")
-		}
-		if v.View == "" {
-			t.Fatalf("Expected not empty view.View, but got ''")
-		}
-		if v.Type == "" {
-			t.Fatalf("Expected not empty view.Type, but got ''")
-		}
-		if v.BuildStatus != expectedBuildStatus {
-			t.Fatalf("Expected view.BuildStatus '%s', but got '%s'", expectedBuildStatus, v.BuildStatus)
-		}
+	if p.StartedAt == nil {
+		t.Fatalf("Expected StartedAt != nil, but got nil")
+	}
+	if p.CompletedAt == nil {
+		t.Fatalf("Expected CompletedAt != nil, but got nil")
+	}
+	if p.Status != ProgressStatusDone {
+		t.Fatalf("Expected status %q, but got %q", ProgressStatusDone, p.Status)
 	}
 }