pgpool2.git / summary / log / commit / refs

commit    7804e0fbc1fbdb53c09b924964ae4b3b26f97ce4
Author:   Tatsuo Ishii <ishii@postgresql.org>
Date:     Wed Jun 26 05:49:26 2013 +0000

    Fix failover.sh to not cause shell error in certain cases.
    
    If not all arguments are supplied (this could happen if no available
    backend exists, for example), the script could fail.


 test/pgpool_setup | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pgpool_setup b/test/pgpool_setup
index ce2c8d388..1049d0b59 100755
--- a/test/pgpool_setup
+++ b/test/pgpool_setup
@@ -123,8 +123,8 @@ cluster1=$mydir/data1
 date >> $log
 echo "failed_node_id $failed_node_id failed_host_name $failed_host_name failed_port $failed_port failed_db_cluster $failed_db_cluster new_master_id $new_master_id old_master_id $old_master_id new_master_host_name $new_master_host_name old_primary_node_id $old_primary_node_id new_master_port_number $new_master_port_number new_master_db_cluster $new_master_db_cluster" >> $log
 
-if [ $failed_node_id = $old_primary_node_id ];then	# master failed
-    if [ $failed_node_id = 0 ];then
+if [ a"$failed_node_id" = a"$old_primary_node_id" ];then	# master failed
+    if [ a"$failed_node_id" = a"0" ];then
 		echo $pg_ctl -D $cluster1 promote >>$log	# let standby take over
 		$pg_ctl -D $cluster1 promote >>$log	# let standby take over
     else


[parent: 190b77260923]