You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudberry.apache.org by ch...@apache.org on 2025/10/19 14:38:18 UTC
(cloudberry) branch cbdb-postgres-merge updated: Cluster has been started
This is an automated email from the ASF dual-hosted git repository.
chenjinbao1989 pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/cbdb-postgres-merge by this push:
new ff5630f968f Cluster has been started
ff5630f968f is described below
commit ff5630f968f60a73d3aa735ca854512ad69dce9d
Author: Jinbao Chen <ch...@gmail.com>
AuthorDate: Sun Oct 19 22:38:04 2025 +0800
Cluster has been started
---
src/backend/postmaster/postmaster.c | 9 ++-------
src/backend/utils/misc/guc_gp.c | 6 ++++--
src/backend/utils/misc/guc_tables.c | 2 +-
src/bin/Makefile | 2 ++
src/bin/pg_config/nls.mk | 4 ----
src/bin/pg_controldata/nls.mk | 4 ----
6 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index b30bcbf3952..0fbdb7199b7 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -681,7 +681,8 @@ static void ShmemBackendArrayRemove(Backend *bn);
#endif /* EXEC_BACKEND */
#define StartupDataBase() StartChildProcess(StartupProcess)
-#define StartArchiver() StartChildProcess(ArchiverProcess)
+//#define StartArchiver() StartChildProcess(ArchiverProcess)
+#define StartArchiver() (0)
#define StartBackgroundWriter() StartChildProcess(BgWriterProcess)
#define StartCheckpointer() StartChildProcess(CheckpointerProcess)
#define StartWalWriter() StartChildProcess(WalWriterProcess)
@@ -2072,12 +2073,6 @@ ServerLoop(void)
checkPgDir("/pg_multixact/members");
checkPgDir("/pg_multixact/offsets");
- /*
- * Block all signals until we wait again. (This makes it safe for our
- * signal handlers to do nontrivial work.)
- */
- PG_SETMASK(&BlockSig);
-
/*
* Latch set by signal handler, or new connection pending on any of
* our sockets? If the latter, fork a child process to deal with it.
diff --git a/src/backend/utils/misc/guc_gp.c b/src/backend/utils/misc/guc_gp.c
index 1dd09f9ff5e..384762af2e2 100644
--- a/src/backend/utils/misc/guc_gp.c
+++ b/src/backend/utils/misc/guc_gp.c
@@ -5464,7 +5464,7 @@ storageOptToString(const StdRdOptions *ao_opts)
}
appendStringInfo(&buf, "%s=%s", SOPT_CHECKSUM,
ao_opts->checksum ? "true" : "false");
- ret = strdup(buf.data);
+ ret = guc_strdup(ERROR, buf.data);
if (ret == NULL)
elog(ERROR, "out of memory");
pfree(buf.data);
@@ -5481,12 +5481,14 @@ check_gp_default_storage_options(char **newval, void **extra, GucSource source)
/* Value of "appendonly" option if one is specified. */
StdRdOptions *newopts;
- newopts = calloc(sizeof(*newopts), 1);
+ newopts = guc_malloc(ERROR, sizeof(*newopts));
if (!newopts)
ereport(ERROR,
(errcode(ERRCODE_OUT_OF_MEMORY),
errmsg("out of memory")));
+ memset(newopts, 0, sizeof(*newopts));
+
resetAOStorageOpts(newopts);
/*
diff --git a/src/backend/utils/misc/guc_tables.c b/src/backend/utils/misc/guc_tables.c
index ea1f953dc34..b3a7912cd9c 100644
--- a/src/backend/utils/misc/guc_tables.c
+++ b/src/backend/utils/misc/guc_tables.c
@@ -1510,7 +1510,7 @@ struct config_bool ConfigureNamesBool[] =
NULL
},
&autovacuum_start_daemon,
- true,
+ false,
NULL, NULL, NULL
},
diff --git a/src/bin/Makefile b/src/bin/Makefile
index c0a6f8aeb1c..6614b35f576 100644
--- a/src/bin/Makefile
+++ b/src/bin/Makefile
@@ -41,6 +41,8 @@ unittest-check:
SUBDIRS = \
initdb \
+ pg_config \
+ pg_controldata \
pg_ctl \
psql
diff --git a/src/bin/pg_config/nls.mk b/src/bin/pg_config/nls.mk
index d4b980f58ff..d86c28c404d 100644
--- a/src/bin/pg_config/nls.mk
+++ b/src/bin/pg_config/nls.mk
@@ -1,7 +1,3 @@
# src/bin/pg_config/nls.mk
CATALOG_NAME = pg_config
-<<<<<<< HEAD
-AVAIL_LANGUAGES = cs de el es fr he it ja ko pl pt_BR ru sv tr uk vi zh_CN
-=======
->>>>>>> REL_16_9
GETTEXT_FILES = pg_config.c ../../common/config_info.c ../../common/exec.c
diff --git a/src/bin/pg_controldata/nls.mk b/src/bin/pg_controldata/nls.mk
index ee8113317ee..ab34205b960 100644
--- a/src/bin/pg_controldata/nls.mk
+++ b/src/bin/pg_controldata/nls.mk
@@ -1,9 +1,5 @@
# src/bin/pg_controldata/nls.mk
CATALOG_NAME = pg_controldata
-<<<<<<< HEAD
-AVAIL_LANGUAGES = cs de el es fr it ja ko ru sv tr uk zh_CN
-=======
->>>>>>> REL_16_9
GETTEXT_FILES = pg_controldata.c ../../common/controldata_utils.c
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cloudberry.apache.org
For additional commands, e-mail: commits-help@cloudberry.apache.org