[Trad] [svn:pgfr] r1328 - traduc/trunk/slony

admin at listes.postgresql.fr admin at listes.postgresql.fr
Ven 22 Mai 23:03:30 CEST 2009


Author: gleu
Date: 2009-05-22 23:03:30 +0200 (Fri, 22 May 2009)
New Revision: 1328

Added:
   traduc/trunk/slony/complexfail.dia
   traduc/trunk/slony/complexfail.png
Modified:
   traduc/trunk/slony/adminscripts.xml
   traduc/trunk/slony/complexenv.dia
   traduc/trunk/slony/complexenv.png
   traduc/trunk/slony/failover.xml
   traduc/trunk/slony/firstdb.xml
   traduc/trunk/slony/installation.xml
   traduc/trunk/slony/monitoring.xml
   traduc/trunk/slony/prerequisites.xml
   traduc/trunk/slony/slonconf.xml
   traduc/trunk/slony/slonik_ref.xml
   traduc/trunk/slony/version.xml
Log:
Merge Slony 2.0.2.


Modified: traduc/trunk/slony/adminscripts.xml
===================================================================
--- traduc/trunk/slony/adminscripts.xml	2009-05-22 20:27:43 UTC (rev 1327)
+++ traduc/trunk/slony/adminscripts.xml	2009-05-22 21:03:30 UTC (rev 1328)
@@ -1093,7 +1093,7 @@
 
   <listitem>
     <para>
-      <filename>create_set.slonik</filename>
+      <filename>create_nodes.slonik</filename>
     </para>
 
     <para>

Modified: traduc/trunk/slony/complexenv.dia
===================================================================
(Binary files differ)

Modified: traduc/trunk/slony/complexenv.png
===================================================================
(Binary files differ)

Added: traduc/trunk/slony/complexfail.dia
===================================================================
(Binary files differ)


Property changes on: traduc/trunk/slony/complexfail.dia
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: traduc/trunk/slony/complexfail.png
===================================================================
(Binary files differ)


Property changes on: traduc/trunk/slony/complexfail.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: traduc/trunk/slony/failover.xml
===================================================================
--- traduc/trunk/slony/failover.xml	2009-05-22 20:27:43 UTC (rev 1327)
+++ traduc/trunk/slony/failover.xml	2009-05-22 21:03:30 UTC (rev 1328)
@@ -302,6 +302,91 @@
 
 </sect2>
 
+<sect2 id="complexfailover">
+<title> Failover With Complex Node Set </title>
+
+<para> Failover is relatively <quote>simple</quote> if there are only two
+nodes; if a &slony1; cluster comprises many nodes, achieving a clean
+failover requires careful planning and execution. </para>
+
+<para> Consider the following diagram describing a set of six nodes at two sites.
+
+<inlinemediaobject>
+  <imageobject>
+    <imagedata fileref="complexenv.png"/>
+  </imageobject>
+  <textobject>
+    <phrase> Symmetric Multisites</phrase>
+  </textobject>
+</inlinemediaobject>
+
+</para>
+
+<para> Let us assume that nodes 1, 2, and 3 reside at one data
+centre, and that we find ourselves needing to perform failover due to
+failure of that entire site.  Causes could range from a persistent
+loss of communications to the physical destruction of the site; the
+cause is not actually important, as what we are concerned about is how
+to get &slony1; to properly fail over to the new site.</para>
+
+<para> We will further assume that node 5 is to be the new origin,
+after failover. </para>
+
+<para> The sequence of &slony1; reconfiguration required to properly
+failover this sort of node configuration is as follows:
+</para>
+
+<itemizedlist>
+
+<listitem><para> Resubscribe (using <xref linkend="stmtsubscribeset"/>
+ech node that is to be kept in the reformation of the cluster that is
+not already subscribed to the intended data provider.  </para>
+
+<para> In the example cluster, this means we would likely wish to
+resubscribe nodes 4 and 6 to both point to node 5.</para>
+
+<programlisting>
+   include &lt;/tmp/failover-preamble.slonik&gt;;
+   subscribe set (id = 1, provider = 5, receiver = 4);
+   subscribe set (id = 1, provider = 5, receiver = 4);
+</programlisting>
+
+</listitem>
+<listitem><para> Drop all unimportant nodes, starting with leaf nodes.</para>
+
+<para> Since nodes 1, 2, and 3 are unaccessible, we must indicate the
+<envar>EVENT NODE</envar> so that the event reaches the still-live
+portions of the cluster. </para>
+
+<programlisting>
+   include &lt;/tmp/failover-preamble.slonik&gt;;
+   drop node (id=2, event node = 4);
+   drop node (id=3, event node = 4);
+</programlisting>
+
+</listitem>
+
+<listitem><para> Now, run <command>FAILOVER</command>.</para>
+
+<programlisting>
+   include &lt;/tmp/failover-preamble.slonik&gt;;
+   failover (id = 1, backup node = 5);
+</programlisting>
+
+</listitem>
+
+<listitem><para> Finally, drop the former origin from the cluster.</para>
+
+<programlisting>
+   include &lt;/tmp/failover-preamble.slonik&gt;;
+   drop node (id=1, event node = 4);
+</programlisting>
+</listitem>
+
+</itemizedlist>
+
+</sect2>
+
 <sect2>
 <title>Automatisation de la commande <command>FAIL OVER</command></title>
 <indexterm><primary>automatisation des bascules d'urgence</primary></indexterm>

Modified: traduc/trunk/slony/firstdb.xml
===================================================================
--- traduc/trunk/slony/firstdb.xml	2009-05-22 20:27:43 UTC (rev 1327)
+++ traduc/trunk/slony/firstdb.xml	2009-05-22 21:03:30 UTC (rev 1328)
@@ -149,7 +149,7 @@
   table&nbsp;:
 </para>
 
-<programlisting>psql -U $PGBENCH_USER -h $HOST1 -d $DBNAME1 -c "begin; alter table
+<programlisting>psql -U $PGBENCHUSER -h $HOST1 -d $MASTERDBNAME -c "begin; alter table
 history add column id serial; update history set id =
 nextval('history_id_seq'); alter table history add primary key(id);
 commit"</programlisting>
@@ -274,18 +274,6 @@
 	init cluster ( id=1, comment = 'Master Node');
  
 	#--
-	# Puisque la table history n'a pas de clé primaire, ni de contrainte
-	# unique qui pourrait être utilisée pour identifier une ligne, nous
-	# devons en ajouter une.
-	# La commande suivante ajoute à la table une colonne bigint nommée
-	# _Slony-I_$CLUSTERNAME_rowID. Elle comme valeur par défaut
-	# nextval('_$CLUSTERNAME.s1_rowid_seq'), et dispose des contraintes
-	# UNIQUE et NOT NULL. Toutes les lignes existantes seront initialisées
-	# avec un dentifiant.
-	#--
-	table add key (node id = 1, fully qualified name = 'public.history');
-
-	#--
 	# Slony-I regroupe les tables dans des ensembles.
 	# La plus petite unité qu'un noeud peut répliquer est un ensemble.
 	# Les commandes suivantes crées un ensemble contenant 4 tables pgbench.
@@ -302,7 +290,7 @@
 	# décrit comment les 2 noeuds vont se connecter l'un à l'autre
 	# et quelle manière ils vont écouter les événements..
 	#--
-	store node (id=2, comment = 'Slave node');
+	store node (id=2, comment = 'Slave node', event node=1);
 	store path (server = 1, client = 2, conninfo='dbname=$MASTERDBNAME host=$MASTERHOST user=$REPLICATIONUSER');
 	store path (server = 2, client = 1, conninfo='dbname=$SLAVEDBNAME host=$SLAVEHOST user=$REPLICATIONUSER');
 _EOF_

Modified: traduc/trunk/slony/installation.xml
===================================================================
--- traduc/trunk/slony/installation.xml	2009-05-22 20:27:43 UTC (rev 1327)
+++ traduc/trunk/slony/installation.xml	2009-05-22 21:03:30 UTC (rev 1328)
@@ -54,7 +54,7 @@
 <indexterm><primary>installation : version courte</primary></indexterm>
 
 <para>
-<screen>PGMAIN=/usr/local/pgsql746-freebsd-2005-04-01 \
+<screen>PGMAIN=/usr/local/pgsql839-freebsd-2008-09-03 \
 ./configure \
     --with-pgconfigdir=$PGMAIN/bin
 gmake all; gmake install
@@ -110,7 +110,7 @@
 </para>
 
 <para>
-  La version 8 de &postgres; installe les fichiers d'en-tête
+  Les versions 8.0 et ultérieures de &postgres; installe les fichiers d'en-tête
   <command>#include</command> par défaut. Avec les versions 7.4 et antérieures,
   vous devez vous assurer que la compilation inclut la commande <command>make
   install-all-headers</command>, sinon les en-têtes du serveur ne seront pas
@@ -201,7 +201,7 @@
 
 <para>
   Voici la liste des fichiers principaux installés dans l'instance
-  PostgreSQL&nbsp;:
+  &postgres;, pour les versions de &slony1; jusqu'à la 1.2.x&nbsp;:
 </para>
 
 <itemizedlist>
@@ -221,19 +221,18 @@
 
 <para>
   (Notez qu'au fur et à mesure des versions, la liste des fichiers spécifiques
-  à une version va s'agrandir...)
+  à une version a tendance à grossir...)
 </para>
 
-<para>
-  Les fichiers <filename>.sql</filename> ne sont pas encore complètement
-  installés. Les versions 7.3, 7.4 et 8.0 des fichiers sont installés sur
-  chaque système, quelque soit la version de &postgres;. L'outil d'administration
-  <xref linkend="slonik"/> effectue des substitutions d'espace de noms et de
-  cluster dans ces fichiers, puis chargent les fichiers lors de la création d'un
-  n&oelig;ud de réplication. À cet instant, la base de donnée qui est initialisée
-  peut être à distance ou utiliser une version différente de &postgres; par
-  rapport à la version de l'hôte local.
-</para>
+<para>The <filename>.sql</filename> files are not fully substituted
+yet.  And yes, versions for all supported versions of &postgres;
+(<emphasis>e.g.</emphasis> - such as 7.3, 7.4 8.0) get installed on
+every system, irrespective of its version.  The <xref
+linkend="slonik"/> admin utility does namespace/cluster substitutions
+within these files, and loads the files when creating replication
+nodes.  At that point in time, the database being initialized may be
+remote and may run a different version of &postgres; than that of the
+local host.</para>
 
 <para>
   Pour terminer, les deux objets partagés installés dans le répertoire
@@ -242,6 +241,25 @@
   chargés à distance à partir des autres n&oelig;uds.).
 </para>
 
+<para> In &slony1; version 2.0, this changes:</para>
+<itemizedlist>
+<listitem><para><filename> $bindir/slon</filename></para></listitem>
+<listitem><para><filename> $bindir/slonik</filename></para></listitem>
+<listitem><para><filename> $libdir/slony1_funcs$(DLSUFFIX)</filename></para></listitem>
+<listitem><para><filename> $datadir/slony1_base.sql</filename></para></listitem>
+<listitem><para><filename> $datadir/slony1_funcs.sql</filename></para></listitem>
+</itemizedlist>
+
+<note> <para> Note the loss of <filename>xxid.so</filename> - the txid
+data type introduced in &postgres; 8.3 makes it
+obsolete. </para></note>
+
+<note> <para> &slony1; 2.0 gives up compatibility with versions of
+&postgres; prior to 8.3, and hence <quote>resets</quote> the
+version-specific base function handling.  There may be function files
+for version 8.3, 8.4, and such, as replication-relevant divergences of
+&postgres; functionality take place.  </para></note>
+
 </sect2>
 
 <sect2>
@@ -266,7 +284,8 @@
   ce bug mais il n'y a eu aucun progrès depuis. La seconde URL ci-dessous
   indique qu'il y a eu des tentatives de correction en élevant la valeur de
   NAMELEN dans une future version de Red Hat Enterprise Linux, mais cela n'est
-  pas le cas en 2008. Les distribution Fedora actuelles ont déjà corrigé ce
+  pas le cas if you are using an elder version where this
+  will never be rectified. Les distribution Fedora actuelles ont déjà corrigé ce
   problème.
 </para>
 

Modified: traduc/trunk/slony/monitoring.xml
===================================================================
--- traduc/trunk/slony/monitoring.xml	2009-05-22 20:27:43 UTC (rev 1327)
+++ traduc/trunk/slony/monitoring.xml	2009-05-22 21:03:30 UTC (rev 1328)
@@ -658,7 +658,7 @@
     <para><screen>SYNC 19 done in 1.272 seconds</screen></para>
 
     <para>
-      Ceci indique qe le traitement a pris au total 0.108 seconds pour cet
+      Ceci indique qe le traitement a pris au total 1.272 secondes pour cet
       ensemble de SYNC.
     </para>
   </listitem>

Modified: traduc/trunk/slony/prerequisites.xml
===================================================================
--- traduc/trunk/slony/prerequisites.xml	2009-05-22 20:27:43 UTC (rev 1327)
+++ traduc/trunk/slony/prerequisites.xml	2009-05-22 21:03:30 UTC (rev 1328)
@@ -15,12 +15,14 @@
 <indexterm><primary>plates-formes sur lesquelles &slony1; fonctionne</primary></indexterm>
 
 <para>
-  Les plates-formes ayant été testées spécifiquement à ce jour pour cette
-  version sont FreeBSD-4X-i368, FreeBSD-5X-i386,FreeBSD-5X-alpha, OS-X-10.3,
-  Linux-2.4X-i386 Linux-2.6X-i386, Linux-2.6X-amd64,
+  Les plates-formes ayant été testées sont FreeBSD-4X-i368,
+  FreeBSD-5X-i386, FreeBSD-5X-alpha, OS-X-10.3,
+  Linux-2.4X-i386 Linux-2.6X-i386 Linux-2.6X-amd64,
   <trademark>Solaris</trademark>-2.8-SPARC,
-  <trademark>Solaris</trademark>-2.9-SPARC, AIX 5.1, OpenBSD-3.5-sparc64 et
-  &windows; 2000, XP et 2003 (32 bit).
+  <trademark>Solaris</trademark>-2.9-SPARC, AIX 5.1 and 5.3,
+  OpenBSD-3.5-sparc64 and &windows; 2000, XP and 2003 (32 bit).  There
+  is enough diversity amongst these platforms that nothing ought to
+  prevent running &slony1; on other similar platforms.
 </para>
 
 <sect2>
@@ -95,6 +97,13 @@
 	<xref linkend="faq" />, <link linkend="pg81funs">&postgres;
 	8.1.[0-3]</link>.
       </para>
+
+      <para>
+        There is variation between what versions of &postgres; are
+        compatible with what versions of &slony1;.  See <xref
+        linkend="installation"/> for more details.
+      </para>
+
     </listitem>
 
     <listitem>
@@ -147,7 +156,7 @@
 
 <note>
   <para>
-    Dans la version 1.1 de &slony1;, il est possible de compiler &slony1;
+    À partir de la version 1.1 de &slony1;, il est possible de compiler &slony1;
     séparemment de &postgres;, rendant libres les distributions
     <productname>Linux</productname> et
     <productname>FreeBSD</productname> d'inclure des packages binaires

Modified: traduc/trunk/slony/slonconf.xml
===================================================================
--- traduc/trunk/slony/slonconf.xml	2009-05-22 20:27:43 UTC (rev 1327)
+++ traduc/trunk/slony/slonconf.xml	2009-05-22 21:03:30 UTC (rev 1328)
@@ -139,6 +139,12 @@
       <listitem>
         <para>Détermine si l'horodatage de chaque événement doit
 	      apparaître dans chaque ligne du journal applicatif.</para>
+
+        <para> Note that if <envar>syslog</envar> usage is configured,
+        then this is ignored; it is assumed that
+        <application>syslog</application> will be supplying
+        timestamps, and timestamps are therefore suppressed.
+        </para>
       </listitem>
     </varlistentry>
 

Modified: traduc/trunk/slony/slonik_ref.xml
===================================================================
--- traduc/trunk/slony/slonik_ref.xml	2009-05-22 20:27:43 UTC (rev 1327)
+++ traduc/trunk/slony/slonik_ref.xml	2009-05-22 21:03:30 UTC (rev 1328)
@@ -83,6 +83,22 @@
 
          <para>Ces commandes sont regroupées ensemble au sein d'une transaction
            pour chaque n&oelig;ud participant.</para>
+
+     <para> Note that this does not enforce grouping of the actions as
+     a single transaction on all nodes.  For instance, consider the
+     following slonik code:</para>
+     <programlisting>
+     try {
+         execute script (set id = 1, filename = '/tmp/script1.sql', event node=1);
+         execute script (set id = 1, filename = '/tmp/script2.sql', event node=1);
+     }
+     </programlisting>
+
+     <para> This <emphasis>would</emphasis> be processed within a
+     single BEGIN/COMMIT on node 1.  However, the requests are
+     separated into two <command>DDL_SCRIPT</command> events so that
+     each will be run individually, in separate transactions, on other
+     nodes in the cluster. </para>
       </sect3>
     </sect2>
   </sect1>
@@ -100,7 +116,7 @@
   </partintro>
   <!-- **************************************** -->
   <refentry id ="stmtinclude">
-    <refmeta><refentrytitle>INCLUDE</refentrytitle><manvolnum>7</manvolnum></refmeta>
+    <refmeta><refentrytitle>SLONIK  INCLUDE</refentrytitle><manvolnum>7</manvolnum></refmeta>
     <refnamediv>
       <refname>INCLUDE</refname>
       <refpurpose>insérer du code slonik à partir d'un autre fichier</refpurpose>
@@ -130,7 +146,7 @@
     </refsect1>
   </refentry>
   <!-- **************************************** -->
-  <refentry id ="stmtdefine"><refmeta><refentrytitle>DEFINE</refentrytitle><manvolnum>7</manvolnum></refmeta>
+  <refentry id ="stmtdefine"><refmeta><refentrytitle>SLONIK  DEFINE</refentrytitle><manvolnum>7</manvolnum></refmeta>
     <refnamediv><refname>DEFINE</refname>
       <refpurpose>Définir un nom symbolique</refpurpose>
     </refnamediv>
@@ -193,7 +209,7 @@
     système de réplication, mais affecte l'exécution du script tout entier.</para>
   </partintro>
   <refentry id ="clustername">
-    <refmeta><refentrytitle>CLUSTER NAME</refentrytitle><manvolnum>7</manvolnum></refmeta>
+    <refmeta><refentrytitle>SLONIK CLUSTER NAME</refentrytitle><manvolnum>7</manvolnum></refmeta>
     <refnamediv>
       <refname>CLUSTER NAME</refname>
       <refpurpose>préambule - identifier le cluster &slony1;</refpurpose>
@@ -232,7 +248,7 @@
     </refsect1>
   </refentry>
   <refentry id ="admconninfo">
-    <refmeta><refentrytitle>ADMIN CONNINFO</refentrytitle><manvolnum>7</manvolnum></refmeta>
+    <refmeta><refentrytitle>SLONIK ADMIN CONNINFO</refentrytitle><manvolnum>7</manvolnum></refmeta>
     <refnamediv>
       <refname>ADMIN CONNINFO</refname>
       <refpurpose>preambule - identifier la base &postgres;</refpurpose>
@@ -291,7 +307,7 @@
   <title>Commande de configuration et d'action</title>  
   <refentry id ="stmtecho">
     <refmeta>
-      <refentrytitle>ECHO</refentrytitle><manvolnum>7</manvolnum></refmeta>
+      <refentrytitle>SLONIK ECHO</refentrytitle><manvolnum>7</manvolnum></refmeta>
       <refnamediv>
         <refname>ECHO</refname>
         <refpurpose>Outil générique de sortie</refpurpose>
@@ -318,7 +334,7 @@
   
   <!-- **************************************** -->
   
-  <refentry id ="stmtexit"><refmeta><refentrytitle>EXIT</refentrytitle>
+  <refentry id ="stmtexit"><refmeta><refentrytitle>SLONIK EXIT</refentrytitle>
    <manvolnum>7</manvolnum></refmeta>
    
    <refnamediv><refname>EXIT</refname>
@@ -353,7 +369,7 @@
   <!-- **************************************** -->
   <refentry id="stmtinitcluster">
    <refmeta>
-    <refentrytitle>INIT CLUSTER</refentrytitle>
+    <refentrytitle>SLONIK INIT CLUSTER</refentrytitle>
      <manvolnum>7</manvolnum>
    </refmeta>
    <refnamediv>
@@ -431,7 +447,7 @@
 
 <!-- **************************************** -->
 
-  <refentry id ="stmtstorenode"><refmeta><refentrytitle>STORE NODE</refentrytitle>
+  <refentry id ="stmtstorenode"><refmeta><refentrytitle>SLONIK STORE NODE</refentrytitle>
    <manvolnum>7</manvolnum></refmeta>
    
    <refnamediv><refname>STORE NODE</refname>
@@ -518,7 +534,7 @@
   </refentry>
   
 <!-- **************************************** -->
-  <refentry id="stmtdropnode"><refmeta><refentrytitle>DROP NODE</refentrytitle>
+  <refentry id="stmtdropnode"><refmeta><refentrytitle>SLONIK DROP NODE</refentrytitle>
    <manvolnum>7</manvolnum></refmeta>
    
    <refnamediv><refname>DROP NODE</refname>
@@ -558,7 +574,7 @@
    </refsect1>
    <refsect1><title>Exemple</title>
     <programlisting>
-     DROP NODE ( ID = 2 );
+     DROP NODE ( ID = 2, EVENT NODE = 1 );
     </programlisting>
    </refsect1>
    <refsect1> <title>Utilisation de verrous</title>
@@ -591,7 +607,7 @@
   </refentry>
 
 <!-- **************************************** -->
-  <refentry id="stmtuninstallnode"><refmeta><refentrytitle>UNINSTALL NODE</refentrytitle>
+  <refentry id="stmtuninstallnode"><refmeta><refentrytitle>SLONIK UNINSTALL NODE</refentrytitle>
    <manvolnum>7</manvolnum></refmeta>
    
    <refnamediv><refname>UNINSTALL NODE</refname>
@@ -654,7 +670,7 @@
 
 <!-- **************************************** -->
 
-  <refentry id="stmtrestartnode"><refmeta><refentrytitle>RESTART NODE</refentrytitle>
+  <refentry id="stmtrestartnode"><refmeta><refentrytitle>SLONIK RESTART NODE</refentrytitle>
    <manvolnum>7</manvolnum></refmeta>
    
    <refnamediv><refname>RESTART NODE</refname>
@@ -706,7 +722,7 @@
 
   <!-- **************************************** -->
 
-  <refentry id="stmtstorepath"><refmeta><refentrytitle>STORE
+  <refentry id="stmtstorepath"><refmeta><refentrytitle>SLONIK STORE
      PATH</refentrytitle><manvolnum>7</manvolnum></refmeta>
    
    <refnamediv><refname>STORE PATH</refname>
@@ -784,7 +800,7 @@
 
 <!-- **************************************** -->
 
-  <refentry id="stmtdroppath"><refmeta><refentrytitle>DROP PATH</refentrytitle>
+  <refentry id="stmtdroppath"><refmeta><refentrytitle>SLONIK DROP PATH</refentrytitle>
    <manvolnum>7</manvolnum></refmeta>
    
    <refnamediv><refname>DROP PATH</refname>
@@ -835,7 +851,7 @@
 
 <!-- **************************************** -->
 
-  <refentry id="stmtstorelisten"><refmeta><refentrytitle>STORE LISTEN</refentrytitle>
+  <refentry id="stmtstorelisten"><refmeta><refentrytitle>SLONIK STORE LISTEN</refentrytitle>
    <manvolnum>7</manvolnum></refmeta>
    
    <refnamediv><refname>STORE LISTEN</refname>
@@ -907,7 +923,7 @@
 
 <!-- **************************************** -->
 
-  <refentry id="stmtdroplisten"><refmeta><refentrytitle>DROP LISTEN</refentrytitle>
+  <refentry id="stmtdroplisten"><refmeta><refentrytitle>SLONIK DROP LISTEN</refentrytitle>
    <manvolnum>7</manvolnum></refmeta>
    
    <refnamediv><refname>DROP LISTEN</refname>
@@ -962,7 +978,7 @@
 
 <!-- **************************************** -->
 
-<refentry id="stmttableaddkey"><refmeta><refentrytitle>TABLE ADD KEY</refentrytitle>
+<refentry id="stmttableaddkey"><refmeta><refentrytitle>SLONIK TABLE ADD KEY</refentrytitle>
    <manvolnum>7</manvolnum></refmeta>
    
    <refnamediv><refname>TABLE ADD KEY</refname>
@@ -1085,7 +1101,7 @@
 
 <!-- **************************************** -->
 
-  <refentry id="stmtcreateset"><refmeta><refentrytitle>CREATE SET</refentrytitle>
+  <refentry id="stmtcreateset"><refmeta><refentrytitle>SLONIK CREATE SET</refentrytitle>
    <manvolnum>7</manvolnum></refmeta>
    
    <refnamediv><refname>CREATE SET</refname>
@@ -1155,7 +1171,7 @@
 
 <!-- **************************************** -->
 
-  <refentry id="stmtdropset"><refmeta><refentrytitle>DROP SET</refentrytitle>
+  <refentry id="stmtdropset"><refmeta><refentrytitle>SLONIK DROP SET</refentrytitle>
    <manvolnum>7</manvolnum></refmeta>
 
    <refnamediv><refname>DROP SET</refname>
@@ -1207,7 +1223,7 @@
  
 <!-- **************************************** -->
 
-  <refentry id="stmtmergeset"><refmeta><refentrytitle>MERGE
+  <refentry id="stmtmergeset"><refmeta><refentrytitle>SLONIK MERGE
      SET</refentrytitle><manvolnum>7</manvolnum></refmeta>
    
    <refnamediv><refname>MERGE SET</refname>
@@ -1289,7 +1305,7 @@
 
 <!-- **************************************** -->
 
-  <refentry id="stmtsetaddtable"><refmeta><refentrytitle>SET ADD TABLE</refentrytitle>
+  <refentry id="stmtsetaddtable"><refmeta><refentrytitle>SLONIK SET ADD TABLE</refentrytitle>
    <manvolnum>7</manvolnum></refmeta>
    
    <refnamediv><refname>SET ADD TABLE</refname>
@@ -1450,7 +1466,7 @@
 
 <!-- **************************************** -->
 
-  <refentry id="stmtsetaddsequence"><refmeta><refentrytitle>SET ADD SEQUENCE</refentrytitle>
+  <refentry id="stmtsetaddsequence"><refmeta><refentrytitle>SLONIK SET ADD SEQUENCE</refentrytitle>
    <manvolnum>7</manvolnum></refmeta>
    
    <refnamediv><refname>SET ADD SEQUENCE</refname>
@@ -1522,7 +1538,7 @@
   
 <!-- **************************************** -->
 
-  <refentry id="stmtsetdroptable"><refmeta><refentrytitle>SET DROP TABLE</refentrytitle>
+  <refentry id="stmtsetdroptable"><refmeta><refentrytitle>SLONIK SET DROP TABLE</refentrytitle>
    <manvolnum>7</manvolnum></refmeta>
    
    <refnamediv><refname>SET DROP TABLE</refname>
@@ -1580,7 +1596,7 @@
   
 <!-- **************************************** -->
 
-  <refentry id="stmtsetdropsequence"><refmeta><refentrytitle>SET DROP SEQUENCE</refentrytitle>
+  <refentry id="stmtsetdropsequence"><refmeta><refentrytitle>SLONIK SET DROP SEQUENCE</refentrytitle>
    <manvolnum>7</manvolnum></refmeta>
    
    <refnamediv><refname>SET DROP SEQUENCE</refname>
@@ -1616,7 +1632,7 @@
     <programlisting>
      SET DROP SEQUENCE (
      ORIGIN = 1,
-     ID = 20,
+     ID = 20
      );
 </programlisting>
    </refsect1>
@@ -1631,7 +1647,7 @@
   
 <!-- **************************************** -->
   
-  <refentry id="stmtsetmovetable"><refmeta><refentrytitle>SET MOVE
+  <refentry id="stmtsetmovetable"><refmeta><refentrytitle>SLONIK SET MOVE
      TABLE</refentrytitle><manvolnum>7</manvolnum></refmeta>
    
    <refnamediv><refname>SET MOVE TABLE</refname>
@@ -1694,7 +1710,7 @@
 
 <!-- **************************************** -->
 
-  <refentry id="stmtsetmovesequence"><refmeta><refentrytitle>SET MOVE SEQUENCE</refentrytitle>
+  <refentry id="stmtsetmovesequence"><refmeta><refentrytitle>SLONIK SET MOVE SEQUENCE</refentrytitle>
    <manvolnum>7</manvolnum></refmeta>
    
    <refnamediv><refname>SET MOVE SEQUENCE</refname>
@@ -1764,7 +1780,7 @@
 
 <!-- **************************************** -->
 
-  <refentry id="stmtstoretrigger"><refmeta><refentrytitle>STORE TRIGGER</refentrytitle>
+  <refentry id="stmtstoretrigger"><refmeta><refentrytitle>SLONIK STORE TRIGGER</refentrytitle>
    <manvolnum>7</manvolnum></refmeta>
 
    <refnamediv><refname>STORE TRIGGER</refname>
@@ -1845,7 +1861,7 @@
 
 <!-- **************************************** -->
 
-  <refentry id="stmtdroptrigger"><refmeta><refentrytitle>DROP TRIGGER</refentrytitle>
+  <refentry id="stmtdroptrigger"><refmeta><refentrytitle>SLONIK DROP TRIGGER</refentrytitle>
    <manvolnum>7</manvolnum></refmeta>
    
    <refnamediv><refname>DROP TRIGGER</refname>
@@ -1913,7 +1929,7 @@
   </refentry>
   
 <!-- **************************************** -->
-  <refentry id="stmtsubscribeset"><refmeta><refentrytitle>SUBSCRIBE SET</refentrytitle>
+  <refentry id="stmtsubscribeset"><refmeta><refentrytitle>SLONIK SUBSCRIBE SET</refentrytitle>
    <manvolnum>7</manvolnum></refmeta>
 
    <refnamediv><refname>SUBSCRIBE SET</refname>
@@ -2145,7 +2161,7 @@
   
 <!-- **************************************** -->
 
-  <refentry id="stmtunsubscribeset"><refmeta><refentrytitle>UNSUBSCRIBE SET</refentrytitle>
+  <refentry id="stmtunsubscribeset"><refmeta><refentrytitle>SLONIK UNSUBSCRIBE SET</refentrytitle>
    <manvolnum>7</manvolnum></refmeta>
    
    <refnamediv><refname>UNSUBSCRIBE SET</refname>
@@ -2210,7 +2226,7 @@
   
 <!-- **************************************** -->
 
-  <refentry id ="stmtlockset"><refmeta><refentrytitle>LOCK SET</refentrytitle>
+  <refentry id ="stmtlockset"><refmeta><refentrytitle>SLONIK LOCK SET</refentrytitle>
    <manvolnum>7</manvolnum></refmeta>
 
    <refnamediv><refname>LOCK SET</refname>
@@ -2285,7 +2301,7 @@
 
 <!-- **************************************** -->
 
-  <refentry id="stmtunlockset"><refmeta><refentrytitle>UNLOCK SET</refentrytitle>
+  <refentry id="stmtunlockset"><refmeta><refentrytitle>SLONIK UNLOCK SET</refentrytitle>
    <manvolnum>7</manvolnum></refmeta>
    
    <refnamediv><refname>UNLOCK SET</refname>
@@ -2338,7 +2354,7 @@
 
 <!-- **************************************** -->
 
-  <refentry id="stmtmoveset"><refmeta><refentrytitle>MOVE SET</refentrytitle>
+  <refentry id="stmtmoveset"><refmeta><refentrytitle>SLONIK MOVE SET</refentrytitle>
    <manvolnum>7</manvolnum></refmeta>
    
    <refnamediv><refname>MOVE SET</refname>
@@ -2428,7 +2444,7 @@
 
 <!-- **************************************** -->
 
-  <refentry id="stmtfailover"><refmeta><refentrytitle>FAILOVER</refentrytitle>
+  <refentry id="stmtfailover"><refmeta><refentrytitle>SLONIK FAILOVER</refentrytitle>
    <manvolnum>7</manvolnum></refmeta>
    
    <refnamediv><refname>FAILOVER</refname>
@@ -2503,6 +2519,15 @@
      <xref linkend="stmtmoveset"/> car elle n'abandonne
     <emphasis>pas</emphasis> le n&oelig;ud en panne.
     </para>
+
+    <para> If there are many nodes in a cluster, and failover includes
+    dropping out additional nodes (<emphasis>e.g.</emphasis> when it
+    is necessary to treat <emphasis>all</emphasis> nodes at a site
+    including an origin as well as subscribers as failed), it is
+    necessary to carefully sequence the actions, as described in <xref
+    linkend="complexfailover"/>.
+    </para>
+
    </refsect1>
    <refsect1> <title>Note de version</title>
     <para>Cette commande fut introduite dans &slony1; 1.0.</para>
@@ -2513,7 +2538,7 @@
 
 <!-- **************************************** -->
 
-  <refentry id="stmtddlscript"><refmeta><refentrytitle>EXECUTE SCRIPT</refentrytitle>
+  <refentry id="stmtddlscript"><refmeta><refentrytitle>SLONIK EXECUTE SCRIPT</refentrytitle>
    <manvolnum>7</manvolnum></refmeta>
    
    <refnamediv><refname>EXECUTE SCRIPT</refname>
@@ -2665,7 +2690,7 @@
 
 <!-- **************************************** -->
 
-  <refentry id="stmtupdatefunctions"><refmeta><refentrytitle>UPDATE FUNCTIONS</refentrytitle>
+  <refentry id="stmtupdatefunctions"><refmeta><refentrytitle>SLONIK UPDATE FUNCTIONS</refentrytitle>
    <manvolnum>7</manvolnum></refmeta>
 
    <refnamediv><refname>UPDATE FUNCTIONS</refname>
@@ -2735,7 +2760,7 @@
 
 <!-- **************************************** -->
 
-  <refentry id="stmtwaitevent"><refmeta><refentrytitle>WAIT FOR EVENT</refentrytitle>
+  <refentry id="stmtwaitevent"><refmeta><refentrytitle>SLONIK WAIT FOR EVENT</refentrytitle>
    <manvolnum>7</manvolnum></refmeta>
 
    <refnamediv><refname>WAIT FOR EVENT</refname>
@@ -2847,7 +2872,7 @@
 
 <!-- **************************************** -->
 
-  <refentry id="stmtrepairconfig"><refmeta><refentrytitle>REPAIR CONFIG</refentrytitle>
+  <refentry id="stmtrepairconfig"><refmeta><refentrytitle>SLONIK REPAIR CONFIG</refentrytitle>
    <manvolnum>7</manvolnum></refmeta>
 
    <refnamediv><refname>REPAIR CONFIG</refname>
@@ -2903,7 +2928,7 @@
   </refentry>
 <!-- **************************************** -->
 
-  <refentry id="stmtsync"><refmeta><refentrytitle>SYNC</refentrytitle>
+  <refentry id="stmtsync"><refmeta><refentrytitle>SLONIK SYNC</refentrytitle>
    <manvolnum>7</manvolnum></refmeta>
 
    <refnamediv><refname>SYNC</refname>
@@ -2946,7 +2971,7 @@
 
 <!-- **************************************** -->
   
-  <refentry id ="stmtsleep"><refmeta><refentrytitle>SLEEP</refentrytitle>
+  <refentry id ="stmtsleep"><refmeta><refentrytitle>SLONIK SLEEP</refentrytitle>
    <manvolnum>7</manvolnum></refmeta>
    
    <refnamediv><refname>SLEEP</refname>
@@ -2975,7 +3000,7 @@
    </refsect1>
   </refentry>
 
-  <refentry id ="stmtcloneprepare"><refmeta><refentrytitle>CLONE PREPARE</refentrytitle>
+  <refentry id ="stmtcloneprepare"><refmeta><refentrytitle>SLONIK CLONE PREPARE</refentrytitle>
    <manvolnum>7</manvolnum></refmeta>
    
    <refnamediv><refname>CLONE PREPARE</refname>
@@ -3021,7 +3046,7 @@
     <para>Cette commande fut introduite dans &slony1; 1.2.0.</para>
    </refsect1>
   </refentry>
-  <refentry id ="stmtclonefinish"><refmeta><refentrytitle>CLONE FINISH</refentrytitle>
+  <refentry id ="stmtclonefinish"><refmeta><refentrytitle>SLONIK CLONE FINISH</refentrytitle>
     <manvolnum>7</manvolnum></refmeta>
     <refnamediv><refname>CLONE FINISH</refname>
       <refpurpose>Termine le clonage d'un n&oelig;ud.</refpurpose>

Modified: traduc/trunk/slony/version.xml
===================================================================
--- traduc/trunk/slony/version.xml	2009-05-22 20:27:43 UTC (rev 1327)
+++ traduc/trunk/slony/version.xml	2009-05-22 21:03:30 UTC (rev 1328)
@@ -1,2 +1,2 @@
-<!ENTITY version "2.0.0">
+<!ENTITY version "2.0.2">
 <!ENTITY majorversion "2.0">



Plus d'informations sur la liste de diffusion Trad