Merge branch 'master' of github.com:Altinity/clickhouse-backup into improve_restore_table_mapping

Author: Slach

pkg/backup/download.go

@@ -164,6 +164,7 @@ func (b *Backuper) Download(backupName string, tablePattern string, partitions [
 			"partitions":   partitions,
 			"schemaOnly":   schemaOnly,
 		})
+		defer b.resumableState.Close()
 	}
 
 	log.Debug().Str("backup", backupName).Msgf("prepare table METADATA concurrent semaphore with concurrency=%d len(tablesForDownload)=%d", b.cfg.General.DownloadConcurrency, len(tablesForDownload))
@@ -294,10 +295,6 @@ func (b *Backuper) Download(backupName string, tablePattern string, partitions [
 		}
 	}
 
-	if b.resume {
-		b.resumableState.Close()
-	}
-
 	//clean partially downloaded requiredBackup
 	if remoteBackup.RequiredBackup != "" {
 		if err = b.cleanPartialRequiredBackup(ctx, disks, remoteBackup.BackupName); err != nil {

pkg/backup/upload.go

@@ -135,6 +135,7 @@ func (b *Backuper) Upload(backupName string, deleteSource bool, diffFrom, diffFr
 			"partitions":     partitions,
 			"schemaOnly":     schemaOnly,
 		})
+		defer b.resumableState.Close()
 	}
 
 	compressedDataSize := int64(0)
@@ -257,9 +258,6 @@ func (b *Backuper) Upload(backupName string, deleteSource bool, diffFrom, diffFr
 			return errors.Wrapf(err, "can't upload %s", remoteBackupMetaFile)
 		}
 	}
-	if b.resume {
-		b.resumableState.Close()
-	}
 	log.Info().Fields(map[string]interface{}{
 		"backup":           backupName,
 		"operation":        "upload",

pkg/server/server.go

@@ -1175,7 +1175,7 @@ func (api *APIServer) httpCreateRemoteHandler(w http.ResponseWriter, r *http.Req
 		return
 	}
 
-	commandId, _ := status.Current.Start(fullCommand)
+	commandId, _ := status.Current.StartWithOperationId(fullCommand, operationId.String())
 	go func() {
 		err, _ := api.metrics.ExecuteWithMetrics("create_remote", 0, func() error {
 			b := backup.NewBackuper(cfg)
@@ -1485,8 +1485,8 @@ func (api *APIServer) httpUploadHandler(w http.ResponseWriter, r *http.Request)
 		return
 	}
 
+	commandId, _ := status.Current.StartWithOperationId(fullCommand, operationId.String())
 	go func() {
-		commandId, _ := status.Current.StartWithOperationId(fullCommand, operationId.String())
 		err, _ := api.metrics.ExecuteWithMetrics("upload", 0, func() error {
 			b := backup.NewBackuper(cfg)
 			return b.Upload(name, deleteSource, diffFrom, diffFromRemote, tablePattern, partitionsToBackup, skipProjections, schemaOnly, rbacOnly, configsOnly, namedCollectionsOnly, resume, api.cliApp.Version, commandId)
@@ -1925,7 +1925,7 @@ func (api *APIServer) httpRestoreRemoteHandler(w http.ResponseWriter, r *http.Re
 		return
 	}
 
-	commandId, _ := status.Current.Start(fullCommand)
+	commandId, _ := status.Current.StartWithOperationId(fullCommand, operationId.String())
 	go func() {
 		err, _ := api.metrics.ExecuteWithMetrics("restore_remote", 0, func() error {
 			b := backup.NewBackuper(cfg)
@@ -2030,8 +2030,8 @@ func (api *APIServer) httpDownloadHandler(w http.ResponseWriter, r *http.Request
 		return
 	}
 
+	commandId, _ := status.Current.StartWithOperationId(fullCommand, operationId.String())
 	go func() {
-		commandId, _ := status.Current.StartWithOperationId(fullCommand, operationId.String())
 		err, _ := api.metrics.ExecuteWithMetrics("download", 0, func() error {
 			b := backup.NewBackuper(cfg)
 			return b.Download(name, tablePattern, partitionsToBackup, schemaOnly, rbacOnly, configsOnly, namedCollectionsOnly, resume, hardlinkExistsFiles, api.cliApp.Version, commandId)