[shardingsphere-on-cloud] branch main updated: fix(pitr): fix lsbackup nil error

[miaoliyao]

This is an automated email from the ASF dual-hosted git repository.

miaoliyao pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/shardingsphere-on-cloud.git


The following commit(s) were added to refs/heads/main by this push:
     new c1f280e  fix(pitr): fix lsbackup nil error
     new f240f99  Merge pull request #381 from Xu-Wentao/pitr
c1f280e is described below

commit c1f280ef7c623c266839acbbef37138a645d278b
Author: xuwentao <cutenear1...@yahoo.com>
AuthorDate: Tue May 30 16:18:54 2023 +0800

    fix(pitr): fix lsbackup nil error
---
 pitr/cli/internal/cmd/backup.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pitr/cli/internal/cmd/backup.go b/pitr/cli/internal/cmd/backup.go
index 8537501..5abe70a 100644
--- a/pitr/cli/internal/cmd/backup.go
+++ b/pitr/cli/internal/cmd/backup.go
@@ -101,6 +101,7 @@ func init() {
 // 5. Waiting for backups finished
 // 6. Update local backup info
 // 7. Double check backups all finished
+// nolint:gocognit
 func backup() error {
        var err error
        var lsBackup *model.LsBackup
@@ -120,8 +121,11 @@ func backup() error {
                        if err := proxy.Unlock(); err != nil {
                                logging.Error(fmt.Sprintf("Coz backup failed, 
try to unlock cluster, but still failed, err:%s", err.Error()))
                        }
-                       logging.Warn("Try to delete backup data ...")
-                       deleteBackupFiles(lsBackup)
+
+                       if lsBackup != nil {
+                               logging.Warn("Try to delete backup data ...")
+                               deleteBackupFiles(lsBackup)
+                       }
                }
        }()