From 8cd3062323eaa9d0fe4e8fd2a77b5efe2de02286 Mon Sep 17 00:00:00 2001
From: Mykola Golub <mgolub@suse.com>
Date: Mon, 25 Feb 2019 11:50:00 +0200
Subject: [PATCH] rbd-mirror: use active/active policy by default

Fixes: http://tracker.ceph.com/issues/38453
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---
 doc/releases/nautilus.rst                                    | 5 +++++
 qa/suites/rbd/mirror/workloads/rbd-mirror-ha-workunit.yaml   | 2 ++
 ...or-workunit.yaml => rbd-mirror-workunit-policy-none.yaml} | 5 +++++
 ...le-policy.yaml => rbd-mirror-workunit-policy-simple.yaml} | 0
 src/common/options.cc                                        | 2 +-
 5 files changed, 13 insertions(+), 1 deletion(-)
 rename qa/suites/rbd/mirror/workloads/{rbd-mirror-workunit.yaml => rbd-mirror-workunit-policy-none.yaml} (78%)
 rename qa/suites/rbd/mirror/workloads/{rbd-mirror-workunit-simple-policy.yaml => rbd-mirror-workunit-policy-simple.yaml} (100%)

diff --git a/doc/releases/nautilus.rst b/doc/releases/nautilus.rst
index c4748f6d2d058..e55315517da34 100644
--- a/doc/releases/nautilus.rst
+++ b/doc/releases/nautilus.rst
@@ -356,6 +356,11 @@ These changes occurred between the Mimic and Nautilus releases.
   The secrets can be set using the ``rbd mirror pool peer add`` and
   ``rbd mirror pool peer set`` actions.
 
+* The 'rbd-mirror' daemon will now run in active/active mode by default, where
+  mirrored images are evenly distributed between all active 'rbd-mirror'
+  daemons. To revert to active/passive mode, override the
+  'rbd_mirror_image_policy_type' config key to 'none'.
+
 * The ``ceph mds deactivate`` is fully obsolete and references to it in the docs
   have been removed or clarified.
 
diff --git a/qa/suites/rbd/mirror/workloads/rbd-mirror-ha-workunit.yaml b/qa/suites/rbd/mirror/workloads/rbd-mirror-ha-workunit.yaml
index a027b2291184c..7aa8d548c91e5 100644
--- a/qa/suites/rbd/mirror/workloads/rbd-mirror-ha-workunit.yaml
+++ b/qa/suites/rbd/mirror/workloads/rbd-mirror-ha-workunit.yaml
@@ -3,6 +3,8 @@ meta:
 overrides:
   ceph:
     conf:
+      client:
+        rbd mirror image policy type: none
       # override to make these names predictable
       client.mirror.4:
         admin socket: /var/run/ceph/rbd-mirror.$cluster-$name.asok
diff --git a/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit.yaml b/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-policy-none.yaml
similarity index 78%
rename from qa/suites/rbd/mirror/workloads/rbd-mirror-workunit.yaml
rename to qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-policy-none.yaml
index 8ae338d5ea9e5..eff20a9e2694e 100644
--- a/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit.yaml
+++ b/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-policy-none.yaml
@@ -1,5 +1,10 @@
 meta:
 - desc: run the rbd_mirror.sh workunit to test the rbd-mirror daemon
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd mirror image policy type: none
 tasks:
 - workunit:
     clients:
diff --git a/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-simple-policy.yaml b/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-policy-simple.yaml
similarity index 100%
rename from qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-simple-policy.yaml
rename to qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-policy-simple.yaml
diff --git a/src/common/options.cc b/src/common/options.cc
index 07345d8f14696..d5fc6d8990956 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -7318,7 +7318,7 @@ static std::vector<Option> get_rbd_mirror_options() {
     .set_description("number of failed attempts to acquire lock after missing heartbeats before breaking lock"),
 
     Option("rbd_mirror_image_policy_type", Option::TYPE_STR, Option::LEVEL_ADVANCED)
-    .set_default("none")
+    .set_default("simple")
     .set_enum_allowed({"none", "simple"})
     .set_description("active/active policy type for mapping images to instances"),
 
-- 
2.39.5