tt: skip instance having app name

If there is an instance with app name in instances.yml file, do not consider it as an instance.
tarantool · Apr 11, 2024 · 811b898 · 811b898
1 parent d5aaf63
commit 811b898
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/cli/running/running.go b/cli/running/running.go
@@ -385,9 +385,14 @@ func collectInstancesFromAppDir(appDir string, selectedInstName string,
 	for inst := range instParams {
 		instance := InstanceCtx{AppDir: appDir, ClusterConfigPath: appDirFiles.clusterCfgPath}
 		instance.InstName = getInstanceName(inst, instance.ClusterConfigPath != "")
+		instance.AppName = filepath.Base(appDir)
 		if selectedInstName != "" && instance.InstName != selectedInstName {
 			continue
 		}
+		if instance.InstName == instance.AppName {
+			log.Debugf("Skipping %q instance since it is an application name", instance.InstName)
+			continue
+		}
 		log.Debugf("Instance %q", instance.InstName)
 
 		if instance.Configuration, err = loadInstanceConfig(instance.ClusterConfigPath,
@@ -396,7 +401,6 @@ func collectInstancesFromAppDir(appDir string, selectedInstName string,
 				"config %q: %w", instance.InstName, instance.ClusterConfigPath, err)
 		}
 
-		instance.AppName = filepath.Base(appDir)
 		instance.SingleApp = false
 		if instance.InstanceScript, err = findInstanceScriptInAppDir(appDir, instance.InstName,
 			appDirFiles.clusterCfgPath, appDirFiles.defaultLuaPath); err != nil {

diff --git a/test/integration/running/multi_app/app1/instances.yml b/test/integration/running/multi_app/app1/instances.yml
@@ -1,3 +1,6 @@
+app1:
+  cluster-cookie: cookie
+
 router:
 
 master:

diff --git a/test/integration/running/test_running.py b/test/integration/running/test_running.py
@@ -508,6 +508,7 @@ def test_no_args_usage(tt_cmd):
             assert start_rc == 0
             assert re.search(r"Starting an instance \[app1:(router|master|replica)\]", start_out)
             assert re.search(r"Starting an instance \[app2\]", start_out)
+            assert "app1:app1" not in start_out
 
             # Check status.
             inst_enabled_dir = os.path.join(test_app_path, "instances_enabled")
@@ -524,6 +525,7 @@ def test_no_args_usage(tt_cmd):
             status_rc, status_out = run_command_and_get_output(status_cmd, cwd=test_app_path)
             assert status_rc == 0
             status_out = extract_status(status_out)
+            assert len(status_out) == 4
             assert status_out['app1:router']["STATUS"] == "RUNNING"
             assert status_out['app1:master']["STATUS"] == "RUNNING"
             assert status_out['app1:replica']["STATUS"] == "RUNNING"
@@ -544,6 +546,7 @@ def test_no_args_usage(tt_cmd):
                              r"has been terminated.", stop_out)
             assert re.search(r"The Instance app2 \(PID = \d+\) "
                              r"has been terminated.", stop_out)
+            assert "app1:app1" not in stop_out
 
 
 def test_running_env_variables(tt_cmd, tmpdir_with_cfg):