fix: config import bug (arana-db#475)

jyz0309 · Oct 28, 2022 · df8d11c · df8d11c
1 parent dacf1a2
commit df8d11c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 26 deletions.
diff --git a/cmd/start/start.go b/cmd/start/start.go
@@ -51,10 +51,7 @@ _____________________________________________
 
 `
 
-const (
-	_keyBootstrap = "config"
-	_keyImport    = "import"
-)
+const _keyBootstrap = "config"
 
 func init() {
 	cmd := &cobra.Command{
@@ -65,29 +62,17 @@ func init() {
 	}
 	cmd.PersistentFlags().
 		StringP(_keyBootstrap, "c", os.Getenv(constants.EnvBootstrapPath), "bootstrap configuration file path")
-	cmd.PersistentFlags().
-		String(_keyImport, "", "import configuration yaml file path")
 
 	cmds.Handle(func(root *cobra.Command) {
 		root.AddCommand(cmd)
 	})
 }
 
-func Run(bootstrapConfigPath string, importPath string) {
+func Run(bootstrapConfigPath string) {
 	// print slogan
 	fmt.Printf("\033[92m%s\033[0m\n", slogan) // 92m: light green
 
 	discovery := boot.NewDiscovery(bootstrapConfigPath)
-	if err := discovery.Init(context.Background()); err != nil {
-		log.Fatal("start failed: %v", err)
-		return
-	}
-
-	if len(importPath) > 0 {
-		if !boot.RunImport(bootstrapConfigPath, importPath) {
-			return
-		}
-	}
 
 	if err := boot.Boot(context.Background(), discovery); err != nil {
 		log.Fatal("start failed: %v", err)
@@ -129,10 +114,7 @@ func Run(bootstrapConfigPath string, importPath string) {
 func run(cmd *cobra.Command, args []string) {
 	_ = args
 
-	var (
-		bootstrapConfigPath, _ = cmd.PersistentFlags().GetString(_keyBootstrap)
-		importPath, _          = cmd.PersistentFlags().GetString(_keyImport)
-	)
+	bootstrapConfigPath, _ := cmd.PersistentFlags().GetString(_keyBootstrap)
 
 	if len(bootstrapConfigPath) < 1 {
 		// search bootstrap yaml
@@ -148,5 +130,5 @@ func run(cmd *cobra.Command, args []string) {
 		}
 	}
 
-	Run(bootstrapConfigPath, importPath)
+	Run(bootstrapConfigPath)
 }
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -65,7 +65,7 @@ services:
   arana:
     container_name: arana
     image: aranadb/arana:master
-    entrypoint: [ "arana", "start", "-c", "/etc/arana/bootstrap.yaml", "--import", "/etc/arana/config.yaml" ]
+    entrypoint: [ "sh", "-c", "arana import -c /etc/arana/bootstrap.yaml -s /etc/arana/config.yaml; arana start -c /etc/arana/bootstrap.yaml" ]
     networks:
       - local
     ports:

diff --git a/example/local_server/main.go b/example/local_server/main.go
@@ -24,5 +24,5 @@ import (
 
 func main() {
 	bootstrap := testdata.Path("../conf/bootstrap.local-etcd.yaml")
-	start.Run(bootstrap, "")
+	start.Run(bootstrap)
 }
diff --git a/pkg/boot/discovery_import.go b/pkg/boot/discovery_import.go
@@ -66,7 +66,7 @@ func RunImport(importConfPath, configPath string) bool {
 		tenant.Metadata = cfg.Metadata
 
 		ok := func() bool {
-			op, err := config.NewCenter(tenant.Name, config.GetStoreOperate())
+			op, err := config.NewCenter(tenant.Name, config.GetStoreOperate(), config.WithWriter(true))
 			if err != nil {
 				log.Errorf("create config_center tenant=%s failed: %+v", tenant.Name, err)
 				return false

diff --git a/test/suite.go b/test/suite.go
@@ -233,7 +233,7 @@ func (ms *MySuite) SetupSuite() {
 	}
 	go func() {
 		_ = os.Setenv(constants.EnvConfigPath, ms.tmpFile)
-		start.Run(ms.tmpBootFile, "")
+		start.Run(ms.tmpBootFile)
 	}()
 
 	// waiting for arana server started