Merge branch 'release-5.0' into release-5.0-9097e68c4db5

lhy1024 · web-flow · commit afd34de69857 · 2021-04-16T16:23:16.000+08:00
diff --git a/server/join/join.go b/server/join/join.go
@@ -214,7 +214,7 @@ func PrepareJoinCluster(cfg *config.Config) error {
 func isDataExist(d string) bool {
 	dir, err := os.Open(d)
 	if err != nil {
-		log.Error("failed to open directory", errs.ZapError(errs.ErrOSOpen, err))
+		log.Info("failed to open directory, maybe start for the first time", zap.Error(err))
 		return false
 	}
 	defer dir.Close()

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ func PrepareJoinCluster(cfg *config.Config) error {`
`214`	`214`	`func isDataExist(d string) bool {`
`215`	`215`	`dir, err := os.Open(d)`
`216`	`216`	`if err != nil {`
`217`		`- log.Error("failed to open directory", errs.ZapError(errs.ErrOSOpen, err))`
	`217`	`+ log.Info("failed to open directory, maybe start for the first time", zap.Error(err))`
`218`	`218`	`return false`
`219`	`219`	`}`
`220`	`220`	`defer dir.Close()`