Update of /home/cvsd/slony1/slony1-engine/doc/adminguide
In directory main.slony.info:/tmp/cvs-serv19962

Modified Files:
      Tag: REL_1_2_STABLE
	slonik_ref.sgml 
Log Message:
Improvement to WAIT FOR EVENT documentation


Index: slonik_ref.sgml
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/doc/adminguide/slonik_ref.sgml,v
retrieving revision 1.61.2.10
retrieving revision 1.61.2.11
diff -C2 -d -r1.61.2.10 -r1.61.2.11
*** slonik_ref.sgml	6 Aug 2007 06:48:04 -0000	1.61.2.10
--- slonik_ref.sgml	22 Oct 2007 20:48:17 -0000	1.61.2.11
***************
*** 1260,1268 ****
       # Assuming that set 1 has direct subscribers 2 and 3
       SUBSCRIBE SET (ID = 999, PROVIDER = 1, RECEIVER = 2);
-      WAIT FOR EVENT (ORIGIN = 2, CONFIRMED = 1);
       SYNC (ID=1);
       SUBSCRIBE SET (ID = 999, PROVIDER = 1, RECEIVER = 3);
-      WAIT FOR EVENT (ORIGIN = 3, CONFIRMED = 1);
       SYNC (ID=1);
       MERGE SET ( ID = 1, ADD ID = 999, ORIGIN = 1 );
      </programlisting>
--- 1260,1268 ----
       # Assuming that set 1 has direct subscribers 2 and 3
       SUBSCRIBE SET (ID = 999, PROVIDER = 1, RECEIVER = 2);
       SYNC (ID=1);
+      WAIT FOR EVENT (ORIGIN = 1, CONFIRMED = 2, WAIT FOR=1);
       SUBSCRIBE SET (ID = 999, PROVIDER = 1, RECEIVER = 3);
       SYNC (ID=1);
+      WAIT FOR EVENT (ORIGIN = 1, CONFIRMED = 3, WAIT FOR=1);
       MERGE SET ( ID = 1, ADD ID = 999, ORIGIN = 1 );
      </programlisting>
***************
*** 2795,2803 ****
     linkend="stmtsubscribeset"> request will return the event
     confirmation almost immediately, even though there might be several
!    hours of work to do before the subscription is ready. </para>
  
!    <para> There is no reliable way, at present, to monitor from within
!    a <xref linkend="slonik"> script that <xref
!    linkend="stmtsubscribeset"> is complete.</para>
     </refsect1>
     
--- 2795,2819 ----
     linkend="stmtsubscribeset"> request will return the event
     confirmation almost immediately, even though there might be several
!    hours of work to do before the subscription is ready.  The trouble
!    with <xref linkend="stmtsubscribeset"> is that it is processed as
!    <emphasis>two</emphasis> events, one on the origin node, with a
!    second event, to enable the subscription, on the subscriber.
!    </para>
  
!    <para> In order to more reliably monitor from within a <xref
!    linkend="slonik"> script that <xref linkend="stmtsubscribeset"> is
!    complete, you may submit a <xref linkend="stmtsync"> event after
!    the subscription, and have the WAIT request wait on that
!    <command>SYNC</command> event, as follows. </para>
!     <programlisting>
!      # Assuming that set 1 has direct subscribers 2 and 3
!      SUBSCRIBE SET (ID = 999, PROVIDER = 1, RECEIVER = 2);
!      SYNC (ID=1);
!      WAIT FOR EVENT (ORIGIN = 1, CONFIRMED = 2, WAIT FOR=1);
!      SUBSCRIBE SET (ID = 999, PROVIDER = 1, RECEIVER = 3);
!      SYNC (ID=1);
!      WAIT FOR EVENT (ORIGIN = 1, CONFIRMED = 3, WAIT FOR=1);
!      MERGE SET ( ID = 1, ADD ID = 999, ORIGIN = 1 );
!     </programlisting>
     </refsect1>