svn commit - mysqldoc@docsrva: r12452 - in trunk: refman-6.0 refman-common/images/published refman-common/images/source topic-guides/topics-6.0

[jon]

Author: jstephens
Date: 2008-11-13 13:51:44 +0100 (Thu, 13 Nov 2008)
New Revision: 12452

Log:

Rewrote 'Linear' section of replication-solutions-multi-master-upgrade
to remove references (for now) to multi-source replication

Added new diagram

Rebuilt dependencies

(Thanks Dean, Lars, and Bernd!)



Added:
   trunk/refman-common/images/published/rpl-multi-master-linear-4.png
Modified:
   trunk/refman-6.0/Makefile.depends
   trunk/refman-6.0/replication-solutions.xml
   trunk/refman-common/images/source/rpl-multi-master-linear-1.dia
   trunk/topic-guides/topics-6.0/Makefile.depends

Property changes on: trunk/refman-common/images/published/rpl-multi-master-linear-4.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


Modified: trunk/refman-6.0/Makefile.depends
===================================================================
--- trunk/refman-6.0/Makefile.depends	2008-11-13 11:57:19 UTC (rev 12451)
+++ trunk/refman-6.0/Makefile.depends	2008-11-13 12:51:44 UTC (rev 12452)
Changed blocks: 6, Lines Added: 6, Lines Deleted: 6; 3768 bytes

@@ -1394,8 +1394,8 @@
 	../refman-common/images/published/rpl-circular-upgrade-8.png \
 	../refman-common/images/published/rpl-create-select-failure-rbr.png \
 	../refman-common/images/published/rpl-multi-master-linear-1.png \
-	../refman-common/images/published/rpl-multi-master-linear-2.png \
 	../refman-common/images/published/rpl-multi-master-linear-3.png \
+	../refman-common/images/published/rpl-multi-master-linear-4.png \
 	../refman-common/images/published/scaleout.png \
 	../refman-common/images/published/se-federated-structure.png \
 	../refman-common/images/published/stdlb.png \

@@ -1579,8 +1579,8 @@
 	../refman-common/images/published/rpl-circular-upgrade-8.png \
 	../refman-common/images/published/rpl-create-select-failure-rbr.png \
 	../refman-common/images/published/rpl-multi-master-linear-1.png \
-	../refman-common/images/published/rpl-multi-master-linear-2.png \
 	../refman-common/images/published/rpl-multi-master-linear-3.png \
+	../refman-common/images/published/rpl-multi-master-linear-4.png \
 	../refman-common/images/published/scaleout.png \
 	../refman-common/images/published/se-federated-structure.png \
 	../refman-common/images/published/stdlb.png \

@@ -2132,8 +2132,8 @@
 	../refman-common/images/published/rpl-circular-upgrade-7.png \
 	../refman-common/images/published/rpl-circular-upgrade-8.png \
 	../refman-common/images/published/rpl-multi-master-linear-1.png \
-	../refman-common/images/published/rpl-multi-master-linear-2.png \
 	../refman-common/images/published/rpl-multi-master-linear-3.png \
+	../refman-common/images/published/rpl-multi-master-linear-4.png \
 	../refman-common/images/published/scaleout.png \
 	../refman-common/images/published/submaster-performance.png \
 	../refman-common/urls.ent \

@@ -2152,8 +2152,8 @@
 	../refman-common/images/published/rpl-circular-upgrade-7.png \
 	../refman-common/images/published/rpl-circular-upgrade-8.png \
 	../refman-common/images/published/rpl-multi-master-linear-1.png \
-	../refman-common/images/published/rpl-multi-master-linear-2.png \
 	../refman-common/images/published/rpl-multi-master-linear-3.png \
+	../refman-common/images/published/rpl-multi-master-linear-4.png \
 	../refman-common/images/published/scaleout.png \
 	../refman-common/images/published/submaster-performance.png
 replication_solutions_SOURCES = replication-solutions.xml
$(replication_solutions_INCLUDES)

@@ -2190,8 +2190,8 @@
 	../refman-common/images/published/rpl-circular-upgrade-8.png \
 	../refman-common/images/published/rpl-create-select-failure-rbr.png \
 	../refman-common/images/published/rpl-multi-master-linear-1.png \
-	../refman-common/images/published/rpl-multi-master-linear-2.png \
 	../refman-common/images/published/rpl-multi-master-linear-3.png \
+	../refman-common/images/published/rpl-multi-master-linear-4.png \
 	../refman-common/images/published/scaleout.png \
 	../refman-common/images/published/submaster-performance.png \
 	../refman-common/urls.ent \

@@ -2216,8 +2216,8 @@
 	../refman-common/images/published/rpl-circular-upgrade-8.png \
 	../refman-common/images/published/rpl-create-select-failure-rbr.png \
 	../refman-common/images/published/rpl-multi-master-linear-1.png \
-	../refman-common/images/published/rpl-multi-master-linear-2.png \
 	../refman-common/images/published/rpl-multi-master-linear-3.png \
+	../refman-common/images/published/rpl-multi-master-linear-4.png \
 	../refman-common/images/published/scaleout.png \
 	../refman-common/images/published/submaster-performance.png
 replication_SOURCES = replication.xml $(replication_INCLUDES)


Modified: trunk/refman-6.0/replication-solutions.xml
===================================================================
--- trunk/refman-6.0/replication-solutions.xml	2008-11-13 11:57:19 UTC (rev 12451)
+++ trunk/refman-6.0/replication-solutions.xml	2008-11-13 12:51:44 UTC (rev 12452)
Changed blocks: 2, Lines Added: 81, Lines Deleted: 37; 7072 bytes

@@ -1284,56 +1284,100 @@
 
           <para>
             Of greater interest are cases where we actually have
-            multiple masters. There are two variants. The first of these
-            involves multiple masters replicating to a single common
-            slave, as shown here, where servers A and B both replicate
-            to slave C:
+            multiple masters, such as
 
+<!--
+            There are two variants. The first of these occurs
+-->
+
+            when we have a chain of MySQL servers, some of which are
+            acting as both masters and slaves. The following diagram
+            depicts server A replicating to B, which in turn replicates
+            to C; here, B acts as both a master and a slave:
+
             <mediaobject>
               <imageobject>
+                <imagedata contentwidth="500" contentdepth="150"
fileref="../refman-common/images/published/rpl-multi-master-linear-3.png"
format="PNG"/>
+              </imageobject>
+              <textobject>
+                <phrase lang="en">Several MySQL servers replicate to one
+                another in turn</phrase>
+              </textobject>
+            </mediaobject>
+          </para>
+
+<!--
+          <para>
+            The other variant involves multiple masters replicating to a single common
+            slave,
+            as shown here, where servers A and B both replicate to slave C:
+            
+            <mediaobject>
+              <imageobject>
                 <imagedata contentwidth="500" contentdepth="250"
fileref="../refman-common/images/published/rpl-multi-master-linear-2.png"
format="PNG"/>
               </imageobject>
               <textobject>
                 <phrase lang="en">Multiple masters replicate to common
-                slave</phrase>
+                  slave</phrase>
               </textobject>
             </mediaobject>
-
+            
+            This is sometimes known as <firstterm>multi-source
+            replication</firstterm>. However, this is not currently supported
+            by MySQL, although we do intend to add support for it in a future
+            MySQL release. (There do exist some third-party add-ons for
+            multi-source replication, but these are neither supplied nor
+            supported by Sun.)
+          </para>
+          
+          <para>
             Similarly, in a scenario which features a single master
             replicating to several slaves, we need only upgrade all of
-            the slaves first, and then the master.
+            the slaves first &mdash; in any order &mdash; and then the
+            master, as the relationship is still purely linear.
           </para>
+-->
 
           <para>
-            The other variant occurs when we have a chain of MySQL
-            servers, some of which are acting as both master and slaves.
-            The following diagram depicts server A replicating to B,
-            which in turn replicates to C; here, B acts as both a master
-            and a slave:
+            In
 
+<!--
+            all three of these cases
+-->
+
+            this case, the procedure for performing a software upgrade
+            can be developed from the simple principle <quote>upgrade
+            the slave first, then the master</quote>. In other words,
+
+<!--            
+            the first case, 
+-->
+
+            we should
+
+<!--            
+            upgrade B before upgrading A; in
+            the second, we should upgrade C, then upgrade A and B (it
+            does not matter whether we upgrade A or B first); in the
+            third case, we  
+            -->
+
+            start by upgrading the server that acts only as a slave (C),
+            then upgrading its master (B), and so on, until we reach the
+            server acting as a master only (A), upgrade it, and so
+            complete the process. This can easily be extended to cover
+            an arbitrary number of MySQL servers, as shown here:
+
             <mediaobject>
               <imageobject>
-                <imagedata contentwidth="500" contentdepth="150"
fileref="../refman-common/images/published/rpl-multi-master-linear-3.png"
format="PNG"/>
+                <imagedata contentwidth="575" contentdepth="175"
fileref="../refman-common/images/published/rpl-multi-master-linear-4.png"
format="PNG"/>
               </imageobject>
               <textobject>
-                <phrase lang="en">Several MySQL servers replicate to one
-                another in turn</phrase>
+                <phrase lang="en">Arbitrarily long chain of replication
+                masters and slaves</phrase>
               </textobject>
             </mediaobject>
           </para>
-
-          <para>
-            In all three of these cases, the procedure for performing a
-            software upgrade can be developed from the simple principle
-            <quote>upgrade the slave first, then the master</quote>. In
-            the first case, we should upgrade B before upgrading A; in
-            the second, we should upgrade C, then upgrade A and B (it
-            does not matter whether we upgrade A or B first); in the
-            third case, we start by upgrading the server that acts only
-            as a slave (C), then upgrading its master (B), and so on,
-            until we reach the server acting as a master only (A),
-            upgrade it, and so complete the process.
-          </para>
         </listitem>
 
         <listitem>

@@ -1342,15 +1386,15 @@
             <title>Circular replication</title>
 
             <para>
-              In a circular replication setup, each MySQL server acts as
-              both a master and a slave; thus, there is no
-              <quote>last</quote> server which we can use as a starting
-              point to apply <quote>upgrade the slave first, then the
-              master</quote>. We therefore require a different approach
-              to performing the upgrade, and it is for this reason that
-              the rest of this section is devoted to a discussion of
-              upgrading the MySQL server software on several hosts
-              configured in a circular replication setup.
+              In a circular replication setup, <emphasis>each</emphasis>
+              MySQL server acts as both a master and a slave; thus,
+              there is no <quote>last</quote> server which we can use as
+              a starting point to apply <quote>upgrade the slave first,
+              then the master</quote>. We therefore require a different
+              approach to performing the upgrade, and it is for this
+              reason that the rest of this section is devoted to a
+              discussion of upgrading the MySQL server software on
+              several hosts configured in a circular replication setup.
             </para>
 
           </formalpara>


Added: trunk/refman-common/images/published/rpl-multi-master-linear-4.png
===================================================================


Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 363 bytes


Modified: trunk/refman-common/images/source/rpl-multi-master-linear-1.dia
===================================================================


Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 161 bytes


Modified: trunk/topic-guides/topics-6.0/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-6.0/Makefile.depends	2008-11-13 11:57:19 UTC (rev 12451)
+++ trunk/topic-guides/topics-6.0/Makefile.depends	2008-11-13 12:51:44 UTC (rev 12452)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 7275 bytes

@@ -287,8 +287,8 @@
 	../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-8.png \
 	../../refman-6.0/../refman-common/images/published/rpl-create-select-failure-rbr.png \
 	../../refman-6.0/../refman-common/images/published/rpl-multi-master-linear-1.png \
-	../../refman-6.0/../refman-common/images/published/rpl-multi-master-linear-2.png \
 	../../refman-6.0/../refman-common/images/published/rpl-multi-master-linear-3.png \
+	../../refman-6.0/../refman-common/images/published/rpl-multi-master-linear-4.png \
 	../../refman-6.0/../refman-common/images/published/scaleout.png \
 	../../refman-6.0/../refman-common/images/published/submaster-performance.png \
 	../../refman-6.0/replication-configuration-core.xml \

@@ -318,8 +318,8 @@
 	../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-8.png \
 	../../refman-6.0/../refman-common/images/published/rpl-create-select-failure-rbr.png \
 	../../refman-6.0/../refman-common/images/published/rpl-multi-master-linear-1.png \
-	../../refman-6.0/../refman-common/images/published/rpl-multi-master-linear-2.png \
 	../../refman-6.0/../refman-common/images/published/rpl-multi-master-linear-3.png \
+	../../refman-6.0/../refman-common/images/published/rpl-multi-master-linear-4.png \
 	../../refman-6.0/../refman-common/images/published/scaleout.png \
 	../../refman-6.0/../refman-common/images/published/submaster-performance.png
 mysql_replication_excerpt_SOURCES = mysql-replication-excerpt.xml
$(mysql_replication_excerpt_INCLUDES)

@@ -597,7 +597,7 @@
 	$(RM) mysql-solaris-excerpt.xml mysql-solaris-excerpt-arbitrary.xml
 	$(MAKE) mysql-solaris-excerpt.xml
 
-mysql-replication-excerpt-aspec.xml.replication-configuration.none.chapter.xml
mysql-replication-excerpt-aspec.xml.replication-implementation.none.chapter.xml
mysql-replication-excerpt-aspec.xml.replication-notes.none.chapter.xml
mysql-replication-excerpt-aspec.xml.replication-solutions.none.chapter.xml
mysql-replication-excerpt-aspec.xml.replication.all.preface.xml:
../../common/fixedchars.ent ../../common/phrases.ent
../../dynamic-docs/command-optvars/mysqld.xml ../../dynamic-docs/metadata-titles.en.xml
../../refman-6.0/replication-configuration-core.xml ../../refman-6.0/versions.ent
../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent
../../common/phrases.ent ../../refman-6.0/replication-implementation.xml
../../refman-6.0/versions.ent ../../refman-common/urls.ent all-entities.ent
../../common/fixedchars.ent ../../common/phrases.ent
../../refman-6.0/../refman-common/images/published/rpl-create-select-failure-rbr.png
../../refman-6.0/replication-notes!
 .xml ../../refman-6.0/versions.ent ../../refman-common/urls.ent all-entities.ent
../../common/fixedchars.ent ../../common/phrases.ent
../../refman-6.0/../refman-common/images/published/multi-db.png
../../refman-6.0/../refman-common/images/published/redundancy-after.png
../../refman-6.0/../refman-common/images/published/redundancy-before.png
../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-1.png
../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-2.png
../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-3.png
../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-4.png
../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-5.png
../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-6.png
../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-7.png
../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-8.png
../../refman-6.0/../r!
 efman-common/images/published/rpl-multi-master-linear-1.png ..!
 /../refm
an-6.0/../refman-common/images/published/rpl-multi-master-linear-2.png
../../refman-6.0/../refman-common/images/published/rpl-multi-master-linear-3.png
../../refman-6.0/../refman-common/images/published/scaleout.png
../../refman-6.0/../refman-common/images/published/submaster-performance.png
../../refman-6.0/replication-solutions.xml ../../refman-6.0/versions.ent
../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent
../../common/phrases.ent ../../refman-6.0/replication.xml ../../refman-6.0/versions.ent
../../refman-common/urls.ent all-entities.ent
+mysql-replication-excerpt-aspec.xml.replication-configuration.none.chapter.xml
mysql-replication-excerpt-aspec.xml.replication-implementation.none.chapter.xml
mysql-replication-excerpt-aspec.xml.replication-notes.none.chapter.xml
mysql-replication-excerpt-aspec.xml.replication-solutions.none.chapter.xml
mysql-replication-excerpt-aspec.xml.replication.all.preface.xml:
../../common/fixedchars.ent ../../common/phrases.ent
../../dynamic-docs/command-optvars/mysqld.xml ../../dynamic-docs/metadata-titles.en.xml
../../refman-6.0/replication-configuration-core.xml ../../refman-6.0/versions.ent
../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent
../../common/phrases.ent ../../refman-6.0/replication-implementation.xml
../../refman-6.0/versions.ent ../../refman-common/urls.ent all-entities.ent
../../common/fixedchars.ent ../../common/phrases.ent
../../refman-6.0/../refman-common/images/published/rpl-create-select-failure-rbr.png
../../refman-6.0/replication-notes!
 .xml ../../refman-6.0/versions.ent ../../refman-common/urls.ent all-entities.ent
../../common/fixedchars.ent ../../common/phrases.ent
../../refman-6.0/../refman-common/images/published/multi-db.png
../../refman-6.0/../refman-common/images/published/redundancy-after.png
../../refman-6.0/../refman-common/images/published/redundancy-before.png
../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-1.png
../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-2.png
../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-3.png
../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-4.png
../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-5.png
../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-6.png
../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-7.png
../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-8.png
../../refman-6.0/../r!
 efman-common/images/published/rpl-multi-master-linear-1.png ..!
 /../refm
an-6.0/../refman-common/images/published/rpl-multi-master-linear-3.png
../../refman-6.0/../refman-common/images/published/rpl-multi-master-linear-4.png
../../refman-6.0/../refman-common/images/published/scaleout.png
../../refman-6.0/../refman-common/images/published/submaster-performance.png
../../refman-6.0/replication-solutions.xml ../../refman-6.0/versions.ent
../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent
../../common/phrases.ent ../../refman-6.0/replication.xml ../../refman-6.0/versions.ent
../../refman-common/urls.ent all-entities.ent
 	$(RM) mysql-replication-excerpt.xml mysql-replication-excerpt-arbitrary.xml
 	$(MAKE) mysql-replication-excerpt.xml