add retry logic to get container ports

Author: Shiva

systest/backup/nfs-backup/backup_test.go

@@ -59,11 +59,10 @@ func backupRestoreTest(t *testing.T, backupAlphaName string, backupZeroName stri
 	backupZero := testutil.ContainerInstance{Name: backupZeroName, Prefix: testutil.DockerPrefix}
 	require.NoError(t, backupZero.BestEffortWaitForHealthy(6080))
 
-	// Resolve addresses after containers are healthy
-	backupAlphaSocketAddr := testutil.ContainerAddr(backupAlphaName, 9080)
-	backupAlphaSocketAddrHttp := testutil.ContainerAddr(backupAlphaName, 8080)
-	restoreAlphaAddr := testutil.ContainerAddr(restoreAlphaName, 8080)
-	backupZeroAddr := testutil.ContainerAddr(backupZeroName, 6080)
+	backupAlphaSocketAddr := testutil.ContainerAddrRetry(backupAlphaName, 9080)
+	backupAlphaSocketAddrHttp := testutil.ContainerAddrRetry(backupAlphaName, 8080)
+	restoreAlphaAddr := testutil.ContainerAddrRetry(restoreAlphaName, 8080)
+	backupZeroAddr := testutil.ContainerAddrRetry(backupZeroName, 6080)
 
 	var dg *dgo.Dgraph
 	var err error

testutil/docker.go

@@ -226,6 +226,25 @@ func ContainerAddrWithHost(name string, privatePort uint16, host string) string
 	return host + ":" + strconv.Itoa(int(privatePort))
 }
 
+func ContainerAddrWithHostRetry(name string, privatePort uint16, host string) string {
+	maxAttempts := 30
+	for attempt := range maxAttempts {
+		c := getContainer(name)
+		for _, p := range c.Ports {
+			if p.PrivatePort == privatePort {
+				// Found the mapping - return immediately without waiting
+				return host + ":" + strconv.Itoa(int(p.PublicPort))
+			}
+		}
+
+		if attempt < maxAttempts-1 {
+			time.Sleep(500 * time.Millisecond)
+		}
+	}
+
+	return host + ":" + strconv.Itoa(int(privatePort))
+}
+
 func ContainerAddrLocalhost(name string, privatePort uint16) string {
 	return ContainerAddrWithHost(name, privatePort, "localhost")
 }
@@ -234,6 +253,10 @@ func ContainerAddr(name string, privatePort uint16) string {
 	return ContainerAddrWithHost(name, privatePort, "0.0.0.0")
 }
 
+func ContainerAddrRetry(name string, privatePort uint16) string {
+	return ContainerAddrWithHostRetry(name, privatePort, "0.0.0.0")
+}
+
 // DockerStart starts the specified services.
 func DockerRun(instance string, op int) error {
 	c := getContainer(instance)