Skip to content

Commit

Permalink
fix conflict (#406)
Browse files Browse the repository at this point in the history
Signed-off-by: wayblink <[email protected]>
  • Loading branch information
wayblink authored Aug 21, 2024
1 parent 2b91f30 commit 9129e4a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions core/backup_context.go
Original file line number Diff line number Diff line change
Expand Up @@ -531,13 +531,13 @@ func (b *BackupContext) DeleteBackup(ctx context.Context, request *backuppb.Dele
func (b *BackupContext) readBackupV2(ctx context.Context, bucketName string, backupPath string) (*backuppb.BackupInfo, error) {
backupMetaDirPath := backupPath + SEPERATOR + META_PREFIX
fullMetaPath := backupMetaDirPath + SEPERATOR + FULL_META_FILE
exist, err := b.getStorageClient().Exist(ctx, bucketName, fullMetaPath)
exist, err := b.getBackupStorageClient().Exist(ctx, bucketName, fullMetaPath)
if err != nil {
log.Error("check full meta file failed", zap.String("path", fullMetaPath), zap.Error(err))
return nil, err
}
if exist {
backupMetaBytes, err := b.getStorageClient().Read(ctx, bucketName, fullMetaPath)
backupMetaBytes, err := b.getBackupStorageClient().Read(ctx, bucketName, fullMetaPath)
if err != nil {
log.Error("Read backup meta failed", zap.String("path", fullMetaPath), zap.Error(err))
return nil, err
Expand Down

0 comments on commit 9129e4a

Please sign in to comment.