combine two function in one

Author: amrita-shrestha

tests/ociswrapper/ocis/ocis.go

@@ -322,13 +322,13 @@ func StopService(service string) (bool, string) {
 	}
 
 	// service takes 30sec time to completely shutdown
-	success := WaitForServiceDown(service)
+    // success := WaitForServiceDown(service)
+	success := WaitForServiceStatus(service, false)
 	if !success {
 		StopService(service)
 	}
 
 	delete(runningServices, service)
-	log.Println(fmt.Sprintf("oCIS service %s has been stopped successfully", service))
 
 	return true, fmt.Sprintf("Service %s stopped successfully", service)
 }
@@ -401,3 +401,45 @@ func WaitForServiceDown(service string) bool {
 	}
 }
 
+func WaitForServiceStatus(service string, waitForUp bool) bool {
+	overallTimeout := time.After(30 * time.Second)
+	ticker := time.NewTicker(2 * time.Second)
+	defer ticker.Stop()
+
+	port := config.GetServiceDebugPort(service)
+
+	for {
+		select {
+		case <-overallTimeout:
+			status := "available"
+			if !waitForUp {
+				status = "shut down"
+			}
+			log.Println(fmt.Errorf("timeout: %s service did not %s within 30 seconds", service, status).Error())
+			return false
+		case <-ticker.C:
+			if _, exists := runningServices[service]; !exists {
+				log.Println(fmt.Sprintf("Service %s not found in running services. Retrying...", service))
+				continue
+			}
+
+			address := fmt.Sprintf(":%d", port)
+			conn, err := net.DialTimeout("tcp", address, 1*time.Second)
+			if waitForUp {
+				if err == nil {
+					_ = conn.Close()
+					log.Println(fmt.Sprintf("%s service is ready to listen on port %d", service, port))
+					return true
+				}
+				log.Println(fmt.Sprintf("%s service is not ready on port %d. %v", service, port, err))
+			} else {
+				if err != nil {
+					log.Println(fmt.Sprintf("%s service port %d is no longer reachable", service, port))
+					return true
+				}
+				_ = conn.Close()
+				log.Println(fmt.Sprintf("%s service port %d is still active. Retrying...", service, port))
+			}
+		}
+	}
+}

tests/ociswrapper/wrapper/handlers/handler.go

@@ -240,7 +240,7 @@ func OcisServiceHandler(res http.ResponseWriter, req *http.Request) {
 			common.Wg.Add(1)
 			go ocis.StartService(serviceName, serviceEnvMap)
 
-			success := ocis.WaitForService(serviceName)
+			success := ocis.WaitForServiceStatus(serviceName, true)
 			if success {
 				log.Println(fmt.Sprintf("Found Port for %s...", serviceName))
 				sendResponse(res, http.StatusOK, fmt.Sprintf("oCIS service %s started successfully", serviceName))