From 96c0094de02467ba34a9e6996fbd4fe4df5f4419 Mon Sep 17 00:00:00 2001 From: w00427717 Date: Thu, 17 Sep 2020 14:42:25 +0800 Subject: [PATCH] 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