diff --git a/tool/cm_tool/CMLog.py b/tool/cm_tool/CMLog.py old mode 100644 new mode 100755 diff --git a/tool/cm_tool/Common.py b/tool/cm_tool/Common.py old mode 100644 new mode 100755 diff --git a/tool/cm_tool/ErrorCode.py b/tool/cm_tool/ErrorCode.py old mode 100644 new mode 100755 diff --git a/tool/cm_tool/InstallImpl.py b/tool/cm_tool/InstallImpl.py old mode 100644 new mode 100755 index 94a7485..600e377 --- a/tool/cm_tool/InstallImpl.py +++ b/tool/cm_tool/InstallImpl.py @@ -139,6 +139,7 @@ class InstallImpl: cmd = """ cp {gaussHome}/share/config/cm_server.conf.sample {cmdir}/cm_server/cm_server.conf sed 's#log_dir = .*#log_dir = {gaussLog}/cm/cm_server#' {cmdir}/cm_server/cm_server.conf -i + sed 's/enable_ssl.*=.*on/enable_ssl = off/g' {cmdir}/cm_server/cm_server.conf -i """.format(gaussHome=self.gaussHome, gaussLog=self.gaussLog, cmdir=cmdir) status, output = self.executeCmdOnHost(host, cmd) if status != 0: @@ -153,6 +154,7 @@ class InstallImpl: cp {gaussHome}/share/config/cm_agent.conf.sample {cmdir}/cm_agent/cm_agent.conf && sed 's#log_dir = .*#log_dir = {gaussLog}/cm/cm_agent#' {cmdir}/cm_agent/cm_agent.conf -i && sed 's#unix_socket_directory = .*#unix_socket_directory = {gaussHome}#' {cmdir}/cm_agent/cm_agent.conf -i + sed 's/enable_ssl.*=.*on/enable_ssl = off/g' {cmdir}/cm_agent/cm_agent.conf -i """.format(gaussHome=self.gaussHome, gaussLog=self.gaussLog, cmdir=cmdir) status, output = self.executeCmdOnHost(host, cmd) if status != 0: diff --git a/tool/cm_tool/__init__.py b/tool/cm_tool/__init__.py old mode 100644 new mode 100755 diff --git a/tool/cm_tool/cm_install b/tool/cm_tool/cm_install old mode 100644 new mode 100755 diff --git a/tool/cm_tool/cm_uninstall b/tool/cm_tool/cm_uninstall old mode 100644 new mode 100755 index 63634a5..e5a587c --- a/tool/cm_tool/cm_uninstall +++ b/tool/cm_tool/cm_uninstall @@ -214,7 +214,10 @@ General options: return status, output = InstallImpl.refreshDynamicFile(self.envFile) if status != 0: - self.logger.logExit("Failed to refresh dynamic file." + output) + if "The number of master dn must equal to 1." in output: + self.logger.debug("Cann't refresh dynamic file when there is no normal primary in the current cluster.") + else: + self.logger.logExit("Failed to refresh dynamic file." + output) def deleteData(self): """ @@ -228,7 +231,7 @@ General options: isLocal = False if host == self.localhostName: isLocal = True - cmd = "source %s; rm -rf %s $GAUSSLOG/cm" % (self.envFile, path) + cmd = "source %s; rm -rf %s $GAUSSLOG/cm $GAUSSHOME/share/sslcert/cm" % (self.envFile, path) status, output = executeCmdOnHost(host, cmd, isLocal) if status != 0: errorDetail = "\nCommand: %s\nStatus: %s\nOutput: %s" % (cmd, status, output) @@ -246,7 +249,7 @@ General options: if host == self.localhostName: isLocal = True cmd = "source %s; cd $GAUSSHOME/bin; rm -f om_monitor* cm_agent* cm_server* " \ - "cm_ctl* *manual*start*; cd -" % self.envFile + "cm_ctl* cm_persist* *manual*start*; cd -" % self.envFile status, output = executeCmdOnHost(host, cmd, isLocal) if status != 0: errorDetail = "\nCommand: %s\nStatus: %s\nOutput: %s" % (cmd, status, output)