diff --git a/doc/images/zone-sync.svg b/doc/images/zone-sync.svg index e0bcb0c5bb8..b73302f5c03 100644 --- a/doc/images/zone-sync.svg +++ b/doc/images/zone-sync.svg @@ -2,24 +2,24 @@ + inkscape:export-ydpi="90" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"> - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + inkscape:window-width="1920" + inkscape:window-height="1011" + inkscape:window-x="0" + inkscape:window-y="32" + inkscape:window-maximized="1" + inkscape:showpageshadow="2" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" /> @@ -16117,1939 +24156,901 @@ image/svg+xml - - - - - - - - + id="layer1" + transform="translate(-147.96869,-187.26927)"> - - - - - - - - - - - - - - - - + id="g93021"> + + + + + + + + - - - - - - - - - - - - - - - - - - - + id="rect82306" + transform="matrix(2.25,0,0,2.25,1741.735,-62.051623)" /> + - - - - US-WEST - - - US-EAST - - - - - - - - - - - - - - - - + id="rect82335" + transform="matrix(2.25,0,0,2.25,1741.735,-62.051623)" /> + + US-WEST + US-EAST + - - - - RADOSGW - - - + id="polygon84308" + transform="matrix(2.25,0,0,2.25,1741.735,-62.051623)" /> + + RADOSGW + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + style="fill:none;stroke:#5e6a71;stroke-width:1.02682;stroke-miterlimit:10;stroke-dasharray:3.07565, 3.07565" + clip-path="url(#clipPath61825)" /> + + + + + + + + + - AP - APP - - - - - - - - - - - - - - - - - - - - - - - - + y="282.81369" + x="261.76285" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.8091px;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';fill:#ffffff">P + + - - RE - S - T - - - - - - - - - - - - - - - - + transform="matrix(3.375,0,0,3.375,2035.6783,-371.22344)" + style="fill:none;stroke:#e6e8e8;stroke-width:0.214;stroke-miterlimit:10" + clip-path="url(#clipPath61773)" /> - - - - RADOSGW - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="polygon84339" + transform="matrix(2.25,0,0,2.25,1741.735,-62.051623)" /> + + RADOSGW + + + + + + + + + + + + + + + + + + + + id="path84722" + transform="matrix(2.25,0,0,2.25,1741.735,-62.051623)" /> - - - - - - - - - - - - + id="line84724" + transform="matrix(2.25,0,0,2.25,1741.735,-62.051623)" /> - - - - N - A - TIV - E - - - - - - - - + id="rect84739" + transform="matrix(2.25,0,0,2.25,1741.735,-62.051623)" /> + + id="path84761" + transform="matrix(2.25,0,0,2.25,1741.735,-62.051623)" /> - - - - - - - - - - - - + id="line84763" + transform="matrix(2.25,0,0,2.25,1741.735,-62.051623)" /> - - - - N - A - TIV - E - - - - MASTER REGION - - - - - MASTERZONE - - SECONDARYZONE - - - - - - - - - - - - - + id="rect84778" + transform="matrix(2.25,0,0,2.25,1741.735,-62.051623)" /> + + + MASTER ZONEGROUP + + + + + MASTERZONE + + SECONDARYZONE - - - - - - - - + id="rect82124" + transform="matrix(3.375,0,0,3.375,2190.045,-371.10773)" /> + id="path82134" + transform="matrix(3.375,0,0,3.375,2190.045,-371.10773)" /> + id="path82136" + transform="matrix(3.375,0,0,3.375,2190.045,-371.10773)" /> + id="circle82138" + transform="matrix(3.375,0,0,3.375,2190.045,-371.10773)" /> + id="circle82140" + transform="matrix(3.375,0,0,3.375,2190.045,-371.10773)" /> + id="circle82142" + transform="matrix(3.375,0,0,3.375,2190.045,-371.10773)" /> + id="circle82144" + transform="matrix(3.375,0,0,3.375,2190.045,-371.10773)" /> + id="path82146" + transform="matrix(3.375,0,0,3.375,2190.045,-371.10773)" /> - - - AP - P - - - - - - - - + id="path82148" + transform="matrix(3.375,0,0,3.375,2190.045,-371.10773)" /> + APP + id="path84646" + transform="matrix(3.375,0,0,3.375,2190.045,-371.10773)" /> - - - - - - - - - - - - + id="line84648" + transform="matrix(3.375,0,0,3.375,2190.045,-371.10773)" /> + + DATASYNC + + MASTER ZONEGROUP - - - - RE - S - T - - DATASYNC - - - MASTER REGION - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="rect82189" + height="64.038002" + width="174.953" + clip-path="url(#clipPath61633)" + y="293.366" + x="-679.57202" + style="fill:url(#SVGID_4530_)" + transform="matrix(1.3542118,0,0,2.25,1132.6869,-62.051623)" /> + + + M - - - - - - - - - - + style="font-size:9.75218px;font-family:ApexSans-Medium;fill:#ffffff" + x="411.10547" + y="668.39728" + clip-path="url(#clipPath61617)">M + + M + style="font-size:9.75218px;font-family:ApexSans-Medium;fill:#ffffff" + x="337.69321" + y="694.37891" + clip-path="url(#clipPath61605)">M + y="628.10437" + x="223.6218" + style="fill:#ffffff" + clip-path="url(#clipPath61601)" /> + y="628.10437" + x="223.6218" + style="fill:none;stroke:#81d0db;stroke-width:0.963;stroke-miterlimit:10" + clip-path="url(#clipPath61597)" /> + y="629.62085" + x="225.13145" + style="fill:#81d0db" + clip-path="url(#clipPath61593)" /> + y="631.09906" + x="226.61653" + style="fill:#ffffff" + clip-path="url(#clipPath61589)" /> - - - - - - - - - - - - - + y="633.75629" + x="229.26932" + style="fill:#ffffff" + clip-path="url(#clipPath61585)" /> + - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + M - - - - - - - - - - - - M - + style="font-size:9.75218px;font-family:ApexSans-Medium;fill:#ffffff" + x="391.19333" + y="668.88776" + clip-path="url(#clipPath60769)">M + + M + + READ ONLY + WRITE / READ + + (United States) + + NATIVE + NATIVE + REST + REST + + + + + + + - - READ ONLY - - - WRITE / READ - - - (United States) - diff --git a/doc/radosgw/multisite.rst b/doc/radosgw/multisite.rst index 846c997281e..b62b25dc32c 100644 --- a/doc/radosgw/multisite.rst +++ b/doc/radosgw/multisite.rst @@ -61,7 +61,7 @@ Diagram - Replication of Object Data Between Zones The replication of object data between zones within a zonegroup looks something like this: -.. image:: ../images/zone-sync2.png +.. image:: ../images/zone-sync.svg :align: center At the top of this diagram, we see two applications (also known as "clients").