Fri Oct 26 07:47:26 PDT 2007
- Previous message: [Slony1-commit] slony1-engine/src/slon remote_worker.c
- Next message: [Slony1-commit] slony1-engine/tools/altperl slonik_build_env.pl
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Update of /home/cvsd/slony1/slony1-engine/tests/testmergeset In directory main.slony.info:/tmp/cvs-serv24014 Modified Files: README gen_ddl_slonik.sh generate_dml.sh Log Message: Improvements to test for MERGE SET - better use of WAIT FOR EVENT, notably. Index: README =================================================================== RCS file: /home/cvsd/slony1/slony1-engine/tests/testmergeset/README,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** README 25 Sep 2007 18:25:11 -0000 1.1 --- README 26 Oct 2007 14:47:24 -0000 1.2 *************** *** 8,9 **** --- 8,16 ---- a set (a temporary set #999), and then merging that set back into the main set. + + This test also takes a fairly aggressive tack on usage of WAIT FOR + EVENT; when it gets into the "merge phase," it submits a SYNC followed + by waiting for that SYNC to be confirmed on all relevant nodes before + submitting a MERGE SET request to eliminate the extra set. It does + not use any SLEEP requests; concurrency control is expected to be + controlled by WAIT FOR EVENT. Index: generate_dml.sh =================================================================== RCS file: /home/cvsd/slony1/slony1-engine/tests/testmergeset/generate_dml.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** generate_dml.sh 25 Sep 2007 18:25:11 -0000 1.1 --- generate_dml.sh 26 Oct 2007 14:47:24 -0000 1.2 *************** *** 59,62 **** --- 59,63 ---- done done + wait_for_catchup status "done" } Index: gen_ddl_slonik.sh =================================================================== RCS file: /home/cvsd/slony1/slony1-engine/tests/testmergeset/gen_ddl_slonik.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** gen_ddl_slonik.sh 22 Oct 2007 18:45:02 -0000 1.2 --- gen_ddl_slonik.sh 26 Oct 2007 14:47:24 -0000 1.3 *************** *** 20,26 **** wait for event (origin=1, confirmed=3, wait on=1); subscribe set (id=999, provider=2, receiver=4, forward = no); ! sync (id=2); ! wait for event (origin=2, confirmed=4, wait on=2); ! sleep(seconds=5); merge set (ID = 1, ADD ID = 999, ORIGIN = 1 ); --- 20,25 ---- wait for event (origin=1, confirmed=3, wait on=1); subscribe set (id=999, provider=2, receiver=4, forward = no); ! sync (id=1); ! wait for event (origin=1, confirmed=ALL, wait on=1); merge set (ID = 1, ADD ID = 999, ORIGIN = 1 );
- Previous message: [Slony1-commit] slony1-engine/src/slon remote_worker.c
- Next message: [Slony1-commit] slony1-engine/tools/altperl slonik_build_env.pl
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Slony1-commit mailing list