fix: 解决升级过程中备份错误问题 (#5120)

Refs #5103
1Panel-dev · May 23, 2024 · 9c357f1 · 9c357f1
1 parent 99ed9be
commit 9c357f1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/backend/utils/mysql/client/local.go b/backend/utils/mysql/client/local.go
@@ -225,9 +225,10 @@ func (r *Local) Backup(info BackupInfo) error {
  }
  }
  outfile, err := os.OpenFile(path.Join(info.TargetDir, info.FileName), os.O_RDWR|os.O_CREATE, 0755)
- if err == nil {
- defer outfile.Close()
+ if err != nil {
+ return fmt.Errorf("open file %s failed, err: %v", path.Join(info.TargetDir, info.FileName), err)
  }
+ defer outfile.Close()
  dumpCmd := "mysqldump"
  if r.Type == constant.AppMariaDB {
  dumpCmd = "mariadb-dump"

diff --git a/backend/utils/mysql/client/remote.go b/backend/utils/mysql/client/remote.go
@@ -236,9 +236,10 @@ func (r *Remote) Backup(info BackupInfo) error {
  }
  }
  outfile, err := os.OpenFile(path.Join(info.TargetDir, info.FileName), os.O_RDWR|os.O_CREATE, 0755)
- if err == nil {
- defer outfile.Close()
+ if err != nil {
+ return fmt.Errorf("open file %s failed, err: %v", path.Join(info.TargetDir, info.FileName), err)
  }
+ defer outfile.Close()
  dumpCmd := "mysqldump"
  if r.Type == constant.AppMariaDB {
  dumpCmd = "mariadb-dump"

diff --git a/backend/utils/postgresql/client/local.go b/backend/utils/postgresql/client/local.go
@@ -130,9 +130,10 @@ func (r *Local) Backup(info BackupInfo) error {
  }
  }
  outfile, err := os.OpenFile(path.Join(info.TargetDir, info.FileName), os.O_RDWR|os.O_CREATE, 0755)
- if err == nil {
- defer outfile.Close()
+ if err != nil {
+ return fmt.Errorf("open file %s failed, err: %v", path.Join(info.TargetDir, info.FileName), err)
  }
+ defer outfile.Close()
  global.LOG.Infof("start to pg_dump | gzip > %s.gzip", info.TargetDir+"/"+info.FileName)
  cmd := exec.Command("docker", "exec", r.ContainerName, "pg_dump", "-F", "c", "-U", r.Username, "-d", info.Name)
  gzipCmd := exec.Command("gzip", "-cf")