From 96c0094de02467ba34a9e6996fbd4fe4df5f4419 Mon Sep 17 00:00:00 2001 From: w00427717 Date: Thu, 17 Sep 2020 14:42:25 +0800 Subject: [PATCH 1/2] replace gs_ctl stop with gsql shutdown --- src/test/regress/output/gs_basebackup.source | 12 +++--------- .../regress/script/gs_basebackup/gs_basebackup.sh | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/test/regress/output/gs_basebackup.source b/src/test/regress/output/gs_basebackup.source index 49d11784c..16739cdfa 100644 --- a/src/test/regress/output/gs_basebackup.source +++ b/src/test/regress/output/gs_basebackup.source @@ -55,9 +55,7 @@ INSERT 0 1 (1 row) --?total time: * ms ---?.*[gs_ctl]: gs_ctl stopped ,datadir is -D ".*/gs_basebackup_node_nstream_np" ---?waiting for server to shut down.* done -server stopped +SHUTDOWN \! @abs_srcdir@/script/gs_basebackup/gs_basebackup.sh @abs_bindir@ @abs_srcdir@ @portstring@ gs_basebackup_node_stream_p stream p --?! [.*][.*][][gs_ctl]: gs_ctl status,datadir is -D ".*/gs_basebackup_node_stream_p" --?! gs_ctl: server is running (PID: .*) @@ -85,9 +83,7 @@ server stopped (1 row) --?total time: .* ms ---?.*[gs_ctl]: gs_ctl stopped ,datadir is -D ".*/gs_basebackup_node_stream_p" ---?waiting for server to shut down.* done -server stopped +SHUTDOWN \! @abs_srcdir@/script/gs_basebackup/gs_basebackup.sh @abs_bindir@ @abs_srcdir@ @portstring@ gs_basebackup_node_fetch_t fetch t --?! [.*][.*][][gs_ctl]: gs_ctl status,datadir is -D ".*/gs_basebackup_node_fetch_t" --?! gs_ctl: server is running (PID: .*) @@ -115,6 +111,4 @@ server stopped (1 row) --?total time: * ms ---?.*[gs_ctl]: gs_ctl stopped ,datadir is -D ".*/gs_basebackup_node_fetch_t" ---?waiting for server to shut down.* done -server stopped \ No newline at end of file +SHUTDOWN \ No newline at end of file diff --git a/src/test/regress/script/gs_basebackup/gs_basebackup.sh b/src/test/regress/script/gs_basebackup/gs_basebackup.sh index 2de211783..570bad5ae 100644 --- a/src/test/regress/script/gs_basebackup/gs_basebackup.sh +++ b/src/test/regress/script/gs_basebackup/gs_basebackup.sh @@ -59,4 +59,4 @@ $abs_bindir/gsql -dgs_basebackup -p$gs_basebackup_port -f "$abs_srcdir/sql/gs_ba #stop node -$abs_bindir/gs_ctl stop -D $abs_bindir/../$dataNode \ No newline at end of file +$abs_bindir/gsql -dgs_basebackup -p$gs_basebackup_port -c 'SHUTDOWN IMMEDIATE' \ No newline at end of file From c7ad93b1417a25ba600532d061597bdb6a6ad6d0 Mon Sep 17 00:00:00 2001 From: w00427717 Date: Sat, 19 Sep 2020 11:29:36 +0800 Subject: [PATCH 2/2] add dbstate starting when walrev or daterev are not ready --- src/gausskernel/process/postmaster/postmaster.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gausskernel/process/postmaster/postmaster.cpp b/src/gausskernel/process/postmaster/postmaster.cpp index 7fd370291..20bc66a0f 100755 --- a/src/gausskernel/process/postmaster/postmaster.cpp +++ b/src/gausskernel/process/postmaster/postmaster.cpp @@ -9346,6 +9346,8 @@ DbState get_local_dbstate(void) Also use local info from walreceiver as a supplement. */ if (wal_catchup || data_catchup) { db_state = CATCHUP_STATE; + } else if (!WalRcvIsOnline()) { + db_state = STARTING_STATE; } else { db_state = NORMAL_STATE; }