From 4ec236d594ccb56fd3e258b121ab3bd49e3c7cb9 Mon Sep 17 00:00:00 2001
From: chenzhikai <895543892@qq.com>
Date: Thu, 13 Apr 2023 16:30:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E6=8C=81ss=5Fenable=5Fdss=E4=B8=8Esse?=
 =?UTF-8?q?nbale=5Fdms=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/postmaster/postmaster.cpp            | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/gausskernel/process/postmaster/postmaster.cpp b/src/gausskernel/process/postmaster/postmaster.cpp
index 2c3157bae..f119108ef 100644
--- a/src/gausskernel/process/postmaster/postmaster.cpp
+++ b/src/gausskernel/process/postmaster/postmaster.cpp
@@ -2279,6 +2279,9 @@ int PostmasterMain(int argc, char* argv[])
         return 0;
     }
     
+    /* Check for invalid combinations of GUC settings */
+    CheckGUCConflicts();
+
     /* Check DSS config */
     initDSSConf();
 
@@ -2287,11 +2290,7 @@ int PostmasterMain(int argc, char* argv[])
 
     /* And switch working directory into it */
     ChangeToDataDir();
-    /*
-        * Check for invalid combinations of GUC settings.
-        */
-    CheckGUCConflicts();
-
+    
     /* Set parallel recovery config */
     ConfigRecoveryParallelism();
     ProcessRedoCpuBindInfo();
@@ -3404,6 +3403,13 @@ static void CheckShareStorageConfigConflicts(void)
                     errhint("Either set temp_tablespaces to NULL, or turn off ss_enable_dss.")));
         }
     }
+
+    if (g_instance.attr.attr_storage.dss_attr.ss_enable_dss != 
+            g_instance.attr.attr_storage.dms_attr.enable_dms) {
+        ereport(ERROR,
+            (errcode(ERRCODE_SYSTEM_ERROR),
+                errmsg("ss_enable_dms and ss_enable_dss must be turned on or off simultaneously.")));
+    }
 }
 
 /*
-- 
Gitee