From 7f9abdab109493d3858205bbad7f1ccc092a7dee Mon Sep 17 00:00:00 2001 From: chentingting <2393940156@qq.com> Date: Tue, 14 Feb 2023 10:25:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Revert=20"=E6=9B=B4=E6=96=B0dms/dss?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=B7=AF=E5=BE=84"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e9f29064ddf41ee86e64802e67eeca33512ec508. --- src/gausskernel/ddes/adapter/ss_init.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/gausskernel/ddes/adapter/ss_init.cpp b/src/gausskernel/ddes/adapter/ss_init.cpp index fb9513436..5ac02179e 100644 --- a/src/gausskernel/ddes/adapter/ss_init.cpp +++ b/src/gausskernel/ddes/adapter/ss_init.cpp @@ -428,15 +428,8 @@ void GetSSLogPath(char *sslog_path) } sslog_path[0] = '\0'; - -#ifndef ENABLE_MULTIPLE_NODES - ret = snprintf_s(sslog_path, DMS_LOG_PATH_LEN, DMS_LOG_PATH_LEN - 1, "%s/pg_log/%s", realPath, - g_instance.exec_cxt.global_application_name); -#else ret = snprintf_s(sslog_path, DMS_LOG_PATH_LEN, DMS_LOG_PATH_LEN - 1, "%s/pg_log/%s", realPath, g_instance.attr.attr_common.PGXCNodeName); -#endif - securec_check_ss(ret, "", ""); if (pg_mkdir_p(sslog_path, S_IRWXU) != 0 && errno !=EEXIST) { ereport(FATAL, (errmsg("failed to mkdir $GAUSSLOG[DataDir]/pg_log"))); From 3154c5a3b2c972f2343fdfee9a20d1b19bd44356 Mon Sep 17 00:00:00 2001 From: chentingting <2393940156@qq.com> Date: Tue, 14 Feb 2023 10:26:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?Revert=20"=E3=80=90=E5=85=B1=E4=BA=AB?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E3=80=91dms/dss=20=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E6=B7=BB=E5=8A=A0nodename"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 4b01d2fcdd306d661170ba495832092c7b751eb2. --- src/gausskernel/ddes/adapter/ss_init.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/gausskernel/ddes/adapter/ss_init.cpp b/src/gausskernel/ddes/adapter/ss_init.cpp index 5ac02179e..777f22462 100644 --- a/src/gausskernel/ddes/adapter/ss_init.cpp +++ b/src/gausskernel/ddes/adapter/ss_init.cpp @@ -428,8 +428,7 @@ void GetSSLogPath(char *sslog_path) } sslog_path[0] = '\0'; - ret = snprintf_s(sslog_path, DMS_LOG_PATH_LEN, DMS_LOG_PATH_LEN - 1, "%s/pg_log/%s", realPath, - g_instance.attr.attr_common.PGXCNodeName); + ret = snprintf_s(sslog_path, DMS_LOG_PATH_LEN, DMS_LOG_PATH_LEN - 1, "%s/pg_log", realPath); securec_check_ss(ret, "", ""); if (pg_mkdir_p(sslog_path, S_IRWXU) != 0 && errno !=EEXIST) { ereport(FATAL, (errmsg("failed to mkdir $GAUSSLOG[DataDir]/pg_log")));