Chris Browne cbbrowne at lists.slony.info
Tue Apr 28 14:48:22 PDT 2009
Update of /home/cvsd/slony1/slony1-engine/tests/testseqnames
In directory main.slony.info:/tmp/cvs-serv6415/testseqnames

Modified Files:
      Tag: REL_2_0_STABLE
	generate_dml.sh 
Log Message:
Revise tests to NOT use poll_cluster to "wait until everything has
propagated according to sl_status" - instead, we use SYNC/WAIT FOR
EVENT, which submits an event against the origin, and then waits until
that specific event has propagated.

This means we're testing WAIT FOR EVENT a lot more stringently, and
allows tests to run a lot quicker in cases where it takes a while
for the nodes to decide they are instantaneously "in sync"


Index: generate_dml.sh
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/testseqnames/generate_dml.sh,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** generate_dml.sh	2 Apr 2007 18:52:19 -0000	1.5
--- generate_dml.sh	28 Apr 2009 21:48:20 -0000	1.5.2.1
***************
*** 62,72 ****
  do_initdata()
  {
!    originnode=${ORIGINNODE:-"1"}
    eval db=\$DB${originnode}
!    eval host=\$HOST${originnode}
    eval user=\$USER${originnode}
    eval port=\$PORT${originnode}
    generate_initdata
-   launch_poll
    status "loading data"
    $pgbindir/psql -h $host -p $port -d $db -U $user < $mktmp/generate.data 1> $mktmp/initdata.log 2> $mktmp/initdata.log
--- 62,71 ----
  do_initdata()
  {
!   originnode=${ORIGINNODE:-"1"}
    eval db=\$DB${originnode}
!   eval host=\$HOST${originnode}
    eval user=\$USER${originnode}
    eval port=\$PORT${originnode}
    generate_initdata
    status "loading data"
    $pgbindir/psql -h $host -p $port -d $db -U $user < $mktmp/generate.data 1> $mktmp/initdata.log 2> $mktmp/initdata.log
***************
*** 74,77 ****
--- 73,77 ----
      warn 3 "do_initdata failed, see $mktmp/initdata.log for details"
    fi 
+   wait_for_catchup
    status "done"
  }



More information about the Slony1-commit mailing list