add more logs

Author: Shiva

systest/backup/nfs-backup/backup_test.go

@@ -52,6 +52,9 @@ func backupRestoreTest(t *testing.T, backupAlphaName string, backupZeroName stri
 
 	// Wait for containers to be healthy before proceeding
 	t.Logf("Waiting for %s to be healthy...", backupAlphaName)
+	fmt.Println("=================================================")
+	fmt.Println("testutil.DockerPrefix ------>", testutil.DockerPrefix)
+	fmt.Println("=================================================")
 	backupAlpha := testutil.ContainerInstance{Name: backupAlphaName, Prefix: testutil.DockerPrefix}
 	require.NoError(t, backupAlpha.BestEffortWaitForHealthy(8080))
 

t/t.go

@@ -230,40 +230,55 @@ func detectRace(prefix string) bool {
 }
 
 func outputLogs(prefix string) {
+	fmt.Printf("Outputting logs for prefix: %s\n", prefix)
+	fmt.Println("=================================================")
+	fmt.Println("=================================================")
+	fmt.Println("=================================================")
 	f, err := os.CreateTemp(".", prefix+"*.log")
 	x.Check(err)
 	defer func() {
 		if err := f.Close(); err != nil {
 			fmt.Printf("error closing file: %v", err)
 		}
 	}()
-	printLogs := func(container string) {
-		in := testutil.GetContainerInstance(prefix, container)
-		c := in.GetContainer()
-		if c == nil {
-			return
-		}
+
+	// Get all containers with this prefix instead of hardcoding container names
+	// This works for both default docker-compose.yml and custom compose files
+	containers := testutil.AllContainers(prefix)
+
+	fmt.Println("-------------------------------------------------")
+	fmt.Printf("Containers: %+v\n", containers)
+	fmt.Println("-------------------------------------------------")
+
+	for _, c := range containers {
 		logCmd := exec.Command("docker", "logs", c.ID)
 		out, err := logCmd.CombinedOutput()
-		x.Check(err)
+		if err != nil {
+			fmt.Printf("Error getting logs for container %s (ID: %s): %v\n", c.Names, c.ID, err)
+			continue
+		}
 		if _, err := f.Write(out); err != nil {
 			fmt.Printf("error writing container logs to file: %v", err)
 		}
-		fmt.Printf("Docker logs for %s is %s with error %+v ", c.ID, string(out), err)
-	}
-	for i := 0; i <= 3; i++ {
-		printLogs("zero" + strconv.Itoa(i))
+		// Include container name in the log output for easier debugging
+		containerName := "unknown"
+		if len(c.Names) > 0 {
+			containerName = strings.TrimPrefix(c.Names[0], "/")
+		}
+		fmt.Printf("Docker logs for %s (ID: %s):\n%s\n", containerName, c.ID, string(out))
 	}
 
-	for i := 0; i <= 6; i++ {
-		printLogs("alpha" + strconv.Itoa(i))
-	}
+	fmt.Println("-------------------------------------------------")
+	fmt.Printf("Logs written to file: %s\n", f.Name())
+	fmt.Println("-------------------------------------------------")
+
 	s := fmt.Sprintf("---> LOGS for %s written to %s .\n", prefix, f.Name())
 	_, err = oc.Write([]byte(s))
 	x.Check(err)
 }
 
 func stopCluster(composeFile, prefix string, wg *sync.WaitGroup, err error) {
+	fmt.Println("in stop cluster function========================")
 	go func() {
 		if err != nil {
 			outputLogs(prefix)
@@ -547,9 +562,15 @@ func runTests(taskCh chan task, closer *z.Closer) error {
 		} else {
 			// we are not using err variable here because we dont want to
 			// print logs of default cluster in case of custom test fail.
-			if cerr := runCustomClusterTest(ctx, task.pkg.ID, wg, xmlFile); cerr != nil {
-				return cerr
+			if err = runCustomClusterTest(ctx, task.pkg.ID, wg, xmlFile); err != nil {
+				fmt.Printf("Ran custom cluster test for package: %s with error: %v\n", task.pkg.ID, err)
+				fmt.Println("=================================================")
+				fmt.Println("=================================================")
+				return err
 			}
+			fmt.Printf("Ran custom cluster test for package: %s with error: %v\n", task.pkg.ID, err)
+			fmt.Println("=================================================")
+			fmt.Println("=================================================")
 		}
 	}
 	return err

testutil/docker.go

@@ -50,6 +50,9 @@ func (in ContainerInstance) BestEffortWaitForHealthy(privatePort uint16) error {
 	if len(port) == 0 {
 		return nil
 	}
+	fmt.Println("--------------------------------")
+	fmt.Println("best effort wait for healthy port ------>", port)
+	fmt.Println("--------------------------------", port == "")
 	checkACL := func(body []byte) error {
 		// Zero returns OK as response
 		if string(body) == "OK" {
@@ -70,6 +73,9 @@ func (in ContainerInstance) BestEffortWaitForHealthy(privatePort uint16) error {
 	tryWith := func(host string) error {
 		maxAttempts := 60
 		for attempt := range maxAttempts {
+			fmt.Println("--------------------------------")
+			fmt.Println("best effort wait for healthy attempt ------>", attempt)
+			fmt.Println("-------------url-------------------", "http://"+host+":"+port+"/health")
 			resp, err := http.Get("http://" + host + ":" + port + "/health")
 			var body []byte
 			if resp != nil && resp.Body != nil {
@@ -207,9 +213,16 @@ func AllContainers(prefix string) []types.Container {
 
 	var out []types.Container
 	for _, c := range containers {
+		fmt.Println("--------------------------------")
+		fmt.Println("overall containers", c.Names)
+		fmt.Println("-------------prefix-------------------", prefix)
 		for _, name := range c.Names {
 			if strings.HasPrefix(name, "/"+prefix) {
 				out = append(out, c)
+				fmt.Println("found container", name)
+			} else {
+				fmt.Println("-------------dont have that prefix-------------------", name)
+
 			}
 		}
 	}
@@ -227,7 +240,7 @@ func ContainerAddrWithHost(name string, privatePort uint16, host string) string
 }
 
 func ContainerAddrWithHostRetry(name string, privatePort uint16, host string) string {
-	maxAttempts := 30
+	maxAttempts := 60
 	for attempt := range maxAttempts {
 		fmt.Printf("Attempt %d to get container address for %s:%d with host %s\n", attempt, name, privatePort, host)
 		c := getContainer(name)
@@ -243,6 +256,8 @@ func ContainerAddrWithHostRetry(name string, privatePort uint16, host string) st
 		}
 	}
 
+	fmt.Printf("\n\n\ndid not find container address for %s:%d with host %s\n\n\n", name, privatePort, host)
+
 	return host + ":" + strconv.Itoa(int(privatePort))
 }