You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2023/09/24 09:37:23 UTC

[shardingsphere-on-cloud] branch main updated: refactor: optimize error message format (#447)

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

zhaojinchao 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 7bbc2be  refactor: optimize error message format (#447)
7bbc2be is described below

commit 7bbc2be58eb3d8bfcebd37f75ba7b99575616de1
Author: liyao <ma...@126.com>
AuthorDate: Sun Sep 24 17:37:18 2023 +0800

    refactor: optimize error message format (#447)
    
    * refactor: optimize error message format
    
    Signed-off-by: mlycore <ma...@126.com>
    
    * refactor: optimize error message format
    
    Signed-off-by: mlycore <ma...@126.com>
    
    * chore: adjust packages style
    
    Signed-off-by: mlycore <ma...@126.com>
    
    * refactor: optimize error message format
    
    Signed-off-by: mlycore <ma...@126.com>
    
    * chore: adjust package style
    
    Signed-off-by: mlycore <ma...@126.com>
    
    ---------
    
    Signed-off-by: mlycore <ma...@126.com>
---
 pitr/agent/internal/handler/backup.go              | 19 +++---
 pitr/agent/internal/handler/diskspace.go           |  7 +-
 pitr/agent/internal/handler/handler_suite_test.go  |  1 +
 pitr/agent/internal/handler/healthcheck.go         |  7 +-
 pitr/agent/internal/handler/restore.go             | 31 +++++----
 pitr/agent/internal/handler/show.go                | 22 +++----
 pitr/agent/internal/pkg/opengauss.go               | 75 +++++++++++-----------
 pitr/agent/main.go                                 |  7 +-
 pitr/cli/internal/cmd/backup.go                    | 31 ++++-----
 pitr/cli/internal/cmd/restore.go                   | 23 +++----
 pitr/cli/internal/cmd/root.go                      |  1 +
 pitr/cli/internal/cmd/show.go                      | 15 +++--
 pitr/cli/internal/pkg/agent-server_test.go         |  3 +-
 pitr/cli/internal/pkg/local-storage.go             | 28 ++++----
 pitr/cli/internal/pkg/local-storage_test.go        |  3 +-
 pitr/cli/internal/pkg/shardingsphere-proxy.go      | 32 ++++-----
 pitr/cli/internal/pkg/shardingsphere-proxy_test.go |  7 +-
 17 files changed, 160 insertions(+), 152 deletions(-)

diff --git a/pitr/agent/internal/handler/backup.go b/pitr/agent/internal/handler/backup.go
index b7ea671..d3e9817 100644
--- a/pitr/agent/internal/handler/backup.go
+++ b/pitr/agent/internal/handler/backup.go
@@ -25,6 +25,7 @@ import (
 	"github.com/apache/shardingsphere-on-cloud/pitr/agent/internal/handler/view"
 	"github.com/apache/shardingsphere-on-cloud/pitr/agent/internal/pkg"
 	"github.com/apache/shardingsphere-on-cloud/pitr/agent/pkg/responder"
+
 	"github.com/gofiber/fiber/v2"
 )
 
@@ -32,26 +33,26 @@ func Backup(ctx *fiber.Ctx) error {
 	in := &view.BackupIn{}
 
 	if err := ctx.BodyParser(in); err != nil {
-		return fmt.Errorf("body parse err=%s,wrap=%w", err, cons.BodyParseFailed)
+		return fmt.Errorf("body parse err: %s, wrap: %w", err, cons.BodyParseFailed)
 	}
 
 	if err := in.Validate(); err != nil {
-		return fmt.Errorf("invalid parameter,err=%w", err)
+		return fmt.Errorf("invalid parameter, err wrap: %w", err)
 	}
 
 	if err := pkg.OG.Auth(in.Username, in.Password, in.DBName, in.DBPort); err != nil {
-		efmt := "pkg.OG.Auth failure[un=%s,pw.len=%d,db=%s],err=%w"
+		efmt := "pkg.OG.Auth failure[un=%s,pw.len=%d,db=%s], err wrap=%w"
 		return fmt.Errorf(efmt, in.Username, len(in.Password), in.DBName, err)
 	}
 
 	// try to add backup instance
 	if err := pkg.OG.AddInstance(in.DnBackupPath, in.Instance); err != nil && !errors.Is(err, cons.InstanceAlreadyExist) {
-		return fmt.Errorf("add instance failed, err=%w", err)
+		return fmt.Errorf("add instance failed, err wrap: %w", err)
 	}
 
 	backupID, err := pkg.OG.AsyncBackup(in.DnBackupPath, in.Instance, in.DnBackupMode, 1, in.DBPort)
 	if err != nil {
-		efmt := "pkg.OG.AsyncBackup[path=%s,instance=%s,mode=%s] failure,err=%w"
+		efmt := "pkg.OG.AsyncBackup[path=%s,instance=%s,mode=%s] failure, err wrap: %w"
 		return fmt.Errorf(efmt, in.DnBackupPath, in.Instance, in.DnBackupMode, err)
 	}
 
@@ -63,20 +64,20 @@ func Backup(ctx *fiber.Ctx) error {
 func DeleteBackup(ctx *fiber.Ctx) error {
 	in := &view.DeleteBackupIn{}
 	if err := ctx.BodyParser(in); err != nil {
-		return fmt.Errorf("body parse err=%s,wrap=%w", err, cons.BodyParseFailed)
+		return fmt.Errorf("body parse err: %s, wrap: %w", err, cons.BodyParseFailed)
 	}
 
 	if err := in.Validate(); err != nil {
-		return fmt.Errorf("invalid parameter,err=%w", err)
+		return fmt.Errorf("invalid parameter, err: %w", err)
 	}
 
 	if err := pkg.OG.Auth(in.Username, in.Password, in.DBName, in.DBPort); err != nil {
-		efmt := "pkg.OG.Auth failure[un=%s,pw.len=%d,db=%s],err=%w"
+		efmt := "pkg.OG.Auth failure[un=%s,pw.len=%d,db=%s], err: %w"
 		return fmt.Errorf(efmt, in.Username, len(in.Password), in.DBName, err)
 	}
 
 	if err := pkg.OG.DelBackup(in.DnBackupPath, in.Instance, in.BackupID); err != nil {
-		return fmt.Errorf("delete backup failure,err=%w", err)
+		return fmt.Errorf("delete backup failure, err: %w", err)
 	}
 
 	return responder.Success(ctx, "")
diff --git a/pitr/agent/internal/handler/diskspace.go b/pitr/agent/internal/handler/diskspace.go
index ff131a0..401d523 100644
--- a/pitr/agent/internal/handler/diskspace.go
+++ b/pitr/agent/internal/handler/diskspace.go
@@ -25,6 +25,7 @@ import (
 	"github.com/apache/shardingsphere-on-cloud/pitr/agent/internal/handler/view"
 	"github.com/apache/shardingsphere-on-cloud/pitr/agent/pkg/cmds"
 	"github.com/apache/shardingsphere-on-cloud/pitr/agent/pkg/responder"
+
 	"github.com/gofiber/fiber/v2"
 )
 
@@ -32,18 +33,18 @@ func DiskSpace(ctx *fiber.Ctx) error {
 	in := &view.DiskSpaceIn{}
 
 	if err := ctx.BodyParser(in); err != nil {
-		return fmt.Errorf("body parse err=%s,wrap=%w", err, cons.BodyParseFailed)
+		return fmt.Errorf("body parse err: %s, wrap: %w", err, cons.BodyParseFailed)
 	}
 
 	if err := in.Validate(); err != nil {
-		return fmt.Errorf("invalid parameter,err=%w", err)
+		return fmt.Errorf("invalid parameter, err wrap: %w", err)
 	}
 
 	// show disk space
 	cmd := fmt.Sprintf("df -h %s", in.DiskPath)
 	output, err := cmds.Exec(os.Getenv("SHELL"), cmd)
 	if err != nil {
-		return fmt.Errorf("exec cmd [%s] failure,err=%w", cmd, err)
+		return fmt.Errorf("exec cmd [%s] failure, err wrap: %w", cmd, err)
 	}
 
 	return responder.Success(ctx, output)
diff --git a/pitr/agent/internal/handler/handler_suite_test.go b/pitr/agent/internal/handler/handler_suite_test.go
index 30dbb4b..70067e0 100644
--- a/pitr/agent/internal/handler/handler_suite_test.go
+++ b/pitr/agent/internal/handler/handler_suite_test.go
@@ -24,6 +24,7 @@ import (
 	"github.com/apache/shardingsphere-on-cloud/pitr/agent/internal/handler"
 	"github.com/apache/shardingsphere-on-cloud/pitr/agent/pkg/logging"
 	"github.com/apache/shardingsphere-on-cloud/pitr/agent/pkg/responder"
+
 	"github.com/gofiber/fiber/v2"
 	"github.com/golang/mock/gomock"
 	. "github.com/onsi/ginkgo/v2"
diff --git a/pitr/agent/internal/handler/healthcheck.go b/pitr/agent/internal/handler/healthcheck.go
index b2b2973..43838a6 100644
--- a/pitr/agent/internal/handler/healthcheck.go
+++ b/pitr/agent/internal/handler/healthcheck.go
@@ -24,24 +24,25 @@ import (
 	"github.com/apache/shardingsphere-on-cloud/pitr/agent/internal/handler/view"
 	"github.com/apache/shardingsphere-on-cloud/pitr/agent/internal/pkg"
 	"github.com/apache/shardingsphere-on-cloud/pitr/agent/pkg/responder"
+
 	"github.com/gofiber/fiber/v2"
 )
 
 func HealthCheck(ctx *fiber.Ctx) error {
 	in := &view.HealthCheckIn{}
 	if err := ctx.BodyParser(in); err != nil {
-		return fmt.Errorf("body parse err=%s,wrap=%w", err, cons.BodyParseFailed)
+		return fmt.Errorf("body parse err: %s, wrap: %w", err, cons.BodyParseFailed)
 	}
 
 	if err := pkg.OG.Auth(in.Username, in.Password, in.DBName, in.DBPort); err != nil {
-		efmt := "pkg.OG.Auth failure[un=%s,pw.len=%d,db=%s],err=%w"
+		efmt := "pkg.OG.Auth failure[un=%s,pw.len=%d,db=%s], err wrap: %w"
 		return fmt.Errorf(efmt, in.Username, len(in.Password), in.DBName, err)
 	}
 
 	// check schema if needed
 	if in.Schema != "" {
 		if err := pkg.OG.CheckSchema(in.Username, in.Password, in.DBName, in.DBPort, in.Schema); err != nil {
-			return fmt.Errorf("pkg.OG.CheckSchema return err=%s,wrap=%w", err, err)
+			return fmt.Errorf("pkg.OG.CheckSchema return err: %s, err wrap: %w", err, err)
 		}
 	}
 
diff --git a/pitr/agent/internal/handler/restore.go b/pitr/agent/internal/handler/restore.go
index 88cd933..609a343 100644
--- a/pitr/agent/internal/handler/restore.go
+++ b/pitr/agent/internal/handler/restore.go
@@ -20,45 +20,44 @@ package handler
 import (
 	"fmt"
 
+	"github.com/apache/shardingsphere-on-cloud/pitr/agent/internal/cons"
+	"github.com/apache/shardingsphere-on-cloud/pitr/agent/internal/handler/view"
 	"github.com/apache/shardingsphere-on-cloud/pitr/agent/internal/pkg"
 	"github.com/apache/shardingsphere-on-cloud/pitr/agent/pkg/responder"
 
 	"github.com/gofiber/fiber/v2"
-
-	"github.com/apache/shardingsphere-on-cloud/pitr/agent/internal/cons"
-	"github.com/apache/shardingsphere-on-cloud/pitr/agent/internal/handler/view"
 )
 
 func Restore(ctx *fiber.Ctx) (err error) {
 	in := &view.RestoreIn{}
 
 	if err = ctx.BodyParser(in); err != nil {
-		err = fmt.Errorf("body parse err=%s,wrap=%w", err, cons.BodyParseFailed)
+		err = fmt.Errorf("body parse err: %s, wrap: %w", err, cons.BodyParseFailed)
 		return
 	}
 
 	if err = in.Validate(); err != nil {
-		err = fmt.Errorf("invalid parameter,err=%w", err)
+		err = fmt.Errorf("invalid parameter, err wrap: %w", err)
 		return
 	}
 
 	if err = pkg.OG.Auth(in.Username, in.Password, in.DBName, in.DBPort); err != nil {
-		efmt := "pkg.OG.Auth failure[un=%s,pw.len=%d,db=%s],err=%w"
+		efmt := "pkg.OG.Auth failure[un=%s,pw.len=%d,db=%s], err wrap: %w"
 		err = fmt.Errorf(efmt, in.Username, len(in.Password), in.DBName, err)
 		return
 	}
 
 	// stop openGauss
 	if err = pkg.OG.Stop(); err != nil {
-		err = fmt.Errorf("stop openGauss failure,err=%w", err)
+		err = fmt.Errorf("stop openGauss failure, err wrap: %w", err)
 		return
 	}
 
 	defer func() {
 		if err != nil {
-			err2 := pkg.OG.Start()
-			if err2 != nil {
-				err = fmt.Errorf("pkg.OG.Start() return err=%s,wrap=%w", err2, err)
+			startErr := pkg.OG.Start()
+			if startErr != nil {
+				err = fmt.Errorf("pkg.OG.Start() return err: %s, wrap: %w", startErr, err)
 				return
 			}
 		}
@@ -66,21 +65,21 @@ func Restore(ctx *fiber.Ctx) (err error) {
 
 	// move pgdata to temp
 	if err = pkg.OG.MvPgDataToTemp(); err != nil {
-		err = fmt.Errorf("pkg.OG.MvPgDataToTemp return err=%w", err)
+		err = fmt.Errorf("pkg.OG.MvPgDataToTemp return err wrap: %w", err)
 		return
 	}
 
 	var status = "restoring"
 	defer func() {
 		if status != "restore success" {
-			err2 := pkg.OG.MvTempToPgData()
-			err = fmt.Errorf("resotre failre[err=%s],pkg.OG.MvTempToPgData return err=%w", err, err2)
+			mvErr := pkg.OG.MvTempToPgData()
+			err = fmt.Errorf("resotre failre[err=%s], pkg.OG.MvTempToPgData return err wrap: %w", err, mvErr)
 		}
 	}()
 
 	// restore data from backup
 	if err = pkg.OG.Restore(in.DnBackupPath, in.Instance, in.DnBackupID); err != nil {
-		efmt := "pkg.OG.Restore failure[path=%s,instance=%s,backupID=%s],err=%w"
+		efmt := "pkg.OG.Restore failure[path=%s,instance=%s,backupID=%s], err wrap: %w"
 		err = fmt.Errorf(efmt, in.DnBackupPath, in.Instance, in.DnBackupID, err)
 		status = "restore failure"
 		return
@@ -89,12 +88,12 @@ func Restore(ctx *fiber.Ctx) (err error) {
 
 	// clean temp
 	if err = pkg.OG.CleanPgDataTemp(); err != nil {
-		err = fmt.Errorf("pkg.OG.CleanPgDataTemp return err=%w", err)
+		err = fmt.Errorf("pkg.OG.CleanPgDataTemp return err wrap: %w", err)
 		return
 	}
 
 	if err = pkg.OG.Start(); err != nil {
-		err = fmt.Errorf("pkg.OG.Start return err=%w", err)
+		err = fmt.Errorf("pkg.OG.Start return err wrap: %w", err)
 		return
 	}
 
diff --git a/pitr/agent/internal/handler/show.go b/pitr/agent/internal/handler/show.go
index f76a267..0affe73 100644
--- a/pitr/agent/internal/handler/show.go
+++ b/pitr/agent/internal/handler/show.go
@@ -20,35 +20,33 @@ package handler
 import (
 	"fmt"
 
+	"github.com/apache/shardingsphere-on-cloud/pitr/agent/internal/cons"
+	"github.com/apache/shardingsphere-on-cloud/pitr/agent/internal/handler/view"
 	"github.com/apache/shardingsphere-on-cloud/pitr/agent/internal/pkg"
 	"github.com/apache/shardingsphere-on-cloud/pitr/agent/pkg/responder"
 
-	"github.com/apache/shardingsphere-on-cloud/pitr/agent/internal/handler/view"
-
 	"github.com/gofiber/fiber/v2"
-
-	"github.com/apache/shardingsphere-on-cloud/pitr/agent/internal/cons"
 )
 
 func Show(ctx *fiber.Ctx) error {
 	in := &view.ShowIn{}
 
 	if err := ctx.BodyParser(in); err != nil {
-		return fmt.Errorf("body parse err=%s,wrap=%w", err, cons.BodyParseFailed)
+		return fmt.Errorf("body parse err: %s, wrap: %w", err, cons.BodyParseFailed)
 	}
 
 	if err := in.Validate(); err != nil {
-		return fmt.Errorf("invalid parameter,err=%w", err)
+		return fmt.Errorf("invalid parameter, err wrap: %w", err)
 	}
 
 	if err := pkg.OG.Auth(in.Username, in.Password, in.DBName, in.DBPort); err != nil {
-		efmt := "pkg.OG.Auth failure[un=%s,pw.len=%d,db=%s],err=%w"
+		efmt := "pkg.OG.Auth failure[un=%s,pw.len=%d,db=%s], err wrap: %w"
 		return fmt.Errorf(efmt, in.Username, len(in.Password), in.DBName, err)
 	}
 
 	data, err := pkg.OG.ShowBackup(in.DnBackupPath, in.Instance, in.DnBackupID)
 	if err != nil {
-		efmt := "pkg.OG.ShowBackupDetail failure[backupPath=%s,instance=%s,backupID=%s],err=%w"
+		efmt := "pkg.OG.ShowBackupDetail failure[backupPath=%s,instance=%s,backupID=%s], err wrap: %w"
 		return fmt.Errorf(efmt, in.DnBackupPath, in.Instance, in.DnBackupID, err)
 	}
 
@@ -59,22 +57,22 @@ func ShowList(ctx *fiber.Ctx) error {
 	in := &view.ShowListIn{}
 
 	if err := ctx.BodyParser(in); err != nil {
-		return fmt.Errorf("body parse err=%s,wrap=%w", err, cons.BodyParseFailed)
+		return fmt.Errorf("body parse err: %s, wrap: %w", err, cons.BodyParseFailed)
 	}
 
 	if err := in.Validate(); err != nil {
-		return fmt.Errorf("invalid parameter,err=%w", err)
+		return fmt.Errorf("invalid parameter, err wrap: %w", err)
 	}
 
 	if err := pkg.OG.Auth(in.Username, in.Password, in.DBName, in.DBPort); err != nil {
-		efmt := "pkg.OG.Auth failure[un=%s,pw.len=%d,db=%s],err=%w"
+		efmt := "pkg.OG.Auth failure[un=%s,pw.len=%d,db=%s], err wrap: %w"
 		return fmt.Errorf(efmt, in.Username, len(in.Password), in.DBName, err)
 	}
 
 	//Show list
 	list, err := pkg.OG.ShowBackupList(in.DnBackupPath, in.Instance)
 	if err != nil {
-		efmt := "pkg.OG.ShowBackupList failure[backupPath=%s,instance=%s],err=%w"
+		efmt := "pkg.OG.ShowBackupList failure[backupPath=%s,instance=%s], err wrap: %w"
 		return fmt.Errorf(efmt, in.DnBackupPath, in.Instance, err)
 	}
 
diff --git a/pitr/agent/internal/pkg/opengauss.go b/pitr/agent/internal/pkg/opengauss.go
index 60a9620..ad3220d 100644
--- a/pitr/agent/internal/pkg/opengauss.go
+++ b/pitr/agent/internal/pkg/opengauss.go
@@ -28,6 +28,7 @@ import (
 	"github.com/apache/shardingsphere-on-cloud/pitr/agent/pkg/cmds"
 	"github.com/apache/shardingsphere-on-cloud/pitr/agent/pkg/gsutil"
 	"github.com/apache/shardingsphere-on-cloud/pitr/agent/pkg/logging"
+
 	"github.com/dlclark/regexp2"
 )
 
@@ -98,7 +99,7 @@ func (og *openGauss) AsyncBackup(backupPath, instanceName, backupMode string, th
 	cmd := fmt.Sprintf(_backupFmt, backupPath, instanceName, backupMode, og.pgData, threadsNum, dbPort)
 	outputs, err := cmds.AsyncExec(og.shell, cmd)
 	if err != nil {
-		return "", fmt.Errorf("cmds.AsyncExec[shell=%s,cmd=%s] return err=%w", og.shell, cmd, err)
+		return "", fmt.Errorf("cmds.AsyncExec[shell=%s,cmd=%s] return err wrap: %w", og.shell, cmd, err)
 	}
 
 	for output := range outputs {
@@ -116,7 +117,7 @@ func (og *openGauss) AsyncBackup(backupPath, instanceName, backupMode string, th
 		// get the backup id from the first line
 		bid, err := og.getBackupID(output.Message)
 		if err != nil {
-			return "", fmt.Errorf("og.getBackupID[source=%s] return err=%w", output.Message, err)
+			return "", fmt.Errorf("og.getBackupID[source=%s] return err wrap: %w", output.Message, err)
 		}
 		// ignore other output
 		go og.ignore(outputs)
@@ -129,32 +130,32 @@ func (og *openGauss) ShowBackup(backupPath, instanceName, backupID string) (*mod
 	cmd := fmt.Sprintf(_showFmt, instanceName, backupPath, backupID)
 	output, err := cmds.Exec(og.shell, cmd)
 	if err != nil {
-		return nil, fmt.Errorf("cmds.Exec[shell=%s,cmd=%s] return err=%w", og.shell, cmd, err)
+		return nil, fmt.Errorf("cmds.Exec[shell=%s,cmd=%s] return err wrap: %w", og.shell, cmd, err)
 	}
 
 	var list []*model.BackupList
 	if err = json.Unmarshal([]byte(output), &list); err != nil {
-		return nil, fmt.Errorf("json.Unmarshal[output=%s] return err=%s,wrap=%w", output, err, cons.Internal)
+		return nil, fmt.Errorf("json.Unmarshal[output=%s] return err: %s, wrap: %w", output, err, cons.Internal)
 	}
 
 	for _, ins := range list {
 		if ins.Instance == instanceName {
 			if len(ins.List) == 0 {
-				return nil, fmt.Errorf("instance[name=%s],backupList[v=%+v],err=%w", ins.Instance, list, cons.DataNotFound)
+				return nil, fmt.Errorf("instance[name=%s], backupList[v=%+v], err wrap: %w", ins.Instance, list, cons.DataNotFound)
 			}
 
 			return ins.List[0], nil
 		}
 	}
 
-	return nil, fmt.Errorf("backupList[v=%+v],err=%w", list, cons.DataNotFound)
+	return nil, fmt.Errorf("backupList[v=%+v], err wrap: %w", list, cons.DataNotFound)
 }
 
 func (og *openGauss) DelBackup(backupPath, instanceName, backupID string) error {
 	cmd := fmt.Sprintf(_delBackupFmt, backupPath, instanceName, backupID)
 	_, err := cmds.Exec(og.shell, cmd)
 	if err != nil {
-		return fmt.Errorf("cmds.Exec[shell=%s,cmd=%s] return err=%w", og.shell, cmd, err)
+		return fmt.Errorf("cmds.Exec[shell=%s,cmd=%s] return err wrap: %w", og.shell, cmd, err)
 	}
 	return nil
 }
@@ -166,10 +167,10 @@ func (og *openGauss) Init(backupPath string) error {
 	og.log.Debug(fmt.Sprintf("Init output[msg=%s,err=%v]", output, err))
 
 	if errors.Is(err, cons.CmdOperateFailed) {
-		return fmt.Errorf("init backup path failure,err=%s,wrap=%w", err, cons.BackupPathAlreadyExist)
+		return fmt.Errorf("init backup path failure,err: %s, wrap: %w", err, cons.BackupPathAlreadyExist)
 	}
 	if err != nil {
-		return fmt.Errorf("cmds.Exec[shell=%s,cmd=%s] return err=%w", og.shell, cmd, err)
+		return fmt.Errorf("cmds.Exec[shell=%s,cmd=%s] return err wrap: %w", og.shell, cmd, err)
 	}
 	return nil
 }
@@ -181,7 +182,7 @@ func (og *openGauss) deinit(backupPath string) error {
 
 	cmd := fmt.Sprintf(_rmDirFmt, backupPath)
 	if _, err := cmds.Exec(og.shell, cmd); err != nil {
-		return fmt.Errorf("cmds.Exec[shell=%s,cmd=%s] return err=%w", og.shell, cmd, err)
+		return fmt.Errorf("cmds.Exec[shell=%s,cmd=%s] return err wrap: %w", og.shell, cmd, err)
 	}
 	return nil
 }
@@ -193,10 +194,10 @@ func (og *openGauss) AddInstance(backupPath, instance string) error {
 	og.log.Debug(fmt.Sprintf("AddInstance[output=%s,err=%v]", output, err))
 
 	if errors.Is(err, cons.CmdOperateFailed) {
-		return fmt.Errorf("add instance failure[output=%s],err=%s,wrap=%w", output, err, cons.InstanceAlreadyExist)
+		return fmt.Errorf("add instance failure[output=%s], err: %s, wrap: %w", output, err, cons.InstanceAlreadyExist)
 	}
 	if err != nil {
-		return fmt.Errorf("cmds.Exec[shell=%s,cmd=%s] return err=%w", og.shell, cmd, err)
+		return fmt.Errorf("cmds.Exec[shell=%s,cmd=%s] return err wrap: %w", og.shell, cmd, err)
 	}
 	return nil
 }
@@ -207,10 +208,10 @@ func (og *openGauss) DelInstance(backupPath, instance string) error {
 	og.log.Debug(fmt.Sprintf("DelInstance[output=%s,err=%v]", output, err))
 
 	if errors.Is(err, cons.CmdOperateFailed) {
-		return fmt.Errorf("delete instance failure[output=%s],err=%s,wrap=%w", output, err, cons.InstanceNotExist)
+		return fmt.Errorf("delete instance failure[output=%s], err: %s, wrap: %w", output, err, cons.InstanceNotExist)
 	}
 	if err != nil {
-		return fmt.Errorf("cmds.Exec[shell=%s,cmd=%s] return err=%w", og.shell, cmd, err)
+		return fmt.Errorf("cmds.Exec[shell=%s,cmd=%s] return err wrap: %w", og.shell, cmd, err)
 	}
 	return nil
 }
@@ -221,10 +222,10 @@ func (og *openGauss) Start() error {
 	og.log.Debug(fmt.Sprintf("Start openGauss[output=%s]", output))
 
 	if errors.Is(err, cons.CmdOperateFailed) {
-		return fmt.Errorf("start openGauss failure[output=%s],err=%s,wrap=%w", output, err, cons.StartOpenGaussFailed)
+		return fmt.Errorf("start openGauss failure[output=%s], err: %s, wrap: %w", output, err, cons.StartOpenGaussFailed)
 	}
 	if err != nil {
-		return fmt.Errorf("cmds.Exec[shell=%s,cmd=%s,output=%s] return err=%w", og.shell, cmd, output, err)
+		return fmt.Errorf("cmds.Exec[shell=%s,cmd=%s,output=%s] return err wrap: %w", og.shell, cmd, output, err)
 	}
 
 	return nil
@@ -236,10 +237,10 @@ func (og *openGauss) Stop() error {
 	og.log.Debug(fmt.Sprintf("Stop openGauss[output=%s]", output))
 
 	if errors.Is(err, cons.CmdOperateFailed) {
-		return fmt.Errorf("stop openGauss failure[output=%s],err=%s,wrap=%w", output, err, cons.StopOpenGaussFailed)
+		return fmt.Errorf("stop openGauss failure[output=%s], err: %s, wrap: %w", output, err, cons.StopOpenGaussFailed)
 	}
 	if err != nil {
-		return fmt.Errorf("cmds.Exec[shell=%s,cmd=%s,output=%s] return err=%w", og.shell, cmd, output, err)
+		return fmt.Errorf("cmds.Exec[shell=%s,cmd=%s,output=%s] return err wrap: %w", og.shell, cmd, output, err)
 	}
 
 	return nil
@@ -262,10 +263,10 @@ func (og *openGauss) Status() (string, error) {
 		if strings.Contains(err.Error(), "no server running") {
 			return "Stopped", nil
 		}
-		return "", fmt.Errorf("get openGauss status failure[output=%s],err=[%s],wrap=%w", output, err, cons.StopOpenGaussFailed)
+		return "", fmt.Errorf("get openGauss status failure[output=%s], err: %s, wrap: %w", output, err, cons.StopOpenGaussFailed)
 	}
 	if err != nil {
-		return "", fmt.Errorf("cmds.Exec[shell=%s,cmd=%s,output=%s] return err=%w", og.shell, cmd, output, err)
+		return "", fmt.Errorf("cmds.Exec[shell=%s,cmd=%s,output=%s] return err wrap: %w", og.shell, cmd, output, err)
 	}
 
 	if strings.Contains(output, "server is running") {
@@ -290,10 +291,10 @@ func (og *openGauss) Restore(backupPath, instance, backupID string) error {
 			Debug(fmt.Sprintf("Restore openGauss[lineNo=%d,msg=%s]", output.LineNo, output.Message))
 
 		if errors.Is(err, cons.CmdOperateFailed) {
-			return fmt.Errorf("cmds.AsyncExec[output=%s] return err=%s,wrap=%w", output.Message, output.Error, cons.RestoreFailed)
+			return fmt.Errorf("cmds.AsyncExec[output=%s] return err: %s, wrap: %w", output.Message, output.Error, cons.RestoreFailed)
 		}
 		if output.Error != nil {
-			return fmt.Errorf("cmds.AsyncExec outputs:Error[%s] is not nil,wrap=%w", output.Error, cons.RestoreFailed)
+			return fmt.Errorf("cmds.AsyncExec outputs: Error[%s] is not nil, wrap: %w", output.Error, cons.RestoreFailed)
 		}
 	}
 	return nil
@@ -303,25 +304,25 @@ func (og *openGauss) ShowBackupList(backupPath, instanceName string) ([]*model.B
 	cmd := fmt.Sprintf(_showListFmt, instanceName, backupPath)
 	output, err := cmds.Exec(og.shell, cmd)
 	if err != nil {
-		return nil, fmt.Errorf("cmds.Exec[shell=%s,cmd=%s] return err=%w", og.shell, cmd, err)
+		return nil, fmt.Errorf("cmds.Exec[shell=%s,cmd=%s] return err wrap: %w", og.shell, cmd, err)
 	}
 
 	var list []*model.BackupList
 	if err = json.Unmarshal([]byte(output), &list); err != nil {
-		return nil, fmt.Errorf("json.Unmarshal[output=%s] return err=%s,wrap=%w", output, err, cons.Internal)
+		return nil, fmt.Errorf("json.Unmarshal[output=%s] return err: %s, wrap: %w", output, err, cons.Internal)
 	}
 
 	for _, ins := range list {
 		if ins.Instance == instanceName {
 			if len(ins.List) == 0 {
-				return nil, fmt.Errorf("instance[name=%s],backupList[v=%+v],err=%w", ins.Instance, list, cons.DataNotFound)
+				return nil, fmt.Errorf("instance[name=%s], backupList[v=%+v], err wrap: %w", ins.Instance, list, cons.DataNotFound)
 			}
 
 			return ins.List, nil
 		}
 	}
 
-	return nil, fmt.Errorf("backupList[v=%+v],err=%w", list, cons.DataNotFound)
+	return nil, fmt.Errorf("backupList[v=%+v], err wrap: %w", list, cons.DataNotFound)
 }
 
 func (og *openGauss) ignore(outputs chan *cmds.Output) {
@@ -339,10 +340,10 @@ func (og *openGauss) getBackupID(msg string) (string, error) {
 	re := regexp2.MustCompile("(?<=backup ID:\\s+)\\w+(?=,)", 0)
 	match, err := re.FindStringMatch(msg)
 	if err != nil {
-		return "", fmt.Errorf("unmatch any backup id[msg=%s],err=%s", msg, err)
+		return "", fmt.Errorf("unmatch any backup id[msg=%s], err: %s", msg, err)
 	}
 	if match.Length == 0 {
-		return "", fmt.Errorf("unmatch any backup id,match.lenght is 0,err=%w", cons.UnmatchBackupID)
+		return "", fmt.Errorf("unmatch any backup id,match.lenght is 0, err wrap: %w", cons.UnmatchBackupID)
 	}
 	return match.String(), err
 }
@@ -361,7 +362,7 @@ func (og *openGauss) Auth(user, password, dbName string, dbPort uint16) error {
 	}
 
 	if err := _og.Ping(); err != nil {
-		return fmt.Errorf("ping openGauss fail[user=%s,pw length=%d,dbName=%s],err=%w", user, len(password), dbName, err)
+		return fmt.Errorf("ping openGauss fail[user=%s,pw length=%d,dbName=%s], err wrap: %w", user, len(password), dbName, err)
 	}
 
 	return nil
@@ -371,10 +372,10 @@ func (og *openGauss) MvPgDataToTemp() error {
 	cmd := fmt.Sprintf(_mvFmt, og.pgData, og.pgDataTemp)
 	_, err := cmds.Exec(og.shell, cmd)
 	if errors.Is(err, cons.CmdOperateFailed) {
-		return fmt.Errorf("mv pgdata to temp dir failure,err=%s,wrap=%w", err, cons.MvPgDataToTempFailed)
+		return fmt.Errorf("mv pgdata to temp dir failure, err: %s, wrap: %w", err, cons.MvPgDataToTempFailed)
 	}
 	if err != nil {
-		return fmt.Errorf("cmds.Exec[shell=%s,cmd=%s] return err=%w", og.shell, cmd, err)
+		return fmt.Errorf("cmds.Exec[shell=%s,cmd=%s] return err wrap: %w", og.shell, cmd, err)
 	}
 
 	return nil
@@ -384,10 +385,10 @@ func (og *openGauss) MvTempToPgData() error {
 	cmd := fmt.Sprintf(_mvFmt, og.pgDataTemp, og.pgData)
 	_, err := cmds.Exec(og.shell, cmd)
 	if errors.Is(err, cons.CmdOperateFailed) {
-		return fmt.Errorf("mv temp to pgdata dir failure,err=%s,wrap=%w", err, cons.MvTempToPgDataFailed)
+		return fmt.Errorf("mv temp to pgdata dir failure, err: %s, wrap: %w", err, cons.MvTempToPgDataFailed)
 	}
 	if err != nil {
-		return fmt.Errorf("cmds.Exec[shell=%s,cmd=%s] return err=%w", og.shell, cmd, err)
+		return fmt.Errorf("cmds.Exec[shell=%s,cmd=%s] return err wrap: %w", og.shell, cmd, err)
 	}
 	return nil
 }
@@ -396,10 +397,10 @@ func (og *openGauss) CleanPgDataTemp() error {
 	cmd := fmt.Sprintf(_rmDirFmt, og.pgDataTemp)
 	_, err := cmds.Exec(og.shell, cmd)
 	if errors.Is(err, cons.CmdOperateFailed) {
-		return fmt.Errorf("clean pgdata temp dir failure,err=%s,wrap=%w", err, cons.CleanPgDataTempFailed)
+		return fmt.Errorf("clean pgdata temp dir failure, err: %s, wrap: %w", err, cons.CleanPgDataTempFailed)
 	}
 	if err != nil {
-		return fmt.Errorf("cmds.Exec[shell=%s,cmd=%s] return err=%w", og.shell, cmd, err)
+		return fmt.Errorf("cmds.Exec[shell=%s,cmd=%s] return err wrap: %w", og.shell, cmd, err)
 	}
 	return nil
 }
@@ -407,11 +408,11 @@ func (og *openGauss) CleanPgDataTemp() error {
 func (og *openGauss) CheckSchema(user, password, dbName string, dbPort uint16, schema string) error {
 	_og, err := gsutil.Open(user, password, dbName, dbPort)
 	if err != nil {
-		return fmt.Errorf("gsutil.Open failure,err=%w", err)
+		return fmt.Errorf("gsutil.Open failure, err wrap: %w", err)
 	}
 
 	if err := _og.CheckSchema(schema); err != nil {
-		return fmt.Errorf("check openGauss schema fail[user=%s,dbName=%s, schema=%s],err=%w", user, dbName, schema, err)
+		return fmt.Errorf("check openGauss schema fail[user=%s,dbName=%s, schema=%s], err wrap: %w", user, dbName, schema, err)
 	}
 	return nil
 }
diff --git a/pitr/agent/main.go b/pitr/agent/main.go
index fcc1981..2147259 100644
--- a/pitr/agent/main.go
+++ b/pitr/agent/main.go
@@ -30,6 +30,7 @@ import (
 	"github.com/apache/shardingsphere-on-cloud/pitr/agent/internal/pkg"
 	"github.com/apache/shardingsphere-on-cloud/pitr/agent/pkg/logging"
 	"github.com/apache/shardingsphere-on-cloud/pitr/agent/pkg/responder"
+
 	"github.com/gofiber/fiber/v2"
 	"github.com/joho/godotenv"
 	"go.uber.org/zap/zapcore"
@@ -72,7 +73,7 @@ func main() {
 	if envSourceFile != "" {
 		err := godotenv.Load(envSourceFile)
 		if err != nil {
-			panic(fmt.Errorf("load env source file error:%s", err.Error()))
+			panic(fmt.Errorf("load env source file error: %s", err))
 		}
 	}
 
@@ -84,12 +85,12 @@ func main() {
 	if pgData == "" {
 		pgData = os.Getenv("PGDATA")
 		if pgData == "" {
-			panic(fmt.Errorf("PGDATA:no database directory specified and environment variable PGDATA unset"))
+			panic(fmt.Errorf("PGDATA: no database directory specified and environment variable PGDATA unset"))
 		}
 	}
 
 	if _, err := os.Stat(pgData); os.IsNotExist(err) {
-		panic(fmt.Errorf("PGDATA:%s the database directory does not exist", pgData))
+		panic(fmt.Errorf("PGDATA: %s the database directory does not exist", pgData))
 	}
 
 	pgData = strings.Trim(pgData, " ")
diff --git a/pitr/cli/internal/cmd/backup.go b/pitr/cli/internal/cmd/backup.go
index ea2a4fe..066f065 100644
--- a/pitr/cli/internal/cmd/backup.go
+++ b/pitr/cli/internal/cmd/backup.go
@@ -27,6 +27,7 @@ import (
 	"github.com/apache/shardingsphere-on-cloud/pitr/cli/internal/pkg/xerr"
 	"github.com/apache/shardingsphere-on-cloud/pitr/cli/pkg/logging"
 	"github.com/apache/shardingsphere-on-cloud/pitr/cli/pkg/prettyoutput"
+
 	"github.com/google/uuid"
 	"github.com/jedib0t/go-pretty/v6/progress"
 	"github.com/jedib0t/go-pretty/v6/table"
@@ -107,19 +108,19 @@ func backup() error {
 	var lsBackup *model.LsBackup
 	proxy, err := pkg.NewShardingSphereProxy(Username, Password, pkg.DefaultDBName, Host, Port)
 	if err != nil {
-		return xerr.NewCliErr("Create ss-proxy connect failed")
+		return xerr.NewCliErr(fmt.Sprintf("Connect shardingsphere proxy failed, err: %s", err))
 	}
 
 	ls, err := pkg.NewLocalStorage(pkg.DefaultRootDir())
 	if err != nil {
-		return xerr.NewCliErr("Create local storage failed")
+		return xerr.NewCliErr(fmt.Sprintf("Create local storage failed. err: %s", err))
 	}
 
 	defer func() {
 		if err != nil {
 			logging.Warn("Try to unlock cluster ...")
 			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.Error(fmt.Sprintf("Since backup failed, try to unlock cluster, but still failed. err: %s", err))
 			}
 
 			if lsBackup != nil {
@@ -133,14 +134,14 @@ func backup() error {
 	logging.Info("Starting lock cluster ...")
 	err = proxy.LockForBackup()
 	if err != nil {
-		return xerr.NewCliErr("Lock for backup failed")
+		return xerr.NewCliErr(fmt.Sprintf("Lock for backup failed. err: %s", err))
 	}
 
 	// Step2. Get cluster info and save local backup info
 	logging.Info("Starting export metadata ...")
 	lsBackup, err = exportData(proxy, ls)
 	if err != nil {
-		return xerr.NewCliErr(fmt.Sprintf("export backup data failed, err:%s", err.Error()))
+		return xerr.NewCliErr(fmt.Sprintf("export backup data failed. err: %s", err))
 	}
 	logging.Info(fmt.Sprintf("Export backup data success, backup filename: %s", filename))
 
@@ -156,28 +157,28 @@ func backup() error {
 	logging.Info("Checking disk space...")
 	err = checkDiskSpace(lsBackup)
 	if err != nil {
-		return xerr.NewCliErr(err.Error())
+		return xerr.NewCliErr(fmt.Sprintf("check disk space failed. err: %s", err))
 	}
 
 	// Step5. send backup command to agent-server.
 	logging.Info("Starting backup ...")
 	err = execBackup(lsBackup)
 	if err != nil {
-		return xerr.NewCliErr(fmt.Sprintf("exec backup failed, err:%s", err.Error()))
+		return xerr.NewCliErr(fmt.Sprintf("exec backup failed. err: %s", err))
 	}
 
 	// Step6. unlock cluster
 	logging.Info("Starting unlock cluster ...")
 	err = proxy.Unlock()
 	if err != nil {
-		return xerr.NewCliErr(fmt.Sprintf("unlock cluster failed, err:%s", err.Error()))
+		return xerr.NewCliErr(fmt.Sprintf("unlock cluster failed. err: %s", err))
 	}
 
 	// Step7. update backup file
 	logging.Info("Starting update backup file ...")
 	err = ls.WriteByJSON(filename, lsBackup)
 	if err != nil {
-		return xerr.NewCliErr(fmt.Sprintf("update backup file failed, err:%s", err.Error()))
+		return xerr.NewCliErr(fmt.Sprintf("update backup file failed. err: %s", err))
 	}
 
 	// Step8. check agent server backup
@@ -193,7 +194,7 @@ func backup() error {
 	logging.Info("Starting update backup file ...")
 	err = ls.WriteByJSON(filename, lsBackup)
 	if err != nil {
-		return xerr.NewCliErr(fmt.Sprintf("update backup file failed, err: %s", err.Error()))
+		return xerr.NewCliErr(fmt.Sprintf("update backup file failed. err: %s", err))
 	}
 
 	logging.Info("Backup finished!")
@@ -204,13 +205,13 @@ func exportData(proxy pkg.IShardingSphereProxy, ls pkg.ILocalStorage) (lsBackup
 	// Step1. export cluster metadata from ss-proxy
 	cluster, err := proxy.ExportMetaData()
 	if err != nil {
-		return nil, xerr.NewCliErr("export meta data failed")
+		return nil, xerr.NewCliErr(fmt.Sprintf("export meta data failed. err: %s", err))
 	}
 
 	// Step2. export storage nodes from ss-proxy
 	nodes, err := proxy.ExportStorageNodes()
 	if err != nil {
-		return nil, xerr.NewCliErr("export storage nodes failed")
+		return nil, xerr.NewCliErr(fmt.Sprintf("export storage nodes failed. err: %s", err))
 	}
 
 	// Step3. combine the backup contents
@@ -237,7 +238,7 @@ func exportData(proxy pkg.IShardingSphereProxy, ls pkg.ILocalStorage) (lsBackup
 
 	// Step4. finally, save data with json to local
 	if err := ls.WriteByJSON(filename, contents); err != nil {
-		return nil, xerr.NewCliErr("write backup info by json failed")
+		return nil, xerr.NewCliErr(fmt.Sprintf("write backup info by json failed. err: %s", err))
 	}
 
 	return contents, nil
@@ -264,7 +265,7 @@ func execBackup(lsBackup *model.LsBackup) error {
 	// if backup failed, return error
 	if err != nil {
 		lsBackup.SsBackup.Status = model.SsBackupStatusFailed
-		return xerr.NewCliErr(fmt.Sprintf("node backup failed, err:%s", err.Error()))
+		return xerr.NewCliErr(fmt.Sprintf("node backup failed. err: %s", err))
 	}
 
 	// save data node list to lsBackup
@@ -289,7 +290,7 @@ func _execBackup(as pkg.IAgentServer, node *model.StorageNode, dnCh chan *model.
 	}
 	backupID, err := as.Backup(in)
 	if err != nil {
-		return xerr.NewCliErr(fmt.Sprintf("backup failed, err:%s", err.Error()))
+		return xerr.NewCliErr(fmt.Sprintf("backup failed, err: %s", err))
 	}
 
 	// update DnList of lsBackup
diff --git a/pitr/cli/internal/cmd/restore.go b/pitr/cli/internal/cmd/restore.go
index 0813e95..92ca2a7 100644
--- a/pitr/cli/internal/cmd/restore.go
+++ b/pitr/cli/internal/cmd/restore.go
@@ -28,6 +28,7 @@ import (
 	"github.com/apache/shardingsphere-on-cloud/pitr/cli/internal/pkg/xerr"
 	"github.com/apache/shardingsphere-on-cloud/pitr/cli/pkg/logging"
 	"github.com/apache/shardingsphere-on-cloud/pitr/cli/pkg/prettyoutput"
+
 	"github.com/jedib0t/go-pretty/v6/progress"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/spf13/cobra"
@@ -87,11 +88,11 @@ func restore() error {
 	// init local storage
 	ls, err := pkg.NewLocalStorage(pkg.DefaultRootDir())
 	if err != nil {
-		return xerr.NewCliErr(fmt.Sprintf("new local storage failed, err:%s", err.Error()))
+		return xerr.NewCliErr(fmt.Sprintf("new local storage failed. err: %s", err.Error()))
 	}
 	proxy, err := pkg.NewShardingSphereProxy(Username, Password, pkg.DefaultDBName, Host, Port)
 	if err != nil {
-		return xerr.NewCliErr(fmt.Sprintf("new ss-proxy failed, err:%s", err.Error()))
+		return xerr.NewCliErr(fmt.Sprintf("new ss-proxy failed. err: [%s", err.Error()))
 	}
 
 	// get backup record
@@ -99,24 +100,24 @@ func restore() error {
 	if CSN != "" {
 		bak, err = ls.ReadByCSN(CSN)
 		if err != nil {
-			return xerr.NewCliErr("read backup record by csn failed")
+			return xerr.NewCliErr(fmt.Sprintf("read backup record by csn failed. err: %s", err))
 		}
 	}
 
 	if RecordID != "" {
 		bak, err = ls.ReadByID(RecordID)
 		if err != nil {
-			return xerr.NewCliErr("read backup record by id failed")
+			return xerr.NewCliErr(fmt.Sprintf("read backup record by id failed. err: %s", err))
 		}
 	}
 	if bak == nil {
-		return xerr.NewCliErr("backup record not found")
+		return xerr.NewCliErr(fmt.Sprintf("backup record not found. err: %s", err))
 	}
 
 	// check if the backup logic database exits,
 	// if exits, we need to warning user that we will drop the database.
 	if err := checkDatabaseExist(proxy, bak); err != nil {
-		return xerr.NewCliErr(fmt.Sprintf("check database exist failed:%s", err.Error()))
+		return xerr.NewCliErr(fmt.Sprintf("check database exist failed. err: %s", err))
 	}
 
 	// check agent server status
@@ -128,13 +129,13 @@ func restore() error {
 	// exec restore
 	logging.Info("Start restore backup data to openGauss...")
 	if err := execRestore(bak); err != nil {
-		return xerr.NewCliErr(fmt.Sprintf("exec restore failed:%s", err.Error()))
+		return xerr.NewCliErr(fmt.Sprintf("exec restore failed. err: %s", err))
 	}
 
 	logging.Info("Restore backup data to openGauss success!")
 	// restore metadata to ss-proxy
 	if err := restoreDataToSSProxy(proxy, bak); err != nil {
-		return xerr.NewCliErr(fmt.Sprintf("restore metadata to ss-proxy failed:%s", err.Error()))
+		return xerr.NewCliErr(fmt.Sprintf("restore metadata to shardingsphere proxy failed. err: %s", err))
 	}
 	logging.Info("Restore success!")
 	return nil
@@ -143,7 +144,7 @@ func restore() error {
 func checkDatabaseExist(proxy pkg.IShardingSphereProxy, bak *model.LsBackup) error {
 	clusterNow, err := proxy.ExportMetaData()
 	if err != nil {
-		return xerr.NewCliErr(fmt.Sprintf("get cluster metadata failed:%s", err.Error()))
+		return xerr.NewCliErr(fmt.Sprintf("get cluster metadata failed. err: %s", err))
 	}
 
 	for k := range bak.SsBackup.ClusterInfo.MetaData.Databases {
@@ -169,13 +170,13 @@ func restoreDataToSSProxy(proxy pkg.IShardingSphereProxy, lsBackup *model.LsBack
 	for _, shardingDBName := range databaseNamesExist {
 		logging.Info(fmt.Sprintf("Dropping database: [%s] ...", shardingDBName))
 		if err := proxy.DropDatabase(shardingDBName); err != nil {
-			return xerr.NewCliErr(fmt.Sprintf("drop database failed:%s", err.Error()))
+			return xerr.NewCliErr(fmt.Sprintf("drop database failed. err: %s", err))
 		}
 	}
 
 	// import metadata
 	if err := proxy.ImportMetaData(lsBackup.SsBackup.ClusterInfo); err != nil {
-		return xerr.NewCliErr(fmt.Sprintf("Import metadata to ss-proxy failed:%s", err.Error()))
+		return xerr.NewCliErr(fmt.Sprintf("Import metadata to ss-proxy failed. err: %s", err))
 	}
 
 	return nil
diff --git a/pitr/cli/internal/cmd/root.go b/pitr/cli/internal/cmd/root.go
index 87a67a4..2b7e8cf 100644
--- a/pitr/cli/internal/cmd/root.go
+++ b/pitr/cli/internal/cmd/root.go
@@ -26,6 +26,7 @@ import (
 	"github.com/apache/shardingsphere-on-cloud/pitr/cli/internal/pkg/model"
 	"github.com/apache/shardingsphere-on-cloud/pitr/cli/internal/pkg/xerr"
 	"github.com/apache/shardingsphere-on-cloud/pitr/cli/pkg/logging"
+
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/spf13/cobra"
 )
diff --git a/pitr/cli/internal/cmd/show.go b/pitr/cli/internal/cmd/show.go
index 6204695..b72fb57 100644
--- a/pitr/cli/internal/cmd/show.go
+++ b/pitr/cli/internal/cmd/show.go
@@ -25,6 +25,7 @@ import (
 	"github.com/apache/shardingsphere-on-cloud/pitr/cli/internal/pkg/model"
 	"github.com/apache/shardingsphere-on-cloud/pitr/cli/internal/pkg/xerr"
 	"github.com/apache/shardingsphere-on-cloud/pitr/cli/pkg/logging"
+
 	"github.com/spf13/cobra"
 )
 
@@ -52,17 +53,17 @@ func init() {
 func show() error {
 	ls, err := pkg.NewLocalStorage(pkg.DefaultRootDir())
 	if err != nil {
-		return xerr.NewCliErr(fmt.Sprintf("connect to local storage failed, err:%s", err.Error()))
+		return xerr.NewCliErr(fmt.Sprintf("connect to local storage failed. err: %s", err))
 	}
 
 	// show backup record by csn
 	if CSN != "" {
 		bak, err := ls.ReadByCSN(CSN)
 		if err != nil {
-			return xerr.NewCliErr(fmt.Sprintf("read backup record failed, err:%s", err.Error()))
+			return xerr.NewCliErr(fmt.Sprintf("read backup record failed. err: %s", err))
 		}
 		if bak == nil {
-			fmt.Println("Didn't find backup record by csn: ", CSN)
+			fmt.Printf("Didn't find backup record by csn: %s\n", CSN)
 			return nil
 		}
 
@@ -76,10 +77,10 @@ func show() error {
 	if RecordID != "" {
 		bak, err := ls.ReadByID(RecordID)
 		if err != nil {
-			return xerr.NewCliErr(fmt.Sprintf("read backup record failed, err:%s", err.Error()))
+			return xerr.NewCliErr(fmt.Sprintf("read backup record failed. err: %s", err))
 		}
 		if bak == nil {
-			fmt.Println("Didn't find backup record by record id: ", RecordID)
+			fmt.Printf("Didn't find backup record by record id: %s\n", RecordID)
 			return nil
 		}
 
@@ -92,11 +93,11 @@ func show() error {
 	// show all backup record
 	backupList, err := ls.ReadAll()
 	if err != nil {
-		return xerr.NewCliErr(fmt.Sprintf("read backup record failed, err:%s", err.Error()))
+		return xerr.NewCliErr(fmt.Sprintf("read backup record failed. err: %s", err))
 	}
 
 	if len(backupList) == 0 {
-		fmt.Println("Didn't find any backup record.")
+		fmt.Printf("Didn't find any backup record.\n")
 		return nil
 	}
 
diff --git a/pitr/cli/internal/pkg/agent-server_test.go b/pitr/cli/internal/pkg/agent-server_test.go
index a14d43b..baa9e89 100644
--- a/pitr/cli/internal/pkg/agent-server_test.go
+++ b/pitr/cli/internal/pkg/agent-server_test.go
@@ -23,9 +23,10 @@ import (
 	"fmt"
 	"testing"
 
-	"bou.ke/monkey"
 	"github.com/apache/shardingsphere-on-cloud/pitr/cli/internal/pkg/model"
 	"github.com/apache/shardingsphere-on-cloud/pitr/cli/pkg/httputils"
+
+	"bou.ke/monkey"
 	mock_httputils "github.com/apache/shardingsphere-on-cloud/pitr/cli/pkg/httputils/mocks"
 	"github.com/golang/mock/gomock"
 	. "github.com/onsi/ginkgo/v2"
diff --git a/pitr/cli/internal/pkg/local-storage.go b/pitr/cli/internal/pkg/local-storage.go
index 2bc8227..ca00480 100644
--- a/pitr/cli/internal/pkg/local-storage.go
+++ b/pitr/cli/internal/pkg/local-storage.go
@@ -76,14 +76,14 @@ func (ls *localStorage) init() error {
 	if err != nil {
 		if os.IsNotExist(err) {
 			if err := os.Mkdir(ls.rootDir, 0777); err != nil {
-				return fmt.Errorf("create root dir failure,dir=%s,err=%s", ls.rootDir, err)
+				return fmt.Errorf("create root dir failure. dir: %s, err: %s", ls.rootDir, err)
 			}
 		} else if os.IsExist(err) {
 			if !fi.IsDir() {
-				return fmt.Errorf("file has already exist,name=%s", ls.rootDir)
+				return fmt.Errorf("file has already exist. name: %s", ls.rootDir)
 			}
 		} else {
-			return fmt.Errorf("failed to get file info,root dir=%s,err=%s", ls.rootDir, err)
+			return fmt.Errorf("failed to get file info. root dir: %s, err: %s", ls.rootDir, err)
 		}
 	}
 
@@ -92,14 +92,14 @@ func (ls *localStorage) init() error {
 	if err != nil {
 		if os.IsNotExist(err) {
 			if err := os.Mkdir(ls.backupDir, 0777); err != nil {
-				return fmt.Errorf("create backup dir failure,dir=%s,err=%s", ls.backupDir, err)
+				return fmt.Errorf("create backup dir failure. dir: %s, err: %s", ls.backupDir, err)
 			}
 		} else if os.IsExist(err) {
 			if !fi.IsDir() {
-				return fmt.Errorf("backup:file has already exist,name=%s", ls.backupDir)
+				return fmt.Errorf("backup: file has already exist. name: %s", ls.backupDir)
 			}
 		} else {
-			return fmt.Errorf("failed to get file info,backup dir=%s,err=%s", ls.backupDir, err)
+			return fmt.Errorf("failed to get file info. backup dir: %s, err: %s", ls.backupDir, err)
 		}
 	}
 
@@ -108,7 +108,7 @@ func (ls *localStorage) init() error {
 
 func (ls *localStorage) WriteByJSON(name string, contents *model.LsBackup) error {
 	if !strings.HasSuffix(name, ".json") {
-		return fmt.Errorf("wrong file extension,file name is %s", name)
+		return fmt.Errorf("wrong file extension. file name: %s", name)
 	}
 
 	data, err := json.MarshalIndent(contents, "", "  ")
@@ -119,12 +119,12 @@ func (ls *localStorage) WriteByJSON(name string, contents *model.LsBackup) error
 	path := fmt.Sprintf("%s/%s", ls.backupDir, name)
 	fi, err := os.Create(path)
 	if err != nil {
-		return fmt.Errorf("create file failure,file path is %s", path)
+		return fmt.Errorf("create file failure. file path: %s", path)
 	}
 
 	_, err = fi.Write(data)
 	if err != nil {
-		return fmt.Errorf("write to file failure,err=%s,data is %s", err, data)
+		return fmt.Errorf("write to file failure. err: %s, data: %s", err, data)
 	}
 
 	return nil
@@ -133,7 +133,7 @@ func (ls *localStorage) WriteByJSON(name string, contents *model.LsBackup) error
 func (ls *localStorage) ReadAll() ([]*model.LsBackup, error) {
 	entries, err := os.ReadDir(ls.backupDir)
 	if err != nil {
-		return nil, xerr.NewCliErr(fmt.Sprintf("read the dir[path:%s] failed,err=%s", ls.backupDir, err))
+		return nil, xerr.NewCliErr(fmt.Sprintf("read the dir[path:%s] failed. err: %s", ls.backupDir, err))
 	}
 
 	backups := make([]*model.LsBackup, 0, len(entries))
@@ -147,7 +147,7 @@ func (ls *localStorage) ReadAll() ([]*model.LsBackup, error) {
 		if errors.Is(err, os.ErrNotExist) {
 			return nil, xerr.NewCliErr("The file does not exist or has changed")
 		} else if err != nil {
-			return nil, xerr.NewCliErr(fmt.Sprintf("Unknown err:get entry info failed,err=%s", err))
+			return nil, xerr.NewCliErr(fmt.Sprintf("Unknown err: get entry info failed. err: %s", err))
 		}
 
 		if !strings.HasSuffix(info.Name(), ".json") {
@@ -157,12 +157,12 @@ func (ls *localStorage) ReadAll() ([]*model.LsBackup, error) {
 		path := fmt.Sprintf("%s/%s", ls.backupDir, info.Name())
 		file, err := os.ReadFile(path)
 		if err != nil {
-			return nil, xerr.NewCliErr(fmt.Sprintf("read file failed,err=%s", err))
+			return nil, xerr.NewCliErr(fmt.Sprintf("read file failed. err: %s", err))
 		}
 
 		b := &model.LsBackup{}
 		if err := json.Unmarshal(file, b); err != nil {
-			return nil, xerr.NewCliErr(fmt.Sprintf("invalid contents[filePath=%s],err=%s", path, err))
+			return nil, xerr.NewCliErr(fmt.Sprintf("invalid contents[filePath=%s]. err: %s", path, err))
 		}
 
 		backups = append(backups, b)
@@ -217,7 +217,7 @@ func (ls *localStorage) GenFilename(extn Extension) string {
 func (ls *localStorage) DeleteByName(name string) error {
 	path := fmt.Sprintf("%s/%s", ls.backupDir, name)
 	if err := os.Remove(path); err != nil {
-		return xerr.NewCliErr(fmt.Sprintf("delete file failed,err=%s", err))
+		return xerr.NewCliErr(fmt.Sprintf("delete file failed. err: %s", err))
 	}
 	return nil
 }
diff --git a/pitr/cli/internal/pkg/local-storage_test.go b/pitr/cli/internal/pkg/local-storage_test.go
index 87e03bb..ae9e4ec 100644
--- a/pitr/cli/internal/pkg/local-storage_test.go
+++ b/pitr/cli/internal/pkg/local-storage_test.go
@@ -22,10 +22,9 @@ import (
 	"os"
 	"time"
 
-	"github.com/google/uuid"
-
 	"github.com/apache/shardingsphere-on-cloud/pitr/cli/internal/pkg/model"
 
+	"github.com/google/uuid"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
diff --git a/pitr/cli/internal/pkg/shardingsphere-proxy.go b/pitr/cli/internal/pkg/shardingsphere-proxy.go
index 275ed9a..7e487aa 100644
--- a/pitr/cli/internal/pkg/shardingsphere-proxy.go
+++ b/pitr/cli/internal/pkg/shardingsphere-proxy.go
@@ -66,7 +66,7 @@ LockForBackup 停写,同时锁 CSN,备份场景使用
 func (ss *shardingSphereProxy) LockForBackup() error {
 	_, err := ss.db.Exec(`LOCK CLUSTER WITH LOCK_STRATEGY(TYPE(NAME="WRITE", PROPERTIES("lock_csn"=true)));`)
 	if err != nil {
-		return xerr.NewCliErr("ss lock for backup failure")
+		return xerr.NewCliErr(fmt.Sprintf("shardingsphere lock for backup failure. err: %s", err))
 	}
 	return nil
 }
@@ -77,7 +77,7 @@ LockForRestore 停读写,不需要锁 CSN,恢复场景使用
 func (ss *shardingSphereProxy) LockForRestore() error {
 	_, err := ss.db.Exec(`LOCK CLUSTER WITH LOCK_STRATEGY(TYPE(NAME="READ_WRITE"))`)
 	if err != nil {
-		return xerr.NewCliErr("ss lock for restore failure")
+		return xerr.NewCliErr(fmt.Sprintf("shardingsphere lock for restore failure. err: %s", err))
 	}
 	return nil
 }
@@ -85,7 +85,7 @@ func (ss *shardingSphereProxy) LockForRestore() error {
 func (ss *shardingSphereProxy) Unlock() error {
 	_, err := ss.db.Exec("UNLOCK CLUSTER;")
 	if err != nil {
-		return xerr.NewCliErr("ss unlock failure")
+		return xerr.NewCliErr(fmt.Sprintf("shardingsphere unlock failure. err: %s", err))
 	}
 	return nil
 }
@@ -102,7 +102,7 @@ ExportMetaData 导出 SS 元数据
 func (ss *shardingSphereProxy) ExportMetaData() (*model.ClusterInfo, error) {
 	query, err := ss.db.Query(`EXPORT METADATA;`)
 	if err != nil {
-		return nil, xerr.NewCliErr(fmt.Sprintf("export meta data failure,err=%s", err))
+		return nil, xerr.NewCliErr(fmt.Sprintf("export meta data failure. err: %s", err))
 	}
 
 	var (
@@ -112,23 +112,23 @@ func (ss *shardingSphereProxy) ExportMetaData() (*model.ClusterInfo, error) {
 	)
 	if query.Next() {
 		if err = query.Scan(&id, &createTime, &data); err != nil {
-			return nil, xerr.NewCliErr(fmt.Sprintf("query scan failure,err=%s", err))
+			return nil, xerr.NewCliErr(fmt.Sprintf("query scan failure. err: %s", err))
 		}
 		if err = query.Close(); err != nil {
-			return nil, xerr.NewCliErr(fmt.Sprintf("query close failure,err=%s", err))
+			return nil, xerr.NewCliErr(fmt.Sprintf("query close failure. err: %s", err))
 		}
 	}
 	if query.Err() != nil {
-		return nil, xerr.NewCliErr(fmt.Sprintf("query err=%s", query.Err()))
+		return nil, xerr.NewCliErr(fmt.Sprintf("query err: %s", query.Err()))
 	}
 
 	var out model.ClusterInfo
 	rawDecodedText, err := base64.StdEncoding.DecodeString(data)
 	if err != nil {
-		return nil, fmt.Errorf("base64 decode return err=%s", err)
+		return nil, fmt.Errorf("base64 decode return err: %s", err)
 	}
 	if err = json.Unmarshal(rawDecodedText, &out); err != nil {
-		return nil, fmt.Errorf("json unmarshal return err=%s", err)
+		return nil, fmt.Errorf("json unmarshal return err: %s", err)
 	}
 
 	if out.SnapshotInfo != nil && out.SnapshotInfo.Csn == "" {
@@ -150,7 +150,7 @@ ExportStorageNodes 导出存储节点数据
 func (ss *shardingSphereProxy) ExportStorageNodes() ([]*model.StorageNode, error) {
 	query, err := ss.db.Query(`EXPORT STORAGE NODES;`)
 	if err != nil {
-		return nil, xerr.NewCliErr(fmt.Sprintf("export storage nodes failure,err=%s", err))
+		return nil, xerr.NewCliErr(fmt.Sprintf("export storage nodes failure. err: %s", err))
 	}
 
 	var (
@@ -160,20 +160,20 @@ func (ss *shardingSphereProxy) ExportStorageNodes() ([]*model.StorageNode, error
 	)
 	if query.Next() {
 		if err = query.Scan(&id, &createTime, &data); err != nil {
-			return nil, xerr.NewCliErr(fmt.Sprintf("query scan failure,err=%s", err))
+			return nil, xerr.NewCliErr(fmt.Sprintf("query scan failure. err: %s", err))
 		}
 
 		if err = query.Close(); err != nil {
-			return nil, xerr.NewCliErr(fmt.Sprintf("query close failure,err=%s", err))
+			return nil, xerr.NewCliErr(fmt.Sprintf("query close failure. err: %s", err))
 		}
 	}
 	if query.Err() != nil {
-		return nil, xerr.NewCliErr(fmt.Sprintf("query err failure,err=%s", err))
+		return nil, xerr.NewCliErr(fmt.Sprintf("query err failure. err: %s", err))
 	}
 
 	out := &model.StorageNodesInfo{}
 	if err = json.Unmarshal([]byte(data), &out); err != nil {
-		return nil, fmt.Errorf("json unmarshal return err=%s", err)
+		return nil, fmt.Errorf("json unmarshal return err: %s", err)
 	}
 
 	// get all storage nodes and filter duplicate nodes
@@ -210,7 +210,7 @@ func (ss *shardingSphereProxy) ImportMetaData(in *model.ClusterInfo) error {
 
 	_, err = ss.db.Exec(fmt.Sprintf(`IMPORT METADATA '%s';`, base64.StdEncoding.EncodeToString(marshal)))
 	if err != nil {
-		return xerr.NewCliErr(fmt.Sprintf("import metadata failure,err=%s", err))
+		return xerr.NewCliErr(fmt.Sprintf("import metadata failure. err: %s", err))
 	}
 
 	return nil
@@ -220,7 +220,7 @@ func (ss *shardingSphereProxy) ImportMetaData(in *model.ClusterInfo) error {
 func (ss *shardingSphereProxy) DropDatabase(databaseName string) error {
 	_, err := ss.db.Exec(fmt.Sprintf(`DROP DATABASE %s;`, databaseName))
 	if err != nil {
-		return xerr.NewCliErr(fmt.Sprintf("drop database failure, err:%s", err.Error()))
+		return xerr.NewCliErr(fmt.Sprintf("drop database failure. err: %s", err))
 	}
 	return nil
 }
diff --git a/pitr/cli/internal/pkg/shardingsphere-proxy_test.go b/pitr/cli/internal/pkg/shardingsphere-proxy_test.go
index 527f1de..0d904cf 100644
--- a/pitr/cli/internal/pkg/shardingsphere-proxy_test.go
+++ b/pitr/cli/internal/pkg/shardingsphere-proxy_test.go
@@ -18,16 +18,17 @@
 package pkg
 
 import (
-	"bou.ke/monkey"
 	"database/sql"
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"github.com/apache/shardingsphere-on-cloud/pitr/cli/internal/pkg/model"
-	"github.com/apache/shardingsphere-on-cloud/pitr/cli/pkg/gsutil"
 	"regexp"
 	"time"
 
+	"github.com/apache/shardingsphere-on-cloud/pitr/cli/internal/pkg/model"
+	"github.com/apache/shardingsphere-on-cloud/pitr/cli/pkg/gsutil"
+
+	"bou.ke/monkey"
 	"github.com/DATA-DOG/go-sqlmock"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"