diff --git a/src/framework/cmd/cmd.go b/src/framework/cmd/cmd.go index 04d3e6e0..e22ffe08 100644 --- a/src/framework/cmd/cmd.go +++ b/src/framework/cmd/cmd.go @@ -8,18 +8,13 @@ import ( "time" ) -// Exec 本地执行命令,默认超时20s 列如:("ls -ls") +// Exec 本地执行命令 列如:("ls -ls") func Exec(cmdStr string) (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second) - defer cancel() cmd := exec.Command("bash", "-c", cmdStr) var stdout, stderr bytes.Buffer cmd.Stdout = &stdout cmd.Stderr = &stderr err := cmd.Run() - if ctx.Err() == context.DeadlineExceeded { - return "", fmt.Errorf("errCmdTimeout %v", err) - } if err != nil { errMsg := "" if len(stderr.String()) != 0 { diff --git a/src/modules/network_element/service/ne_version.go b/src/modules/network_element/service/ne_version.go index 3216ade9..95552aef 100644 --- a/src/modules/network_element/service/ne_version.go +++ b/src/modules/network_element/service/ne_version.go @@ -267,11 +267,10 @@ func (r NeVersion) operateCommand(action, neType string, neFilePaths []string) ( } // 删除软件包 omcStrArr = append(omcStrArr, fmt.Sprintf("sudo rm %s", strings.Join(neFilePaths, " "))) - omcStrArr = append(omcStrArr, "sudo systemctl restart omc") // 2s后执行omc相关命令 - cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo rm -f /tmp/omc_%s.out \n", action)) - cmdStrArr = append(cmdStrArr, fmt.Sprintf("nohup sh -c \"sleep 2s && %s\" > /tmp/operate_run_%s_omc.out 2>&1 & \n", strings.Join(omcStrArr, " && "), action)) + cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo rm -f /tmp/operate_run_%s_omc.out \n", action)) + cmdStrArr = append(cmdStrArr, fmt.Sprintf("nohup sh -c \"sleep 2s && %s\" > /tmp/operate_run_%s_omc.out2>&1 & \n", strings.Join(omcStrArr, " && "), action)) cmdStrArr = append(cmdStrArr, fmt.Sprintf("echo '%s' \n", okFlagStr)) return okFlagStr, cmdStrArr, nil } else if neType == "IMS" {