*: refline logs

cmd/cmd.go

@@ -49,8 +49,8 @@ func AddFlags(cmd *cobra.Command) {
 
 	cmd.PersistentFlags().StringP(FlagLogLevel, "L", "info",
 		"Set the log level")
-	cmd.PersistentFlags().String(FlagLogFile, "",
-		"Set the log file path. If not set, logs will output to stdout")
+	cmd.PersistentFlags().String(FlagLogFile, "/tmp/br.log",
+		"Set the log file path. If not set, logs will output to /tmp/br.log")
 	cmd.PersistentFlags().String(FlagStatusAddr, "",
 		"Set the HTTP listening address for the status report service. Set to empty string to disable")
 	task.DefineCommonFlags(cmd.PersistentFlags())

pkg/summary/collector.go

@@ -40,7 +40,15 @@ type LogCollector interface {
 
 type logFunc func(msg string, fields ...zap.Field)
 
-var collector = newLogCollector(log.Info)
+var collector = func() LogCollector {
+	conf := new(log.Config)
+	// Always output summary to stdout.
+	logger, _, err := log.InitLogger(conf)
+	if err != nil {
+		logger = log.L()
+	}
+	return newLogCollector(logger.Info)
+}()
 
 type logCollector struct {
 	mu             sync.Mutex

pkg/task/backup.go

@@ -213,6 +213,7 @@ func RunBackup(c context.Context, g glue.Glue, cmdName string, cfg *BackupConfig
 
 	err = client.SaveBackupMeta(ctx, ddlJobs)
 	if err != nil {
+		log.Error("save backup meta failed", zap.Reflect("meta", ddlJobs))
 		return err
 	}
 	return nil

pkg/task/common.go

@@ -12,12 +12,14 @@ import (
 	"github.com/gogo/protobuf/proto"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/backup"
+	"github.com/pingcap/log"
 	pd "github.com/pingcap/pd/v4/client"
 	"github.com/pingcap/tidb-tools/pkg/filter"
 	"github.com/pingcap/tidb/store/tikv"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"go.etcd.io/etcd/pkg/transport"
+	"go.uber.org/zap"
 
 	"github.com/pingcap/br/pkg/conn"
 	"github.com/pingcap/br/pkg/glue"
@@ -268,6 +270,7 @@ func ReadBackupMeta(
 	}
 	backupMeta := &backup.BackupMeta{}
 	if err = proto.Unmarshal(metaData, backupMeta); err != nil {
+		log.Error("parse backupmeta failed", zap.Error(err), zap.Binary("meta", metaData))
 		return nil, nil, nil, errors.Annotate(err, "parse backupmeta failed")
 	}
 	return u, s, backupMeta, nil

pkg/task/restore.go

@@ -71,7 +71,7 @@ func (cfg *RestoreConfig) ParseFromFlags(flags *pflag.FlagSet) error {
 }
 
 // RunRestore starts a restore task inside the current goroutine.
-func RunRestore(c context.Context, g glue.Glue, cmdName string, cfg *RestoreConfig) error {
+func RunRestore(c context.Context, g glue.Glue, cmdName string, cfg *RestoreConfig) (err error) {
 	ctx, cancel := context.WithCancel(c)
 	defer cancel()
 
@@ -103,6 +103,13 @@ func RunRestore(c context.Context, g glue.Glue, cmdName string, cfg *RestoreConf
 	if err != nil {
 		return err
 	}
+
+	defer func() {
+		if err != nil {
+			log.Error("restore failed", zap.Error(err), zap.Reflect("meta", backupMeta))
+		}
+	}()
+
 	if err = client.InitBackupMeta(backupMeta, u); err != nil {
 		return err
 	}