From ae8164c3124a17f82b6bab2f001006a4f8cdeca9 Mon Sep 17 00:00:00 2001
From: liuyuhao <rjyf_wjd@163.com>
Date: Tue, 20 Aug 2024 11:13:01 +0800
Subject: [PATCH] =?UTF-8?q?bugfix=5F=E4=BF=AE=E5=A4=8D=E5=B8=A6CM=E9=9B=86?=
 =?UTF-8?q?=E7=BE=A4=E6=BB=9A=E5=8A=A8=E5=8D=87=E7=BA=A7=E6=97=B6,=20?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=95=B0=E6=8D=AE=E5=BA=93=E9=9B=86=E7=BE=A4?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 script/impl/om/OLAP/OmImplOLAP.py | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/script/impl/om/OLAP/OmImplOLAP.py b/script/impl/om/OLAP/OmImplOLAP.py
index c0e89cf..79e2666 100644
--- a/script/impl/om/OLAP/OmImplOLAP.py
+++ b/script/impl/om/OLAP/OmImplOLAP.py
@@ -212,18 +212,13 @@ class OmImplOLAP(OmImpl):
                 self.do_opt_cm_components('start')
             return
         
-        # if has cm and param --component!=DN, will start cluster by cm_ctl command
-        if ((not self.context.clusterInfo.hasNoCm() and self.context.g_opts.component != "DN")
-            and DefaultValue.isgreyUpgradeNodeSpecify(self.context.user,
-            DefaultValue.GREY_UPGRADE_STEP_UPGRADE_PROCESS, None, self.context.logger)):
+        # if has cm and not in separately upgrade, will start cluster by cm_ctl command
+        if (not self.context.clusterInfo.hasNoCm() and self.context.g_opts.component != "DN"):
             self.context.logger.debug("Have CM configuration, upgrade all"
                                       " nodes together.")
             self.doStartClusterByCm()
             return
-        else:
-            self.context.logger.debug("Have CM configuration, rolling upgrade "
-                                     "partial node but not all nodes, so "
-                                     "start cluster with openGauss om.")
+        
         # Specifies the stop node
         # Gets the specified node id
         startType = "node" if self.context.g_opts.nodeName != "" else "cluster"
@@ -363,7 +358,7 @@ class OmImplOLAP(OmImpl):
                 self.do_opt_cm_components('stop')
             return
         
-        # if has cm and param --component!=DN, will start cluster by cm_ctl command
+        # if has cm and not in separately upgrade, will stop cluster by cm_ctl command
         if not self.context.clusterInfo.hasNoCm() and self.context.g_opts.component != "DN":
             self.doStopClusterByCm()
             return