!237 add return dbstats

Merge pull request !237 from 吴岳川/master
This commit is contained in:
opengauss-bot
2020-09-19 18:18:29 +08:00
committed by Gitee
3 changed files with 6 additions and 10 deletions

View File

@ -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;
}

View File

@ -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
SHUTDOWN

View File

@ -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
$abs_bindir/gsql -dgs_basebackup -p$gs_basebackup_port -c 'SHUTDOWN IMMEDIATE'