From a6b5950c86d084e747751375d2a7d9ec83738b72 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 9 May 2019 15:57:36 -0400 Subject: [PATCH] doc/rgw: document use of 'realm pull' instead of 'period pull' 'radosgw-admin period pull' fetches a period configuration, but does not update the realm's current_period to use it. the 'realm pull' command does both, and the difference is especially important in the failover case Fixes: http://tracker.ceph.com/issues/39655 Signed-off-by: Casey Bodley (cherry picked from commit f0059614b8e7055e4f1d6dfdefe362e2e81815ef) --- doc/radosgw/multisite.rst | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/doc/radosgw/multisite.rst b/doc/radosgw/multisite.rst index 181718bd5849..5665c837effb 100644 --- a/doc/radosgw/multisite.rst +++ b/doc/radosgw/multisite.rst @@ -337,14 +337,17 @@ Pull the Realm -------------- Using the URL path, access key and secret of the master zone in the -master zone group, pull the realm to the host. To pull a non-default -realm, specify the realm using the ``--rgw-realm`` or ``--realm-id`` -configuration options. +master zone group, pull the realm configuration to the host. To pull a +non-default realm, specify the realm using the ``--rgw-realm`` or +``--realm-id`` configuration options. :: # radosgw-admin realm pull --url={url-to-master-zone-gateway} --access-key={access-key} --secret={secret} +.. note:: Pulling the realm also retrieves the remote's current period + configuration, and makes it the current period on this host as well. + If this realm is the default realm or the only realm, make the realm the default realm. @@ -352,22 +355,6 @@ default realm. # radosgw-admin realm default --rgw-realm={realm-name} -Pull the Period ---------------- - -Using the URL path, access key and secret of the master zone in the -master zone group, pull the period to the host. To pull a period from a -non-default realm, specify the realm using the ``--rgw-realm`` or -``--realm-id`` configuration options. - -:: - - # radosgw-admin period pull --url={url-to-master-zone-gateway} --access-key={access-key} --secret={secret} - - -.. note:: Pulling the period retrieves the latest version of the zone group - and zone configurations for the realm. - Create a Secondary Zone ----------------------- @@ -598,13 +585,13 @@ disaster recovery. If the former master zone recovers, revert the operation. -1. From the recovered zone, pull the period from the current master - zone. +1. From the recovered zone, pull the latest realm configuration + from the current master zone. :: - # radosgw-admin period pull --url={url-to-master-zone-gateway} \ - --access-key={access-key} --secret={secret} + # radosgw-admin realm pull --url={url-to-master-zone-gateway} \ + --access-key={access-key} --secret={secret} 2. Make the recovered zone the master and default zone. -- 2.47.3