-- do not merge to master -- skip cleanup on refresh for 1-1 restore

Author: karol-kokoszka

go.mod

@@ -33,7 +33,7 @@ require (
 	github.com/scylladb/scylla-manager/backupspec v1.0.2
 	github.com/scylladb/scylla-manager/v3/pkg/managerclient v0.0.0-20250506140140-b1b310d3a2e7
 	github.com/scylladb/scylla-manager/v3/pkg/util v0.0.0-20250310104639-18257b71bb48
-	github.com/scylladb/scylla-manager/v3/swagger v0.0.0-20250502123045-ee6af14e22db
+	github.com/scylladb/scylla-manager/v3/swagger v0.0.0-20250515154242-04d796222d35
 	github.com/spf13/cobra v1.8.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stoewer/go-strcase v1.3.0

go.sum

@@ -1068,8 +1068,8 @@ github.com/scylladb/scylla-manager/v3/pkg/managerclient v0.0.0-20250506140140-b1
 github.com/scylladb/scylla-manager/v3/pkg/managerclient v0.0.0-20250506140140-b1b310d3a2e7/go.mod h1:BGRcEJClLt1ipw6XM/zIf82+MHNCiTrmNqlLgobr3Cc=
 github.com/scylladb/scylla-manager/v3/pkg/util v0.0.0-20250310104639-18257b71bb48 h1:2iJMWV073twoCG2L/F5DBzQApxVX8kKEEeke3qvSitM=
 github.com/scylladb/scylla-manager/v3/pkg/util v0.0.0-20250310104639-18257b71bb48/go.mod h1:VKqHSrDj9zfgCKilpbdpmqV1TjmSglt/df79eIg6wuI=
-github.com/scylladb/scylla-manager/v3/swagger v0.0.0-20250502123045-ee6af14e22db h1:Ij7Zw/AqHpTDH5sELQOBC1uE1Fh1fmSJEqdy7D+yyAs=
-github.com/scylladb/scylla-manager/v3/swagger v0.0.0-20250502123045-ee6af14e22db/go.mod h1:nCN5P0jiWL0W7jbcZ9p0ndtZAPoyEWXefddx/nbyFes=
+github.com/scylladb/scylla-manager/v3/swagger v0.0.0-20250515154242-04d796222d35 h1:igLRCWgbgAKHK2qVkCgGLdNknksBAb+RwHIF5fHHFyQ=
+github.com/scylladb/scylla-manager/v3/swagger v0.0.0-20250515154242-04d796222d35/go.mod h1:nCN5P0jiWL0W7jbcZ9p0ndtZAPoyEWXefddx/nbyFes=
 github.com/scylladb/termtables v0.0.0-20191203121021-c4c0b6d42ff4 h1:8qmTC5ByIXO3GP/IzBkxcZ/99VITvnIETDhdFz/om7A=
 github.com/scylladb/termtables v0.0.0-20191203121021-c4c0b6d42ff4/go.mod h1:C1a7PQSMz9NShzorzCiG2fk9+xuCgLkPeCvMHYR2OWg=
 github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=

pkg/scyllaclient/client_scylla.go

@@ -1065,7 +1065,7 @@ func (c *Client) TableDiskSizeReport(ctx context.Context, hostKeyspaceTables Hos
 }
 
 // AwaitLoadSSTables loads sstables that are already downloaded to host's table upload directory.
-func (c *Client) AwaitLoadSSTables(ctx context.Context, host, keyspace, table string, loadAndStream, primaryReplicaOnly bool) error {
+func (c *Client) AwaitLoadSSTables(ctx context.Context, host, keyspace, table string, loadAndStream, primaryReplicaOnly, skipCleanup bool) error {
 	c.logger.Info(ctx, "First try on loading sstables",
 		"host", host,
 		"keyspace", keyspace,
@@ -1088,7 +1088,7 @@ func (c *Client) AwaitLoadSSTables(ctx context.Context, host, keyspace, table st
 	firstCallCtx := ctx
 	firstCallCtx = customTimeout(firstCallCtx, firstCallTimeout)
 	firstCallCtx = noRetry(firstCallCtx)
-	err := c.loadSSTables(firstCallCtx, host, keyspace, table, loadAndStream, primaryReplicaOnly)
+	err := c.loadSSTables(firstCallCtx, host, keyspace, table, loadAndStream, primaryReplicaOnly, skipCleanup)
 	if err == nil {
 		return nil // Return on success
 	}
@@ -1123,7 +1123,7 @@ func (c *Client) AwaitLoadSSTables(ctx context.Context, host, keyspace, table st
 
 		retryCallCtx := ctx
 		retryCallCtx = withShouldRetryHandler(retryCallCtx, dontRetryOnAlreadyLoadingSSTablesRetryHandler)
-		err = c.loadSSTables(retryCallCtx, host, keyspace, table, loadAndStream, primaryReplicaOnly)
+		err = c.loadSSTables(retryCallCtx, host, keyspace, table, loadAndStream, primaryReplicaOnly, skipCleanup)
 		if err == nil {
 			return nil // Return on success
 		}
@@ -1140,13 +1140,14 @@ func (c *Client) AwaitLoadSSTables(ctx context.Context, host, keyspace, table st
 // - It returns nil when called on an empty upload dir
 // loadSSTables does not perform any special error, timeout or retry handling.
 // See AwaitLoadSSTables for a wrapper with those features.
-func (c *Client) loadSSTables(ctx context.Context, host, keyspace, table string, loadAndStream, primaryReplicaOnly bool) error {
+func (c *Client) loadSSTables(ctx context.Context, host, keyspace, table string, loadAndStream, primaryReplicaOnly, skipCleanup bool) error {
 	_, err := c.scyllaOps.StorageServiceSstablesByKeyspacePost(&operations.StorageServiceSstablesByKeyspacePostParams{
 		Context:            forceHost(ctx, host),
 		Keyspace:           keyspace,
 		Cf:                 table,
 		LoadAndStream:      &loadAndStream,
 		PrimaryReplicaOnly: &primaryReplicaOnly,
+		SkipCleanup:        &skipCleanup,
 	})
 	return err
 }

pkg/service/one2onerestore/worker_tables.go

@@ -63,7 +63,7 @@ func (w *worker) createDownloadJob(ctx context.Context, table backupspec.FilesMe
 
 func (w *worker) refreshNode(ctx context.Context, table backupspec.FilesMeta, m *backupspec.ManifestInfo, h Host, pr *RunTableProgress) error {
 	w.metrics.SetOne2OneRestoreState(w.runInfo.ClusterID, m.Location, m.SnapshotTag, h.Addr, metrics.One2OneRestoreStateLoading)
-	err := w.client.AwaitLoadSSTables(ctx, h.Addr, table.Keyspace, table.Table, false, false)
+	err := w.client.AwaitLoadSSTables(ctx, h.Addr, table.Keyspace, table.Table, false, false, true)
 	w.finishDownloadProgress(ctx, pr, err)
 	return err
 }

pkg/service/restore/schema_worker.go

@@ -109,7 +109,7 @@ func (w *schemaWorker) stageRestoreData(ctx context.Context) error {
 		host := status[i]
 		for _, ks := range w.run.Units {
 			for _, t := range ks.Tables {
-				if err := w.client.AwaitLoadSSTables(ctx, host.Addr, ks.Keyspace, t.Table, false, false); err != nil {
+				if err := w.client.AwaitLoadSSTables(ctx, host.Addr, ks.Keyspace, t.Table, false, false, false); err != nil {
 					return errors.Wrap(err, "restore schema")
 				}
 			}

pkg/service/restore/tablesdir_worker.go

@@ -81,7 +81,7 @@ func (w *tablesWorker) waitJob(ctx context.Context, b batch, pr *RunProgress) (e
 
 func (w *tablesWorker) restoreSSTables(ctx context.Context, b batch, pr *RunProgress) error {
 	w.onLasStart(ctx, b, pr)
-	err := w.worker.client.AwaitLoadSSTables(ctx, pr.Host, pr.Keyspace, pr.Table, true, true)
+	err := w.worker.client.AwaitLoadSSTables(ctx, pr.Host, pr.Keyspace, pr.Table, true, true, false)
 	if err == nil {
 		w.onLasEnd(ctx, b, pr)
 	}

vendor/github.com/scylladb/scylla-manager/v3/swagger/gen/scylla/v1/client/operations/storage_service_sstables_by_keyspace_post_parameters.go

@@ -440,7 +440,7 @@ github.com/scylladb/scylla-manager/v3/pkg/util/timeutc
 github.com/scylladb/scylla-manager/v3/pkg/util/uuid
 github.com/scylladb/scylla-manager/v3/pkg/util/version
 github.com/scylladb/scylla-manager/v3/pkg/util/workerpool
-# github.com/scylladb/scylla-manager/v3/swagger v0.0.0-20250502123045-ee6af14e22db
+# github.com/scylladb/scylla-manager/v3/swagger v0.0.0-20250515154242-04d796222d35
 ## explicit; go 1.23.2
 github.com/scylladb/scylla-manager/v3/swagger/gen/agent/client
 github.com/scylladb/scylla-manager/v3/swagger/gen/agent/client/operations