Commit ed28836

authored

fix: Fixed issue with recover mysql-cluster with backup files (1Panel-dev#9707)

1 parent db8fa14 commit ed28836Copy full SHA for ed28836

File tree

+11

-4

lines changed

+11

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -466,12 +466,12 @@ func (b BaseApi) RecoverByUpload(c gin.Context) {`
`466`	`466`	`}`
`467`	`467`
`468`	`468`	`switch req.Type {`
`469`		`- case "mysql", "mariadb":`
	`469`	`+ case "mysql", "mariadb", constant.AppMysqlCluster:`
`470`	`470`	`if err := backupService.MysqlRecoverByUpload(req); err != nil {`
`471`	`471`	`helper.InternalServer(c, err)`
`472`	`472`	`return`
`473`	`473`	`}`
`474`		`- case constant.AppPostgresql:`
	`474`	`+ case constant.AppPostgresql, constant.AppPostgresqlCluster:`
`475`	`475`	`if err := backupService.PostgresqlRecoverByUpload(req); err != nil {`
`476`	`476`	`helper.InternalServer(c, err)`
`477`	`477`	`return`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,12 @@ func (r *Local) Backup(info BackupInfo) error {`
`253`	`253`	`func (r *Local) Recover(info RecoverInfo) error {`
`254`	`254`	`fi, _ := os.Open(info.SourceFile)`
`255`	`255`	`defer fi.Close()`
`256`		`- cmd := exec.Command("docker", "exec", "-i", r.ContainerName, r.Type, "-uroot", "-p"+r.Password, "--default-character-set="+info.Format, info.Name)`
	`256`	`+ mysqlCli := r.Type`
	`257`	`+ if mysqlCli == "mysql-cluster" {`
	`258`	`+ mysqlCli = "mysql"`
	`259`	`+ }`
	`260`	`+`
	`261`	`+ cmd := exec.Command("docker", "exec", "-i", r.ContainerName, mysqlCli, "-uroot", "-p"+r.Password, "--default-character-set="+info.Format, info.Name)`
`257`	`262`	`if strings.HasSuffix(info.SourceFile, ".gz") {`
`258`	`263`	`gzipFile, err := os.Open(info.SourceFile)`
`259`	`264`	`if err != nil {`
`@@ -271,7 +276,7 @@ func (r *Local) Recover(info RecoverInfo) error {`
`271`	`276`	`}`
`272`	`277`	`stdout, err := cmd.CombinedOutput()`
`273`	`278`	`stdStr := strings.ReplaceAll(string(stdout), "mysql: [Warning] Using a password on the command line interface can be insecure.\n", "")`
`274`		`- if err != nil \|\| strings.HasPrefix(string(stdStr), "ERROR ") {`
	`279`	`+ if err != nil \|\| strings.HasPrefix(stdStr, "ERROR ") {`
`275`	`280`	`return errors.New(stdStr)`
`276`	`281`	`}`
`277`	`282`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -188,6 +188,8 @@ const acceptParams = async (params: DialogProps): Promise<void> => {`
`188`	`188`	`case 'mysql':`
`189`	`189`	`case 'mariadb':`
`190`	`190`	`case 'postgresql':`
	`191`	`+ case 'mysql-cluster':`
	`192`	`+ case 'postgresql-cluster':`
`191`	`193`	`title.value = name.value + ' [ ' + detailName.value + ' ]';`
`192`	`194`	`if (detailName.value) {`
`193`	`195`	baseDir.value = `${pathRes.data}/uploads/database/${type.value}/${name.value}/${detailName.value}/`;

Comments

(0)