Revert "Fix 055.backend_all_down test failure."
authorBo Peng <pengbo@sraoss.co.jp>
Mon, 30 Jul 2018 09:24:32 +0000 (18:24 +0900)
committerBo Peng <pengbo@sraoss.co.jp>
Mon, 30 Jul 2018 09:24:32 +0000 (18:24 +0900)
This reverts commit e0b08239ddb6061b04a86562912fdedfbca9f75d.

test/regression/tests/055.backend_all_down/test.sh

index 8e4836b3025291a134e3a4e932aaf5a49b96476f..f9497a886eaaeaf3c673fe0812085676ef09618d 100755 (executable)
@@ -33,23 +33,15 @@ while true
 do
        grep "failover done. shutdown host $PGSOCKET_DIR(11001)" log/pgpool.log > /dev/null 2>&1
        if [ $? = 0 ];then
-               echo "shutdown detected"
                break;
        fi
-
-       grep "failover: no backends are degenerated" log/pgpool.log > /dev/null 2>&1
-       if [ $? = 0 ];then
-               echo "no backend to degenerate detected"
-               break;
-       fi
-
        sleep 1
 done
 
 # if that's the case, shutdownall will hang.
-(./shutdownall) >/dev/null 2>&1 &
+(./shutdownall)&
 sleep 5
-kill $pid
+kill $!
 
 if [ $? = 0 ];then
        ./shutdownall