rewrite using two boolean variable to divide

cluster config and instance script loading fix
tarantool · Jan 14, 2025 · cafd354 · cafd354
1 parent 45bf3b8
commit cafd354
Show file tree

Hide file tree

Showing 19 changed files with 66 additions and 84 deletions.
diff --git a/cli/cmd/build.go b/cli/cmd/build.go
@@ -30,8 +30,7 @@ func NewBuildCmd() *cobra.Command {
 			args []string,
 			toComplete string) ([]string, cobra.ShellCompDirective) {
 			var runningCtx running.RunningCtx
-			err := running.FillCtx(
-				cliOpts, &cmdCtx, &runningCtx, nil, running.ConfigLoadSkip)
+			err := running.FillCtx(cliOpts, &cmdCtx, &runningCtx, nil, false, false)
 			if err != nil {
 				return nil, cobra.ShellCompDirectiveNoFileComp
 			}

diff --git a/cli/cmd/check.go b/cli/cmd/check.go
@@ -32,7 +32,7 @@ func internalCheckModule(cmdCtx *cmdcontext.CmdCtx, args []string) error {
 	}
 
 	var runningCtx running.RunningCtx
-	err := running.FillCtx(cliOpts, cmdCtx, &runningCtx, args, running.ConfigLoadAll)
+	err := running.FillCtx(cliOpts, cmdCtx, &runningCtx, args, true, true)
 	if err != nil {
 		return err
 	}

diff --git a/cli/cmd/clean.go b/cli/cmd/clean.go
@@ -104,7 +104,7 @@ func internalCleanModule(cmdCtx *cmdcontext.CmdCtx, args []string) error {
 	}
 
 	var runningCtx running.RunningCtx
-	err := running.FillCtx(cliOpts, cmdCtx, &runningCtx, args, running.ConfigLoadIgnoreErrors)
+	err := running.FillCtx(cliOpts, cmdCtx, &runningCtx, args, false, false)
 	if err != nil {
 		return err
 	}

diff --git a/cli/cmd/cluster.go b/cli/cmd/cluster.go
@@ -673,8 +673,7 @@ func parseAppStr(cmdCtx *cmdcontext.CmdCtx, appStr string) (string, string, stri
 	// Fill context for the entire application.
 	// publish app:inst can work even if the `inst` instance doesn't exist right now.
 	var runningCtx running.RunningCtx
-	err := running.FillCtx(
-		cliOpts, cmdCtx, &runningCtx, []string{appName}, running.ConfigLoadSkip)
+	err := running.FillCtx(cliOpts, cmdCtx, &runningCtx, []string{appName}, false, false)
 	if err != nil {
 		return "", "", "", err
 	}

diff --git a/cli/cmd/connect.go b/cli/cmd/connect.go
@@ -138,8 +138,8 @@ func resolveConnectOpts(cmdCtx *cmdcontext.CmdCtx, cliOpts *config.CliOpts,
 
 	// FillCtx returns error if no instances found.
 	var runningCtx running.RunningCtx
-	if fillErr := running.FillCtx(
-		cliOpts, cmdCtx, &runningCtx, []string{target}, running.ConfigLoadAll); fillErr == nil {
+	fillErr := running.FillCtx(cliOpts, cmdCtx, &runningCtx, []string{target}, true, false)
+	if fillErr == nil {
 		if len(runningCtx.Instances) > 1 {
 			err = fmt.Errorf("specify instance name")
 			return

diff --git a/cli/cmd/internal/completion.go b/cli/cmd/internal/completion.go
@@ -26,8 +26,7 @@ func ValidArgsFunction(
 	directive = cobra.ShellCompDirectiveNoFileComp
 
 	var runningCtx running.RunningCtx
-	if err := running.FillCtx(
-		cliOpts, cmdCtx, &runningCtx, nil, running.ConfigLoadSkip); err != nil {
+	if err := running.FillCtx(cliOpts, cmdCtx, &runningCtx, nil, false, false); err != nil {
 		return
 	}
 

diff --git a/cli/cmd/kill.go b/cli/cmd/kill.go
@@ -79,7 +79,7 @@ func internalKillModule(cmdCtx *cmdcontext.CmdCtx, args []string) error {
 	if confirm {
 		var runningCtx running.RunningCtx
 		if err = running.FillCtx(
-			cliOpts, cmdCtx, &runningCtx, args, running.ConfigLoadSkip); err != nil {
+			cliOpts, cmdCtx, &runningCtx, args, false, false); err != nil {
 			return err
 		}
 

diff --git a/cli/cmd/log.go b/cli/cmd/log.go
@@ -133,7 +133,7 @@ func internalLogModule(cmdCtx *cmdcontext.CmdCtx, args []string) error {
 
 	var err error
 	var runningCtx running.RunningCtx
-	err = running.FillCtx(cliOpts, cmdCtx, &runningCtx, args, running.ConfigLoadAll)
+	err = running.FillCtx(cliOpts, cmdCtx, &runningCtx, args, true, false)
 	if err != nil {
 		return err
 	}

diff --git a/cli/cmd/logrotate.go b/cli/cmd/logrotate.go
@@ -42,7 +42,7 @@ func internalLogrotateModule(cmdCtx *cmdcontext.CmdCtx, args []string) error {
 	}
 
 	var runningCtx running.RunningCtx
-	err := running.FillCtx(cliOpts, cmdCtx, &runningCtx, args, running.ConfigLoadIgnoreErrors)
+	err := running.FillCtx(cliOpts, cmdCtx, &runningCtx, args, false, false)
 	if err != nil {
 		return err
 	}

diff --git a/cli/cmd/play.go b/cli/cmd/play.go
@@ -99,7 +99,7 @@ func internalPlayModule(cmdCtx *cmdcontext.CmdCtx, args []string) error {
 	// FillCtx returns error if no instances found.
 	var runningCtx running.RunningCtx
 	err := running.FillCtx(
-		cliOpts, cmdCtx, &runningCtx, []string{args[0]}, running.ConfigLoadAll)
+		cliOpts, cmdCtx, &runningCtx, []string{args[0]}, true, true)
 	if err == nil {
 		if len(runningCtx.Instances) > 1 {
 			return util.InternalError(

diff --git a/cli/cmd/replicaset.go b/cli/cmd/replicaset.go
@@ -475,7 +475,7 @@ type replicasetCtx struct {
 
 // replicasetFillCtx fills the replicaset command context.
 func replicasetFillCtx(cmdCtx *cmdcontext.CmdCtx, ctx *replicasetCtx, target string,
-	isRunningCtxRequired bool, loadConfig running.ConfigLoad) error {
+	isRunningCtxRequired bool, configRequired bool, scriptRequired bool) error {
 	var err error
 	ctx.Orchestrator, err = getOrchestrator()
 	if err != nil {
@@ -491,9 +491,9 @@ func replicasetFillCtx(cmdCtx *cmdcontext.CmdCtx, ctx *replicasetCtx, target str
 		SslCiphers:  replicasetSslCiphers,
 	}
 	var connOpts connector.ConnectOpts
-
-	if err := running.FillCtx(
-		cliOpts, cmdCtx, &ctx.RunningCtx, []string{target}, loadConfig); err == nil {
+	err = running.FillCtx(cliOpts, cmdCtx, &ctx.RunningCtx, []string{target},
+		configRequired, scriptRequired)
+	if err == nil {
 		ctx.IsApplication = true
 		if len(ctx.RunningCtx.Instances) == 1 {
 			if connectCtx.Username != "" || connectCtx.Password != "" {
@@ -515,7 +515,7 @@ func replicasetFillCtx(cmdCtx *cmdcontext.CmdCtx, ctx *replicasetCtx, target str
 				// Re-fill context for an application.
 				ctx.InstName = instName
 				err := running.FillCtx(
-					cliOpts, cmdCtx, &ctx.RunningCtx, []string{appName}, loadConfig)
+					cliOpts, cmdCtx, &ctx.RunningCtx, []string{appName}, true, true)
 				if err != nil {
 					// Should not happen.
 					return err
@@ -573,7 +573,7 @@ func replicasetFillCtx(cmdCtx *cmdcontext.CmdCtx, ctx *replicasetCtx, target str
 // internalReplicasetUpgradeModule is a "upgrade" command for the replicaset module.
 func internalReplicasetUpgradeModule(cmdCtx *cmdcontext.CmdCtx, args []string) error {
 	var ctx replicasetCtx
-	if err := replicasetFillCtx(cmdCtx, &ctx, args[0], false, running.ConfigLoadAll); err != nil {
+	if err := replicasetFillCtx(cmdCtx, &ctx, args[0], false, true, true); err != nil {
 		return err
 	}
 	if ctx.IsInstanceConnect {
@@ -608,7 +608,7 @@ func internalReplicasetDowngradeModule(cmdCtx *cmdcontext.CmdCtx, args []string)
 	downgradeVersion := args[1]
 
 	var ctx replicasetCtx
-	if err := replicasetFillCtx(cmdCtx, &ctx, args[0], false, running.ConfigLoadAll); err != nil {
+	if err := replicasetFillCtx(cmdCtx, &ctx, args[0], false, true, true); err != nil {
 		return err
 	}
 	if ctx.IsInstanceConnect {
@@ -641,7 +641,7 @@ func internalReplicasetDowngradeModule(cmdCtx *cmdcontext.CmdCtx, args []string)
 // internalReplicasetPromoteModule is a "promote" command for the replicaset module.
 func internalReplicasetPromoteModule(cmdCtx *cmdcontext.CmdCtx, args []string) error {
 	var ctx replicasetCtx
-	if err := replicasetFillCtx(cmdCtx, &ctx, args[0], false, running.ConfigLoadAll); err != nil {
+	if err := replicasetFillCtx(cmdCtx, &ctx, args[0], false, true, true); err != nil {
 		return err
 	}
 	if !ctx.IsInstanceConnect {
@@ -671,7 +671,7 @@ func internalReplicasetPromoteModule(cmdCtx *cmdcontext.CmdCtx, args []string) e
 // internalReplicasetDemoteModule is a "demote" command for the replicaset module.
 func internalReplicasetDemoteModule(cmdCtx *cmdcontext.CmdCtx, args []string) error {
 	var ctx replicasetCtx
-	if err := replicasetFillCtx(cmdCtx, &ctx, args[0], true, running.ConfigLoadAll); err != nil {
+	if err := replicasetFillCtx(cmdCtx, &ctx, args[0], true, true, true); err != nil {
 		return err
 	}
 	if !ctx.IsApplication {
@@ -703,8 +703,7 @@ func internalReplicasetDemoteModule(cmdCtx *cmdcontext.CmdCtx, args []string) er
 // internalReplicasetStatusModule is a "status" command for the replicaset module.
 func internalReplicasetStatusModule(cmdCtx *cmdcontext.CmdCtx, args []string) error {
 	var ctx replicasetCtx
-	if err := replicasetFillCtx(
-		cmdCtx, &ctx, args[0], false, running.ConfigLoadIgnoreErrors); err != nil {
+	if err := replicasetFillCtx(cmdCtx, &ctx, args[0], false, false, false); err != nil {
 		return err
 	}
 	if ctx.IsInstanceConnect {
@@ -724,7 +723,7 @@ func internalReplicasetExpelModule(cmdCtx *cmdcontext.CmdCtx, args []string) err
 		return fmt.Errorf("the command expects argument application_name:instance_name")
 	}
 	var ctx replicasetCtx
-	if err := replicasetFillCtx(cmdCtx, &ctx, args[0], true, running.ConfigLoadAll); err != nil {
+	if err := replicasetFillCtx(cmdCtx, &ctx, args[0], true, true, true); err != nil {
 		return err
 	}
 	if ctx.IsInstanceConnect {
@@ -751,7 +750,7 @@ func internalReplicasetExpelModule(cmdCtx *cmdcontext.CmdCtx, args []string) err
 // the "replicaset vshard" module.
 func internalReplicasetBootstrapVShardModule(cmdCtx *cmdcontext.CmdCtx, args []string) error {
 	var ctx replicasetCtx
-	if err := replicasetFillCtx(cmdCtx, &ctx, args[0], false, running.ConfigLoadAll); err != nil {
+	if err := replicasetFillCtx(cmdCtx, &ctx, args[0], false, true, true); err != nil {
 		return err
 	}
 	if ctx.IsInstanceConnect {
@@ -778,7 +777,7 @@ func internalReplicasetBootstrapModule(cmdCtx *cmdcontext.CmdCtx, args []string)
 	_, instName, found := strings.Cut(args[0], string(running.InstanceDelimiter))
 
 	var ctx replicasetCtx
-	if err := replicasetFillCtx(cmdCtx, &ctx, args[0], true, running.ConfigLoadAll); err != nil {
+	if err := replicasetFillCtx(cmdCtx, &ctx, args[0], true, true, true); err != nil {
 		return err
 	}
 	if ctx.IsInstanceConnect {
@@ -840,7 +839,7 @@ func internalReplicasetRebootstrapModule(cmdCtx *cmdcontext.CmdCtx, args []strin
 // internalReplicasetRolesAddModule is a "roles add" command for the replicaset module.
 func internalReplicasetRolesAddModule(cmdCtx *cmdcontext.CmdCtx, args []string) error {
 	var ctx replicasetCtx
-	if err := replicasetFillCtx(cmdCtx, &ctx, args[0], false, running.ConfigLoadAll); err != nil {
+	if err := replicasetFillCtx(cmdCtx, &ctx, args[0], false, true, true); err != nil {
 		return err
 	}
 	defer ctx.Conn.Close()
@@ -883,7 +882,7 @@ func internalReplicasetRolesAddModule(cmdCtx *cmdcontext.CmdCtx, args []string)
 // internalReplicasetRolesRemoveModule is a "roles remove" command for the replicaset module.
 func internalReplicasetRolesRemoveModule(cmdCtx *cmdcontext.CmdCtx, args []string) error {
 	var ctx replicasetCtx
-	if err := replicasetFillCtx(cmdCtx, &ctx, args[0], false, running.ConfigLoadAll); err != nil {
+	if err := replicasetFillCtx(cmdCtx, &ctx, args[0], false, true, true); err != nil {
 		return err
 	}
 	defer ctx.Conn.Close()

diff --git a/cli/cmd/start.go b/cli/cmd/start.go
@@ -127,7 +127,7 @@ func internalStartModule(cmdCtx *cmdcontext.CmdCtx, args []string) error {
 	}
 
 	var runningCtx running.RunningCtx
-	err := running.FillCtx(cliOpts, cmdCtx, &runningCtx, args, running.ConfigLoadAll)
+	err := running.FillCtx(cliOpts, cmdCtx, &runningCtx, args, true, false)
 	if err != nil {
 		return err
 	}

diff --git a/cli/cmd/status.go b/cli/cmd/status.go
@@ -62,11 +62,11 @@ func internalStatusModule(cmdCtx *cmdcontext.CmdCtx, args []string) error {
 	}
 
 	var runningCtx running.RunningCtx
-	if err := running.FillCtx(
-		cliOpts, cmdCtx, &runningCtx, args, running.ConfigLoadIgnoreErrors); err != nil {
+	err := running.FillCtx(cliOpts, cmdCtx, &runningCtx, args, false, false)
+	if err != nil {
 		return err
 	}
 
-	err := status.Status(runningCtx, opts)
+	err = status.Status(runningCtx, opts)
 	return err
 }
diff --git a/cli/cmd/stop.go b/cli/cmd/stop.go
@@ -79,8 +79,7 @@ func internalStopModule(cmdCtx *cmdcontext.CmdCtx, args []string) error {
 	}
 
 	var runningCtx running.RunningCtx
-	var err error = running.FillCtx(
-		cliOpts, cmdCtx, &runningCtx, args, running.ConfigLoadSkip)
+	var err error = running.FillCtx(cliOpts, cmdCtx, &runningCtx, args, false, false)
 	if err != nil {
 		return err
 	}

diff --git a/cli/instances/list.go b/cli/instances/list.go
@@ -31,7 +31,7 @@ func ListInstances(cmdCtx *cmdcontext.CmdCtx, cliOpts *config.CliOpts) error {
 	fmt.Printf("instances enabled directory: %s\n", cliOpts.Env.InstancesEnabled)
 
 	applications, err := running.CollectInstancesForApps(appList, cliOpts, cmdCtx.Cli.ConfigDir,
-		cmdCtx.Integrity, running.ConfigLoadSkip)
+		cmdCtx.Integrity, false, false)
 	if err != nil {
 		return err
 	}

diff --git a/cli/pack/opts.go b/cli/pack/opts.go
@@ -49,7 +49,7 @@ func initAppsInfo(cliOpts *config.CliOpts, cmdCtx *cmdcontext.CmdCtx, packCtx *P
 	}
 	packCtx.AppList = appList
 	packCtx.AppsInfo, err = running.CollectInstancesForApps(packCtx.AppList, cliOpts,
-		cmdCtx.Cli.ConfigDir, cmdCtx.Integrity, running.ConfigLoadSkip)
+		cmdCtx.Cli.ConfigDir, cmdCtx.Integrity, false, false)
 	if err != nil {
 		return fmt.Errorf("failed to collect applications info: %s", err)
 	}

diff --git a/cli/replicaset/rebootstrap.go b/cli/replicaset/rebootstrap.go
@@ -60,7 +60,7 @@ func cleanDataFiles(instCtx running.InstanceCtx) error {
 // and starting it again.
 func Rebootstrap(cmdCtx cmdcontext.CmdCtx, cliOpts config.CliOpts, rbCtx RebootstrapCtx) error {
 	apps, err := running.CollectInstancesForApps([]string{rbCtx.AppName}, &cliOpts,
-		cmdCtx.Cli.ConfigDir, cmdCtx.Integrity, running.ConfigLoadAll)
+		cmdCtx.Cli.ConfigDir, cmdCtx.Integrity, true, true)
 	if err != nil {
 		return fmt.Errorf("cannot collect application instances info: %s", err)
 	}