-
Notifications
You must be signed in to change notification settings - Fork 51
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
core: initialize minio client at the beginning of restoring the backup (
#556) Signed-off-by: huanghaoyuanhhy <[email protected]>
- Loading branch information
1 parent
2abf8c7
commit c816f18
Showing
4 changed files
with
188 additions
and
73 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,32 @@ | ||
| package restore | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" | ||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| func TestGetFailedReason(t *testing.T) { | ||
| t.Run("Normal", func(t *testing.T) { | ||
| r := getFailedReason([]*commonpb.KeyValuePair{{Key: "failed_reason", Value: "hello"}}) | ||
| assert.Equal(t, "hello", r) | ||
| }) | ||
|
|
||
| t.Run("WithoutFailedReason", func(t *testing.T) { | ||
| r := getFailedReason([]*commonpb.KeyValuePair{{Key: "hello", Value: "world"}}) | ||
| assert.Equal(t, "", r) | ||
| }) | ||
| } | ||
|
|
||
| func TestGetProcess(t *testing.T) { | ||
| t.Run("Normal", func(t *testing.T) { | ||
| r := getProcess([]*commonpb.KeyValuePair{{Key: "progress_percent", Value: "100"}}) | ||
| assert.Equal(t, 100, r) | ||
| }) | ||
|
|
||
| t.Run("WithoutProgress", func(t *testing.T) { | ||
| r := getProcess([]*commonpb.KeyValuePair{{Key: "hello", Value: "world"}}) | ||
| assert.Equal(t, 0, r) | ||
| }) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| package restore | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "time" | ||
|
|
||
| "go.uber.org/zap" | ||
|
|
||
| "github.com/zilliztech/milvus-backup/core/client" | ||
| "github.com/zilliztech/milvus-backup/core/meta" | ||
| "github.com/zilliztech/milvus-backup/core/paramtable" | ||
| "github.com/zilliztech/milvus-backup/core/proto/backuppb" | ||
| "github.com/zilliztech/milvus-backup/core/storage" | ||
| "github.com/zilliztech/milvus-backup/internal/common" | ||
| "github.com/zilliztech/milvus-backup/internal/log" | ||
| ) | ||
|
|
||
| type Task struct { | ||
| logger *zap.Logger | ||
|
|
||
| task *backuppb.RestoreBackupTask | ||
| info *backuppb.BackupInfo | ||
|
|
||
| params *paramtable.BackupParams | ||
| meta *meta.MetaManager | ||
|
|
||
| backupStorage storage.ChunkManager | ||
| milvusStorage storage.ChunkManager | ||
|
|
||
| grpcCli client.Grpc | ||
| restfulCli client.RestfulBulkInsert | ||
|
|
||
| backupBucketName string | ||
| backupPath string | ||
| } | ||
|
|
||
| func NewTask(task *backuppb.RestoreBackupTask, | ||
| backupPath string, | ||
| backupBucketName string, | ||
| params *paramtable.BackupParams, | ||
| info *backuppb.BackupInfo, | ||
| meta *meta.MetaManager, | ||
| backupStorage storage.ChunkManager, | ||
| milvusStorage storage.ChunkManager, | ||
| grpcCli client.Grpc, | ||
| restfulCli client.RestfulBulkInsert, | ||
| ) *Task { | ||
| logger := log.L().With( | ||
| zap.String("backup_name", info.GetName()), | ||
| zap.String("backup_path", backupPath), | ||
| zap.String("backup_bucket_name", backupBucketName)) | ||
|
|
||
| return &Task{ | ||
| logger: logger, | ||
|
|
||
| task: task, | ||
| info: info, | ||
|
|
||
| params: params, | ||
| meta: meta, | ||
|
|
||
| backupStorage: backupStorage, | ||
| milvusStorage: milvusStorage, | ||
|
|
||
| grpcCli: grpcCli, | ||
| restfulCli: restfulCli, | ||
|
|
||
| backupBucketName: backupBucketName, | ||
| backupPath: backupPath, | ||
| } | ||
| } | ||
|
|
||
| func (t *Task) Execute(ctx context.Context, task *backuppb.RestoreBackupTask) error { | ||
| t.logger.Info("start restore backup") | ||
|
|
||
| wp, err := common.NewWorkerPool(ctx, t.params.BackupCfg.RestoreParallelism, 0) | ||
| if err != nil { | ||
| return fmt.Errorf("restore: create collection worker pool %w", err) | ||
| } | ||
| wp.Start() | ||
| t.logger.Info("Start collection level restore pool", zap.Int("parallelism", t.params.BackupCfg.RestoreParallelism)) | ||
|
|
||
| id := task.GetId() | ||
| t.meta.UpdateRestoreTask(id, meta.SetRestoreStateCode(backuppb.RestoreTaskStateCode_EXECUTING)) | ||
|
|
||
| collTaskMetas := task.GetCollectionRestoreTasks() | ||
| for _, collTaskMeta := range collTaskMetas { | ||
| collTask := t.newRestoreCollTask(collTaskMeta) | ||
| job := func(ctx context.Context) error { | ||
| err := collTask.Execute(ctx) | ||
| if err != nil { | ||
| t.meta.UpdateRestoreTask(id, meta.SetRestoreStateCode(backuppb.RestoreTaskStateCode_FAIL), | ||
| meta.SetRestoreErrorMessage(collTaskMeta.GetErrorMessage())) | ||
|
|
||
| t.meta.UpdateRestoreCollectionTask(id, collTaskMeta.GetId(), | ||
| meta.SetRestoreCollectionStateCode(backuppb.RestoreTaskStateCode_FAIL), | ||
| meta.SetRestoreCollectionErrorMessage(collTaskMeta.GetErrorMessage())) | ||
|
|
||
| t.logger.Error("restore coll failed", | ||
| zap.String("target_db_name", collTaskMeta.GetTargetDbName()), | ||
| zap.String("TargetCollectionName", collTaskMeta.GetTargetCollectionName()), | ||
| zap.Error(err)) | ||
| return fmt.Errorf("restore: restore collection %w", err) | ||
| } | ||
|
|
||
| collTaskMeta.StateCode = backuppb.RestoreTaskStateCode_SUCCESS | ||
| log.Info("finish restore collection", | ||
| zap.String("target_db_name", collTaskMeta.GetTargetDbName()), | ||
| zap.String("target_collection_name", collTaskMeta.GetTargetCollectionName()), | ||
| zap.Int64("size", collTaskMeta.RestoredSize)) | ||
| return nil | ||
| } | ||
| wp.Submit(job) | ||
| } | ||
| wp.Done() | ||
| if err := wp.Wait(); err != nil { | ||
| return fmt.Errorf("restore: wait collection worker pool %w", err) | ||
| } | ||
|
|
||
| endTime := time.Now().Unix() | ||
| task.EndTime = endTime | ||
| t.meta.UpdateRestoreTask(id, meta.SetRestoreStateCode(backuppb.RestoreTaskStateCode_SUCCESS), meta.SetRestoreEndTime(endTime)) | ||
|
|
||
| t.logger.Info("finish restore all collections", | ||
| zap.String("backup_name", t.info.GetName()), | ||
| zap.Int("collection_num", len(t.info.GetCollectionBackups())), | ||
| zap.String("task_id", task.GetId()), | ||
| zap.Duration("duration", time.Duration(task.GetEndTime()-task.GetStartTime())*time.Second)) | ||
| return nil | ||
| } | ||
|
|
||
| func (t *Task) newRestoreCollTask(collTask *backuppb.RestoreCollectionTask) *CollectionTask { | ||
| return newCollectionTask(collTask, | ||
| t.meta, | ||
| t.params, | ||
| t.task.GetId(), | ||
| t.backupBucketName, | ||
| t.backupPath, | ||
| t.backupStorage, | ||
| t.milvusStorage, | ||
| t.grpcCli, | ||
| t.restfulCli) | ||
| } |