From 56842910f69e505dfc6d284a57f70007ed2fe088 Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Tue, 16 Apr 2024 11:19:07 +0800
Subject: [PATCH] fix: omc upgrade and restart issue

---
 features/cm/ne.go       | 20 ++++++++++++--------
 features/cm/software.go |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/features/cm/ne.go b/features/cm/ne.go
index 8219c15e..9005bcd1 100644
--- a/features/cm/ne.go
+++ b/features/cm/ne.go
@@ -858,15 +858,19 @@ func PostNeServiceAction(w http.ResponseWriter, r *http.Request) {
 	sshHost := fmt.Sprintf("%s@%s", config.GetYamlConfig().NE.User, neInfo.Ip)
 	switch neTypeLower {
 	case "omc":
+		// send 204 to fe firstly
+		services.ResponseStatusOK204NoContent(w)
 		actionCmd := fmt.Sprintf("sudo %s/bin/omcsvc.sh %s", config.GetYamlConfig().NE.OmcDir, action)
-		cmd := exec.Command("ssh", sshHost, actionCmd)
-		out, err := cmd.CombinedOutput()
-		log.Debugf("Exec output: %v", string(out))
-		if err != nil {
-			log.Errorf("Faile to execute ssh %s omc:%v", action, err)
-			services.ResponseInternalServerError500ProcessError(w, err)
-			return
-		}
+		go RunSSHCmd(sshHost, actionCmd)
+		return
+		// cmd := exec.Command("ssh", sshHost, actionCmd)
+		// out, err := cmd.CombinedOutput()
+		// log.Debugf("Exec output: %v", string(out))
+		// if err != nil {
+		// 	log.Errorf("Faile to execute ssh %s omc:%v", action, err)
+		// 	services.ResponseInternalServerError500ProcessError(w, err)
+		// 	return
+		// }
 	case "ims":
 		switch action {
 		case "start", "stop":
diff --git a/features/cm/software.go b/features/cm/software.go
index 80204d2f..2ab11dcd 100644
--- a/features/cm/software.go
+++ b/features/cm/software.go
@@ -930,7 +930,7 @@ func RollBackSoftwareToNF(w http.ResponseWriter, r *http.Request) {
 				return
 			}
 			services.ResponseStatusOK204NoContent(w)
-			RunSSHCmd(sshHost, runCmd)
+			go RunSSHCmd(sshHost, runCmd)
 			return
 		}
 		err = RunSSHCmd(sshHost, runCmd)