From 1832178e4b0c39c74f9073c04373cf568e160446 Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Wed, 20 Sep 2023 11:46:45 +0800 Subject: [PATCH] udm user memory to innodb --- database/upgrade/upgrade.sql | 5 +++- features/cm/software.go | 44 +++++++++++++++++++++++------------- 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/database/upgrade/upgrade.sql b/database/upgrade/upgrade.sql index 30140fba..5871ccdf 100644 --- a/database/upgrade/upgrade.sql +++ b/database/upgrade/upgrade.sql @@ -66,4 +66,7 @@ ADD COLUMN IF NOT EXISTS `comment` varchar(255) NULL AFTER `account_id`; ALTER TABLE `omc_db`.`trace_task` ADD COLUMN IF NOT EXISTS `account_id` varchar(32) NULL AFTER `update_time`, -ADD COLUMN IF NOT EXISTS `comment` varchar(255) NULL AFTER `account_id`; \ No newline at end of file +ADD COLUMN IF NOT EXISTS `comment` varchar(255) NULL AFTER `account_id`; + +ALTER TABLE `omc_db`.`u_auth_user` ENGINE = InnoDB; +ALTER TABLE `omc_db`.`u_sub_user` ENGINE = InnoDB; \ No newline at end of file diff --git a/features/cm/software.go b/features/cm/software.go index 024e778f..e5a75b9d 100644 --- a/features/cm/software.go +++ b/features/cm/software.go @@ -542,7 +542,7 @@ func DistributeSoftwareToNF(w http.ResponseWriter, r *http.Request) { mkdirCmd := fmt.Sprintf("sudo mkdir -p %s/software/%s", config.GetYamlConfig().NE.OmcDir, neTypeLower) cmd := exec.Command("ssh", sshHost, mkdirCmd) out, err := cmd.CombinedOutput() - log.Tracef("Exec output: %v", string(out)) + log.Debugf("Exec output: %v", string(out)) if err != nil { log.Error("Faile to mkdir:", err) services.ResponseInternalServerError500ProcessError(w, err) @@ -557,7 +557,7 @@ func DistributeSoftwareToNF(w http.ResponseWriter, r *http.Request) { neInfo.Ip, config.GetYamlConfig().NE.ScpDir) cmd = exec.Command("scp", "-r", srcFile, scpDir) out, err = cmd.CombinedOutput() - log.Tracef("Exec output: %v", string(out)) + log.Debugf("Exec output: %v", string(out)) if err != nil { log.Errorf("Faile to scp NF: neType=%s, neId=%s, ip=%s", neType, neId, neInfo.Ip) services.ResponseInternalServerError500ProcessError(w, err) @@ -568,7 +568,7 @@ func DistributeSoftwareToNF(w http.ResponseWriter, r *http.Request) { config.GetYamlConfig().NE.OmcDir, neTypeLower) cmd = exec.Command("ssh", sshHost, cpCmd) out, err = cmd.CombinedOutput() - log.Tracef("Exec output: %v", string(out)) + log.Debugf("Exec output: %v", string(out)) if err != nil { log.Error("Faile to execute cp command:", err) services.ResponseInternalServerError500ProcessError(w, err) @@ -713,17 +713,8 @@ func ActiveSoftwareToNF(w http.ResponseWriter, r *http.Request) { services.ResponseInternalServerError500ProcessError(w, err) return } - if neTypeLower != "omc" { - restartCmd := fmt.Sprintf("sudo systemctl restart %s.service", neTypeLower) - cmd := exec.Command("ssh", sshHost, restartCmd) - out, err := cmd.CombinedOutput() - log.Debugf("Exec output: %v", string(out)) - if err != nil { - log.Error("Faile to execute ssh sudo systemctl command:", err) - services.ResponseInternalServerError500ProcessError(w, err) - return - } - } else { + switch neTypeLower { + case "omc": restartCmd := fmt.Sprintf("sudo %s/bin/omcsvc.sh restart", config.GetYamlConfig().NE.OmcDir) cmd := exec.Command("ssh", sshHost, restartCmd) out, err := cmd.CombinedOutput() @@ -733,6 +724,27 @@ func ActiveSoftwareToNF(w http.ResponseWriter, r *http.Request) { services.ResponseInternalServerError500ProcessError(w, err) return } + case "ims": + restartCmd := "sudo ims-restart" + cmd := exec.Command("ssh", sshHost, restartCmd) + out, err := cmd.CombinedOutput() + log.Debugf("Exec output: %v", string(out)) + if err != nil { + log.Error("Faile to execute ssh sudo systemctl command:", err) + services.ResponseInternalServerError500ProcessError(w, err) + return + } + default: + restartCmd := fmt.Sprintf("sudo systemctl restart %s.service", neTypeLower) + cmd := exec.Command("ssh", sshHost, restartCmd) + out, err := cmd.CombinedOutput() + log.Debugf("Exec output: %v", string(out)) + if err != nil { + log.Error("Faile to execute ssh sudo systemctl command:", err) + services.ResponseInternalServerError500ProcessError(w, err) + return + } + } } @@ -820,7 +832,7 @@ func RollBackSoftwareToNF(w http.ResponseWriter, r *http.Request) { rpmCmd := fmt.Sprintf("sudo rpm -Uvh --oldpackage '%s'", filePath) cmd := exec.Command("ssh", sshHost, rpmCmd) out, err := cmd.CombinedOutput() - log.Tracef("Exec output: %v", string(out)) + log.Debugf("Exec output: %v", string(out)) if err != nil { log.Error("Faile to execute rpm command:", err) services.ResponseInternalServerError500ProcessError(w, err) @@ -830,7 +842,7 @@ func RollBackSoftwareToNF(w http.ResponseWriter, r *http.Request) { dpkgCmd := fmt.Sprintf("sudo dpkg -i '%s'", filePath) cmd := exec.Command("ssh", sshHost, dpkgCmd) out, err := cmd.CombinedOutput() - log.Tracef("Exec output: %v", string(out)) + log.Debugf("Exec output: %v", string(out)) if err != nil { log.Error("Faile to execute dpkg command:", err) services.ResponseInternalServerError500ProcessError(w, err)