!342 集群管理组件支持增量升级

Merge pull request !342 from coolany/master

script/gspylib/common/Common.py

@@ -330,6 +330,7 @@ class DefaultValue():
     # cluster status
     CLUSTER_STATUS_NORMAL = "Normal"
     CLUSTER_STATUS_DEGRADED = "Degraded"
+    CLUSTER_STATUS_UNAVAILABLE = "Unavailable"
     ###########################
     # instance role
     ###########################

script/gspylib/common/OMCommand.py

@@ -128,7 +128,9 @@ class OMCommand():
             "Local_Check_SshAgent": os.path.normpath(Current_Path
                                                      + "/../../local/CheckSshAgent.py"),
             "Local_Upgrade_Utility": os.path.normpath(
-                Current_Path + "/../../local/UpgradeUtility.py")
+                Current_Path + "/../../local/UpgradeUtility.py"),
+            "Local_Upgrade_CM": os.path.normpath(
+                Current_Path + "/../../local/upgrade_cm_utility.py")
         }
 
         return "python3 '%s'" % LocalScript[script]

script/gspylib/common/ParameterParsecheck.py

@@ -133,6 +133,9 @@ gs_upgradectl_auto_rollback = ["-t:", "-?", "--help", "-V", "--version",
 # commit-upgrade parameter lists
 gs_upgradectl_commit = ["-t:", "-?", "--help", "-V", "--version", "-l:", "-X:"]
 
+# upgrade cm component
+gs_upgradectl_upgrade_cm = ["-t:", "-?", "--help", "-V", "--version", "-l", "--upgrade-package="]
+
 ParameterDict = {"preinstall": gs_preinstall,
                  "install": gs_install,
                  "uninstall": gs_uninstall,
@@ -142,6 +145,7 @@ ParameterDict = {"preinstall": gs_preinstall,
                  "auto_upgrade": gs_upgradectl_auto_upgrade,
                  "chose_strategy": gs_upgradectl_chose_strategy,
                  "commit_upgrade": gs_upgradectl_commit,
+                 "upgrade-cm": gs_upgradectl_upgrade_cm,
                  "auto_rollback": gs_upgradectl_auto_rollback,
                  "start": gs_om_start,
                  "stop": gs_om_stop,
@@ -169,7 +173,7 @@ special_list = ["gs_om", "backup", "upgradectl"]
 action_om = ["start", "stop", "status", "restart", "generateconf", "kerberos",
              "cert", "view", "query", "refreshconf"]
 action_upgradectl = ["chose-strategy", "auto-upgrade", "auto-rollback",
-                     "commit-upgrade"]
+                     "commit-upgrade", "upgrade-cm"]
 
 
 class Parameter():
@@ -467,6 +471,8 @@ class Parameter():
                 PARAMETER_VALUEDICT['old_values'] = value.strip().split(",")
             elif key == "--new-values":
                 PARAMETER_VALUEDICT['new_values'] = value.strip().split(",")
+            elif key == "--upgrade-package":
+                PARAMETER_VALUEDICT["upgrade-package"] = value.strip()
             # Only check / symbol for gs_lcct.
             if key in ("--name", "--nodegroup-name"):
                 self.checkLcGroupName(key, value)
@@ -673,6 +679,8 @@ class Parameter():
                 ParameterList = ParameterDict.get("auto_upgrade")
             elif (self.action == "commit-upgrade"):
                 ParameterList = ParameterDict.get("commit_upgrade")
+            elif self.action == "upgrade-cm":
+                ParameterList = ParameterDict.get("upgrade-cm")
             else:
                 GaussLog.exitWithError(ErrorCode.GAUSS_500["GAUSS_50004"]
                                        % "t")