rbd-mirror: use active/active policy by default

Fixes: http://tracker.ceph.com/issues/38453
Signed-off-by: Jason Dillaman <dillaman@redhat.com>

diff --git a/doc/releases/nautilus.rst b/doc/releases/nautilus.rst
index c4748f6d2d05828b7bfee429c70fbcbd2666bca7..e55315517da3431495b0614fbd7728532aeab7c4 100644 (file)
--- 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 a027b2291184c3dbc149b463e9fd5270c81b6400..7aa8d548c91e5d029cde3c264667ab48fc09d13f 100644 (file)
--- 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-policy-none.yaml b/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-policy-none.yaml
new file mode 100644 (file)
index 0000000..eff20a9
--- /dev/null
+++ b/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-policy-none.yaml
@@ -0,0 +1,16 @@
+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:
+      cluster1.client.mirror: [rbd/rbd_mirror.sh]
+    env:
+      # override workunit setting of CEPH_ARGS='--cluster'
+      CEPH_ARGS: ''
+      RBD_MIRROR_INSTANCES: '4'
+      RBD_MIRROR_USE_EXISTING_CLUSTER: '1'

diff --git a/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-policy-simple.yaml b/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-policy-simple.yaml
new file mode 100644 (file)
index 0000000..8581421
--- /dev/null
+++ b/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-policy-simple.yaml
@@ -0,0 +1,16 @@
+meta:
+- desc: run the rbd_mirror.sh workunit to test the rbd-mirror daemon
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd mirror image policy type: simple
+tasks:
+- workunit:
+    clients:
+      cluster1.client.mirror: [rbd/rbd_mirror.sh]
+    env:
+      # override workunit setting of CEPH_ARGS='--cluster'
+      CEPH_ARGS: ''
+      RBD_MIRROR_INSTANCES: '4'
+      RBD_MIRROR_USE_EXISTING_CLUSTER: '1'

diff --git a/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-simple-policy.yaml b/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-simple-policy.yaml
deleted file mode 100644 (file)
index 8581421..0000000
--- a/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-simple-policy.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-meta:
-- desc: run the rbd_mirror.sh workunit to test the rbd-mirror daemon
-overrides:
-  ceph:
-    conf:
-      client:
-        rbd mirror image policy type: simple
-tasks:
-- workunit:
-    clients:
-      cluster1.client.mirror: [rbd/rbd_mirror.sh]
-    env:
-      # override workunit setting of CEPH_ARGS='--cluster'
-      CEPH_ARGS: ''
-      RBD_MIRROR_INSTANCES: '4'
-      RBD_MIRROR_USE_EXISTING_CLUSTER: '1'

diff --git a/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit.yaml b/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit.yaml
deleted file mode 100644 (file)
index 8ae338d..0000000
--- a/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-meta:
-- desc: run the rbd_mirror.sh workunit to test the rbd-mirror daemon
-tasks:
-- workunit:
-    clients:
-      cluster1.client.mirror: [rbd/rbd_mirror.sh]
-    env:
-      # override workunit setting of CEPH_ARGS='--cluster'
-      CEPH_ARGS: ''
-      RBD_MIRROR_INSTANCES: '4'
-      RBD_MIRROR_USE_EXISTING_CLUSTER: '1'

diff --git a/src/common/options.cc b/src/common/options.cc
index 07345d8f146966ca9285ab073783f858a923a8be..d5fc6d899095615de2dfd5a092635110d18d8ec0 100644 (file)
--- 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"),