add enable_ss_dorado

script/gs_install

@@ -219,6 +219,9 @@ General options:
         # parameter --dorado-info
         if (ParaDict.__contains__("dorado-config")):
             self.dorado_config = ParaDict.get("dorado-config")
+        # parameter --dorado-cluster-mode
+        if (ParaDict.__contains__("dorado-cluster-mode")):
+            self.dorado_cluster_mode = ParaDict.get("dorado-cluster-mode")
 
     def checkUser(self):
         """

script/gspylib/common/LocalBaseOM.py

@@ -50,7 +50,8 @@ class LocalBaseOM(object):
                  paxos_mode=False,
                  dss_mode=False,
                  dss_config="",
-                 dorado_config=""):
+                 dorado_config="",
+                 dorado_cluster_mode=""):
         '''
         Constructor
         '''
@@ -81,6 +82,7 @@ class LocalBaseOM(object):
         self.dss_mode = dss_mode
         self.dss_config = dss_config
         self.dorado_config = dorado_config
+        self.dorado_cluster_mode = dorado_cluster_mode
 
     def initComponent(self, paxos_mode=False):
         """
@@ -156,6 +158,7 @@ class LocalBaseOM(object):
             self.initComponentAttributes(component)
             component.initParas = self.initParas
             component.dorado_config = self.dorado_config
+            component.dorado_cluster_mode = self.dorado_cluster_mode
             self.dnCons.append(component)
 
     def readConfigInfo(self):

script/gspylib/common/ParallelBaseOM.py

@@ -81,6 +81,7 @@ class ParallelBaseOM(object):
         self.dnCons = []
         self.dss_cons = []
         self.dorado_config = ""
+        self.dorado_cluster_mode = ""
         # localMode is same as isSingle in all OM script, expect for
         # gs_preinstall.
         # in gs_preinstall, localMode means local mode for master-standby

script/gspylib/common/ParameterParsecheck.py

@@ -68,7 +68,7 @@ gs_preinstall = ["-?", "--help", "-V", "--version", "-U:", "-G:", "-L",
                  "-l:", "--non-interactive", "--delete-root-trust", "--unused-third-party"]
 gs_install = ["-?", "--help", "-V", "--version", "-X:", "-l:",
               "--gsinit-parameter=", "--dn-guc=", "--cms-guc=",
-              "--time-out=", "--dorado-config=", "--alarm-component="]
+              "--time-out=", "--dorado-config=", "--dorado-cluster-mode", "--alarm-component="]
 gs_uninstall = ["-?", "--help", "-V", "--version", "-l:", "-L",
                 "--delete-data"]
 gs_postuninstall = ["-?", "--help", "-V", "--version", "--delete-user",
@@ -303,6 +303,7 @@ class Parameter():
                               "--alarm-server-addr": "warningserverip",
                               "--time-out": "time_out", "": "",
                               "--dorado-config": "dorado-config",
+                              "--dorado-cluster-mode" :"dorado-cluster-mode",
                               "--alarm-component": "alarm_component",
                               "--SSD-fault-time": "SSDFaultTime",
                               "--begin-time": "begintime",
@@ -476,6 +477,8 @@ class Parameter():
                 PARAMETER_VALUEDICT["upgrade-package"] = value.strip()
             elif key == "--dorado-config":
                 PARAMETER_VALUEDICT["dorado-config"] = value.strip()
+            elif key == "--dorado-cluster-mode":
+                PARAMETER_VALUEDICT["dorado-cluster-mode"] = value.strip()
             # Only check / symbol for gs_lcct.
             if key in ("--name", "--nodegroup-name"):
                 self.checkLcGroupName(key, value)

script/gspylib/component/BaseComponent.py

@@ -56,6 +56,7 @@ class BaseComponent(object):
         self.dss_mode = ''
         self.dss_config = ''
         self.dorado_config = ''
+        self.dorado_cluster_mode = ''
 
     def install(self):
         pass

script/gspylib/component/Kernel/DN_OLAP/DN_OLAP.py

@@ -166,6 +166,8 @@ class DN_OLAP(Kernel):
                     cmd += " -g %s" % self.dorado_config
                     tmpDict3 = {}
                     tmpDict3["xlog_lock_file_path"] = "'%s/redolog.lock'" % self.instInfo.datadir
+                if (self.dorado_cluster_mode != ""):
+                    cmd += "--enable-ss-dorado"
             self.logger.debug("Command for initializing database "
                               "node instance: %s" % cmd)
             status, output = CmdUtil.retryGetstatusoutput(

script/impl/install/OLAP/InstallImplOLAP.py

@@ -290,7 +290,8 @@ class InstallImplOLAP(InstallImpl):
         elif self.context.clusterInfo.enable_dss == 'on':
             dss_config = DssConfig.get_value_b64_handler(
                 'dss_nodes_list', self.context.clusterInfo.dss_config)
-            cmd += f" --dss_mode --dss_config={dss_config} --dorado_config={self.context.dorado_config}"
+            cmd += f" --dss_mode --dss_config={dss_config} --dorado_config={self.context.dorado_config} \
+                      --dorado_cluster_mode={self.context.dorado_cluster_mode}"
         self.context.logger.debug(
             "Command for initializing instances: %s" % cmd)
 

script/local/InitInstance.py

@@ -63,6 +63,7 @@ class CmdOptions():
         self.dss_mode = False
         self.dss_config = ""
         self.dorado_config = ""
+        self.dorado_cluster_mode = ""
 
 
 def usage():
@@ -80,7 +81,7 @@ def parseCommandLine():
     try:
         opts, args = getopt.getopt(sys.argv[1:], "U:P:G:l:?", [
             "help", "dws_mode", "vc_mode", "paxos_mode", "dss_mode",
-            "dss_config=", "dorado_config="
+            "dss_config=", "dorado_config=", "dorado_cluster_mode="
         ])
     except Exception as e:
         usage()
@@ -115,6 +116,8 @@ def parseCommandLine():
             g_opts.dss_config = value.strip()
         elif key == "--dorado_config":
             g_opts.dorado_config = value.strip()
+        elif key == "--dorado_cluster_mode":
+            g_opts.dorado_cluster_mode = value.strip()
         Parameter.checkParaVaild(key, value)
 
 
@@ -182,7 +185,8 @@ class initDbNode(LocalBaseOM):
                  paxos_mode=False,
                  dss_mode=False,
                  dss_config="",
-                 dorado_config = ""):
+                 dorado_config = "",
+                 dorado_cluster_mode = ""):
         """
         function: init instance
         input : logFile, user, clusterConf, dbInitParams
@@ -275,7 +279,8 @@ if __name__ == '__main__':
                             g_opts.paxos_mode,
                             dss_mode=g_opts.dss_mode,
                             dss_config=g_opts.dss_config,
-                            dorado_config=g_opts.dorado_config)
+                            dorado_config=g_opts.dorado_config,
+                            dorado_cluster_mode=g_opts.dorado_cluster_mode)
         dbInit.initNodeInst(g_opts.vc_mode)
 
     except Exception as e: