From 8b86c6970019b760d8d711bd6d5b430b70ef6bdf Mon Sep 17 00:00:00 2001
From: shirley_zhengx <zhengxue6@huawei.com>
Date: Thu, 25 May 2023 15:46:15 +0800
Subject: [PATCH] fix bug about verify parameter of gs_initdb

---
 src/bin/initdb/initdb.cpp                      |  2 +-
 src/bin/initdb/ss_initdb.cpp                   | 18 ++++++++++++------
 src/bin/initdb/ss_initdb.h                     |  2 +-
 .../ddes/adapter/ss_dms_recovery.cpp           |  2 +-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/bin/initdb/initdb.cpp b/src/bin/initdb/initdb.cpp
index 495de66a3..79e895e46 100644
--- a/src/bin/initdb/initdb.cpp
+++ b/src/bin/initdb/initdb.cpp
@@ -4292,7 +4292,7 @@ int main(int argc, char* argv[])
     }
     
     /* check nodedata.cfg and node_id */
-    ss_issharedstorage = ss_check_nodedatainfo();
+    ss_issharedstorage = ss_check_nodedatainfo(enable_dss);
     
     if (default_text_search_config_tmp != NULL)
         default_text_search_config = default_text_search_config_tmp;
diff --git a/src/bin/initdb/ss_initdb.cpp b/src/bin/initdb/ss_initdb.cpp
index 42bd10145..37e9b2da4 100644
--- a/src/bin/initdb/ss_initdb.cpp
+++ b/src/bin/initdb/ss_initdb.cpp
@@ -146,14 +146,20 @@ void pg_ltoa(int32 value, char *a)
 }
 
 /* check dms url when gs_initdb */
-bool ss_check_nodedatainfo()
-{
+bool ss_check_nodedatainfo(bool enable_dss)
+{   
     bool issharedstorage = false;
 
-    if ((ss_nodeid == INVALID_INSTANCEID && ss_nodedatainfo != NULL) ||
-        (ss_nodeid != INVALID_INSTANCEID && ss_nodedatainfo == NULL)) {
-        issharedstorage = false;
-        fprintf(stderr, _("ss_nodeid is invalid or nodedatainfo file not exist or nodedatainfo file is empty.\n"));
+    if (!enable_dss) {
+        if (ss_nodeid != INVALID_INSTANCEID || ss_nodedatainfo != NULL) {
+            fprintf(stderr, _("ss_nodeid is valid or nodedatainfo exist without enable-dss.\n"));
+            exit(1);
+        }
+        return issharedstorage;   
+    }
+
+    if ((ss_nodeid == INVALID_INSTANCEID || ss_nodedatainfo == NULL)) {
+        fprintf(stderr, _("ss_nodeid is invalid or nodedatainfo not exist or nodedatainfo is empty with enable-dss.\n"));
         exit(1);
     }
 
diff --git a/src/bin/initdb/ss_initdb.h b/src/bin/initdb/ss_initdb.h
index 45b56bb59..30528bfed 100644
--- a/src/bin/initdb/ss_initdb.h
+++ b/src/bin/initdb/ss_initdb.h
@@ -42,7 +42,7 @@ extern bool ss_issharedstorage;
 extern bool ss_need_mkclusterdir;
 
 /* check dms url when gs_initdb */
-extern bool ss_check_nodedatainfo();
+extern bool ss_check_nodedatainfo(bool enable_dss);
 extern bool ss_check_existclusterdir(const char* path);
 extern bool ss_check_shareddir(char* path);
 extern void ss_createdir(const char** ss_dirs, int32 num, int32 node_id, const char* pg_data, const char* vgdata_dir, const char* vglog_dir);
diff --git a/src/gausskernel/ddes/adapter/ss_dms_recovery.cpp b/src/gausskernel/ddes/adapter/ss_dms_recovery.cpp
index 3c64f1ce8..a37515f4e 100644
--- a/src/gausskernel/ddes/adapter/ss_dms_recovery.cpp
+++ b/src/gausskernel/ddes/adapter/ss_dms_recovery.cpp
@@ -232,7 +232,7 @@ void SSWriteReformerControlPages(void)
         if (g_instance.dms_cxt.SSReformerControl.list_stable != 0 ||
             g_instance.dms_cxt.SSReformerControl.primaryInstId == SS_MY_INST_ID) {
             (void)printf("[SS] ERROR: files from last install must be cleared.\n");
-            ereport(PANIC, (errmsg("Files from last initdb not cleared")));
+            ereport(ERROR, (errmsg("Files from last initdb not cleared")));
         }
         (void)printf("[SS] Current node:%d acknowledges cluster PRIMARY node:%d.\n",
             SS_MY_INST_ID, g_instance.dms_cxt.SSReformerControl.primaryInstId);