ci: display port usage information

It might help to identify the reason of flaky test
`test_replicaset_bootstrap_cartridge_app_second_bootstrap`
when/if it fails next time.

Closes #TNTP-3709

Author: elhimov

cli/replicaset/cartridge.go

@@ -245,14 +245,16 @@ func (c *CartridgeApplication) discovery() (Replicasets, error) {
 			}
 			if topology.IsBootstrapped {
 				if newTopology.IsBootstrapped {
+					updateInstancesAliases(newTopology.Replicasets, topology.Replicasets)
 					topology = newTopology
 				}
 			} else {
 				topology = newTopology
 			}
 
 			// Stop if we already found a valid topology.
-			return topology.IsBootstrapped && !topology.IsCritical, nil
+			return topology.IsBootstrapped && !topology.IsCritical &&
+				!hasMissingInstancesAliases(topology.Replicasets), nil
 		},
 	))
 	if err != nil {
@@ -271,6 +273,37 @@ func (c *CartridgeApplication) discovery() (Replicasets, error) {
 	return recalculateMasters(replicasets), err
 }
 
+// hasMissingInstancesAliases checks if any instance has empty alias.
+func hasMissingInstancesAliases(replicasets []Replicaset) bool {
+	for _, rs := range replicasets {
+		for _, inst := range rs.Instances {
+			if len(inst.Alias) == 0 {
+				return true
+			}
+		}
+	}
+	return false
+}
+
+// updateInstancesAliases tries to update missing instances aliases with another instances data.
+func updateInstancesAliases(replicasets []Replicaset, other []Replicaset) {
+	instAliases := make(map[string]string, 0)
+	for _, rs := range other {
+		for _, inst := range rs.Instances {
+			instAliases[inst.UUID] = inst.Alias
+		}
+	}
+	for i, rs := range replicasets {
+		for ii, inst := range rs.Instances {
+			if len(inst.Alias) == 0 {
+				if alias, ok := instAliases[inst.UUID]; ok && len(alias) > 0 {
+					replicasets[i].Instances[ii].Alias = alias
+				}
+			}
+		}
+	}
+}
+
 // Promote promotes an instance in the cartridge application.
 func (c *CartridgeApplication) Promote(ctx PromoteCtx) error {
 	replicasets, err := c.Discovery(UseCache)

magefile.go

@@ -420,16 +420,18 @@ func (Unit) Coverage() error {
 func Integration() error {
 	fmt.Println("Running integration tests...")
 
+	test_name := "test_replicaset_bootstrap_cartridge_app_second_bootstrap"
 	return sh.RunV(pythonExecutableName, "-m", "pytest", "-m", "not slow and not slow_ee "+
-		"and not notarantool", "test/integration")
+		"and not notarantool", "-k", test_name, "--maxfail=1", "test/integration")
 }
 
 // Run full set of integration tests.
 func IntegrationFull() error {
 	fmt.Println("Running all integration tests...")
 
+	test_name := "test_replicaset_bootstrap_cartridge_app_second_bootstrap"
 	return sh.RunV(pythonExecutableName, "-m", "pytest", "-m", "not slow_ee and not notarantool",
-		"test/integration")
+		"-k", test_name, "--maxfail=1", "test/integration")
 }
 
 // Run full set of integration tests, excluding docker tests.

test/integration/replicaset/test_replicaset_bootstrap.py

@@ -128,8 +128,10 @@ def test_bootstrap_app_replicaset_specified(tt_cmd, tmpdir_with_cfg):
 
 
 @pytest.mark.skipif(tarantool_major_version > 2, reason="skip cartridge test for Tarantool > 2")
+@pytest.mark.parametrize("attempt", range(100))
 @pytest.mark.parametrize("flag", [None, "--cartridge"])
-def test_replicaset_bootstrap_cartridge_app_second_bootstrap(tt_cmd, cartridge_app, flag):
+def test_replicaset_bootstrap_cartridge_app_second_bootstrap(tt_cmd, cartridge_app, flag, attempt):
+    print(f"Attempt #{attempt}")
     # Change the config.
     replicasets_cfg = {
         "router": {
@@ -159,8 +161,14 @@ def test_replicaset_bootstrap_cartridge_app_second_bootstrap(tt_cmd, cartridge_a
             "vshard_group": "default",
         },
     }
+    with open(os.path.join(cartridge_app.workdir, cartridge_name, "instances.yml"), "r") as f:
+        print(f"test: instances.yml:\n{f.read()}")
+    with open(os.path.join(cartridge_app.workdir, cartridge_name, "replicasets.yml"), "r") as f:
+        print(f"test: replicasets.yml #1:\n{f.read()}")
     with open(os.path.join(cartridge_app.workdir, cartridge_name, "replicasets.yml"), "w") as f:
         f.write(yaml.dump(replicasets_cfg))
+    with open(os.path.join(cartridge_app.workdir, cartridge_name, "replicasets.yml"), "r") as f:
+        print(f"test: replicasets.yml #2:\n{f.read()}")
 
     # Run bootstrap after initial bootstrap again.
     cmd = [tt_cmd, "rs", "bootstrap"]

test/utils.py

@@ -446,9 +446,11 @@ def find_ports(n=1, port=8000):
                 if s.connect_ex(("localhost", port)) == 0:
                     busy = True
                     break
+        print(f"find_ports({n}): is port {port} busy... {busy}")
         if not busy:
             ports.append(port)
         port += 1
+    print(f"find_ports({n}): {ports}")
     return ports