check for port when stoping service

Author: amrita-shrestha

tests/ociswrapper/README.md

@@ -127,7 +127,7 @@ Also, see `./bin/ociswrapper help` for more information.
 
 6. `POST /services/{service-name}`
 
-    Restart oCIS with service excluded and start excluded oCIS service individually, not covered by the oCIS supervisor.
+   Restart oCIS instances without specified service and start that service independently (not covered by the oCIS supervisor).
 
     Body of the request should be a JSON object with the following structure:
 
@@ -143,20 +143,20 @@ Also, see `./bin/ociswrapper help` for more information.
     > You need to set the proper addresses to access the service from other steps in the CI pipeline.
     >
     > `{SERVICE-NAME}_DEBUG_ADDR=0.0.0.0:{DEBUG_PORT}`
+    >
     > `{SERVICE-NAME}_HTTP_ADDR=0.0.0.0:{HTTP_PORT}`
 
-
    Returns:
 
-    - `200 OK` - oCIS server is stopped
+    - `200 OK` - oCIS service started successfully
     - `400 Bad Request` - request body is not a valid JSON object
-    - `500 Internal Server Error` - Unable to start oCIS service
+    - `500 Internal Server Error` - Failed to start oCIS service audit
 
 7. `DELETE /services/{service-name}`
 
    Stop individually running oCIS service
 
    Returns:
 
-    - `200 OK` - command is successfully executed
-    - `500 Internal Server Error` - Unable to start oCIS service
+    - `200 OK` - oCIS service stopped successfully
+    - `500 Internal Server Error` - Unable to stop oCIS service

tests/ociswrapper/ocis/ocis.go

@@ -223,7 +223,6 @@ func StartService(service string, envMap []string) {
 	} else {
 		cmd.Env = append(os.Environ(), envMap...)
 	}
-	log.Println(fmt.Sprintf("%s", cmd.Env))
 
 	logs, err := cmd.StderrPipe()
 	if err != nil {
@@ -322,6 +321,12 @@ func StopService(service string) (bool, string) {
 		return false, fmt.Sprintf("Failed to stop service with process id %d", pid)
 	}
 
+	// service takes 30sec time to completely shutdown
+	success := WaitForServiceDown(service)
+	if !success {
+		StopService(service)
+	}
+
 	delete(runningServices, service)
 	log.Println(fmt.Sprintf("oCIS service %s has been stopped successfully", service))
 
@@ -361,3 +366,38 @@ func WaitForService(service string) bool {
 		}
 	}
 }
+
+// wwait until service completely down
+func WaitForServiceDown(service string) bool {
+	overallTimeout := time.After(30 * time.Second)
+	ticker := time.NewTicker(2 * time.Second)
+	defer ticker.Stop()
+
+	port := config.GetServiceDebugPort(service)
+
+	for {
+		select {
+		case <-overallTimeout:
+			// Timeout occurred while waiting for the service to be available
+			log.Println(fmt.Errorf("timeout: %s service did not shut down within 30 seconds", service).Error())
+			return false
+		case <-ticker.C:
+			// Retry if the service is not in `runningServices`
+			if _, exists := runningServices[service]; !exists {
+				log.Println(fmt.Sprintf("Service %s not found in running services. Retrying...\n", service))
+				continue
+			}
+
+			address := fmt.Sprintf(":%d", port)
+			// Try to connect to the port
+			conn, err := net.DialTimeout("tcp", address, 1*time.Second)
+			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))
+		}
+	}
+}
+