--- adsl/test_difference.sh 2007/02/11 21:52:48 1 +++ adsl/test_difference.sh 2007/02/11 22:33:29 5 @@ -2,26 +2,32 @@ #echo "** sync" #slonik_execute_script -c 'select now();' 1 | slonik -op='!=' -echo $0 $1 | grep '_no_' >/dev/null && op='==' +op='==' +echo $0 $1 | grep 'diff' >/dev/null && op='!=' -echo "name [$0] op [$op]" +echo "name [$0 $1] op [$op]" psql="sudo -u postgres psql adsl" master="`$psql -p 5001 -c 'select * from po_mjesecima'`" echo -e "## MASTER\n$master" slave='' oldslave='' -while [ "$master" $op "$slave" ] ; do +sleep=1 +while [ ! "$master" $op "$slave" -o "$slave" == '' ] ; do slave="`$psql -p 5002 -c 'select * from po_mjesecima'`" if [ "$oldslave" != "$slave" ] then echo -e "$op SLAVE\n$slave" else + #slonik_execute_script -c 'select now();' 1 | slonik + ( slonik_print_preamble ; echo 'sync(id=1);' ) | slonik + ( slonik_print_preamble ; echo 'sync(id=2);' ) | slonik echo -n "." + sleep=`expr $sleep \* 2` + sleep $sleep + master="`$psql -p 5001 -c 'select * from po_mjesecima'`" fi oldslave="$slave" - sleep 2 done echo "** OK -- master $op slave **"