From: Jason Dillaman <dillaman@redhat.com>
Date: Mon, 8 Oct 2018 18:08:30 +0000 (-0400)
Subject: rbd-mirror: re-use pool config override helper method
X-Git-Tag: v14.0.1~91^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=03faf68d8fd4b73db6ef2c8476265e384707a480;p=ceph.git

rbd-mirror: re-use pool config override helper method

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/test/rbd_mirror/test_mock_PoolReplayer.cc b/src/test/rbd_mirror/test_mock_PoolReplayer.cc
index c7f0909cd518..8e6f80bf5d39 100644
--- a/src/test/rbd_mirror/test_mock_PoolReplayer.cc
+++ b/src/test/rbd_mirror/test_mock_PoolReplayer.cc
@@ -36,9 +36,8 @@ namespace api {
 template <>
 class Config<MockTestImageCtx> {
 public:
-  static int list(librados::IoCtx& io_ctx,
-                  std::vector<config_option_t> *options) {
-    return 0;
+  static void apply_pool_overrides(librados::IoCtx& io_ctx,
+                                   ConfigProxy* config_proxy) {
   }
 };
 
diff --git a/src/tools/rbd_mirror/PoolReplayer.cc b/src/tools/rbd_mirror/PoolReplayer.cc
index 8d0ec509df18..a98a101f9830 100644
--- a/src/tools/rbd_mirror/PoolReplayer.cc
+++ b/src/tools/rbd_mirror/PoolReplayer.cc
@@ -1,4 +1,4 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+
 // vim: ts=8 sw=2 smarttab
 
 #include "PoolReplayer.h"
@@ -306,20 +306,8 @@ void PoolReplayer<I>::init()
     return;
   }
 
-  std::vector<librbd::config_option_t> options;
-  r = librbd::api::Config<I>::list(m_local_io_ctx, &options);
-  if (r < 0) {
-    derr << "error listing local pool config overrides: " << cpp_strerror(r)
-         << dendl;
-    return;
-  }
   auto cct = reinterpret_cast<CephContext *>(m_local_io_ctx.cct());
-  for (auto &option : options) {
-    if (option.source == RBD_CONFIG_SOURCE_POOL) {
-      r = cct->_conf.set_val(option.name.c_str(), option.value);
-      assert(r == 0);
-    }
-  }
+  librbd::api::Config<I>::apply_pool_overrides(m_local_io_ctx, &cct->_conf);
 
   std::string local_mirror_uuid;
   r = librbd::cls_client::mirror_uuid_get(&m_local_io_ctx,
diff --git a/src/tools/rbd_mirror/image_replayer/PrepareRemoteImageRequest.h b/src/tools/rbd_mirror/image_replayer/PrepareRemoteImageRequest.h
index e0b4898cac3f..d93605109b88 100644
--- a/src/tools/rbd_mirror/image_replayer/PrepareRemoteImageRequest.h
+++ b/src/tools/rbd_mirror/image_replayer/PrepareRemoteImageRequest.h
@@ -68,6 +68,7 @@ public:
     : m_threads(threads), m_remote_io_ctx(remote_io_ctx),
       m_global_image_id(global_image_id),
       m_local_mirror_uuid(local_mirror_uuid), m_local_image_id(local_image_id),
+      m_journal_settings(journal_settings),
       m_remote_mirror_uuid(remote_mirror_uuid),
       m_remote_image_id(remote_image_id),
       m_remote_journaler(remote_journaler), m_client_state(client_state),