From: Mykola Golub <mgolub@suse.com>
Date: Fri, 17 May 2019 15:05:46 +0000 (+0100)
Subject: rbd-mirror: remove rbd_mirror_journal_max_fetch_bytes option
X-Git-Tag: v15.1.0~2445^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1ef12ea0d29f95545dc0350143e4a94b115d5e5f;p=ceph.git

rbd-mirror: remove rbd_mirror_journal_max_fetch_bytes option

Signed-off-by: Mykola Golub <mgolub@suse.com>
---

diff --git a/src/common/options.cc b/src/common/options.cc
index b5b26f9915ec..4ec91021c522 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -7415,10 +7415,6 @@ static std::vector<Option> get_rbd_mirror_options() {
     .set_default(5)
     .set_description("maximum age (in seconds) between successive journal polls"),
 
-    Option("rbd_mirror_journal_max_fetch_bytes", Option::TYPE_SIZE, Option::LEVEL_ADVANCED)
-    .set_default(32768)
-    .set_description("maximum bytes to read from each journal data object per fetch"),
-
     Option("rbd_mirror_sync_point_update_age", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
     .set_default(30)
     .set_description("number of seconds between each update of the image sync point object number"),
diff --git a/src/journal/Settings.h b/src/journal/Settings.h
index ca57125a8594..1896ad5285a0 100644
--- a/src/journal/Settings.h
+++ b/src/journal/Settings.h
@@ -10,7 +10,6 @@ namespace journal {
 
 struct Settings {
   double commit_interval = 5;         ///< commit position throttle (in secs)
-  uint64_t max_fetch_bytes = 0;       ///< 0 implies no limit
   uint64_t max_payload_bytes = 0;     ///< 0 implies object size limit
   int max_concurrent_object_sets = 0; ///< 0 implies no limit
   std::set<std::string> whitelisted_laggy_clients;
diff --git a/src/test/journal/RadosTestFixture.cc b/src/test/journal/RadosTestFixture.cc
index 61a9967f75f6..78fadb2b72eb 100644
--- a/src/test/journal/RadosTestFixture.cc
+++ b/src/test/journal/RadosTestFixture.cc
@@ -69,11 +69,9 @@ int RadosTestFixture::create(const std::string &oid, uint8_t order,
 
 journal::JournalMetadataPtr RadosTestFixture::create_metadata(
     const std::string &oid, const std::string &client_id,
-    double commit_interval, uint64_t max_fetch_bytes,
-    int max_concurrent_object_sets) {
+    double commit_interval, int max_concurrent_object_sets) {
   journal::Settings settings;
   settings.commit_interval = commit_interval;
-  settings.max_fetch_bytes = max_fetch_bytes;
   settings.max_concurrent_object_sets = max_concurrent_object_sets;
 
   journal::JournalMetadataPtr metadata(new journal::JournalMetadata(
diff --git a/src/test/journal/RadosTestFixture.h b/src/test/journal/RadosTestFixture.h
index 1b483d459cc1..68a96b7d5d7f 100644
--- a/src/test/journal/RadosTestFixture.h
+++ b/src/test/journal/RadosTestFixture.h
@@ -26,7 +26,6 @@ public:
   journal::JournalMetadataPtr create_metadata(const std::string &oid,
                                               const std::string &client_id = "client",
                                               double commit_internal = 0.1,
-                                              uint64_t max_fetch_bytes = 0,
                                               int max_concurrent_object_sets = 0);
   int append(const std::string &oid, const bufferlist &bl);
 
diff --git a/src/test/journal/test_JournalMetadata.cc b/src/test/journal/test_JournalMetadata.cc
index bdb3107f982a..ce7c1425f15f 100644
--- a/src/test/journal/test_JournalMetadata.cc
+++ b/src/test/journal/test_JournalMetadata.cc
@@ -22,11 +22,9 @@ public:
   journal::JournalMetadataPtr create_metadata(const std::string &oid,
                                               const std::string &client_id,
                                               double commit_interval = 0.1,
-					      uint64_t max_fetch_bytes = 0,
                                               int max_concurrent_object_sets = 0) {
     journal::JournalMetadataPtr metadata = RadosTestFixture::create_metadata(
-      oid, client_id, commit_interval, max_fetch_bytes,
-      max_concurrent_object_sets);
+      oid, client_id, commit_interval, max_concurrent_object_sets);
     m_metadata_list.push_back(metadata);
     metadata->add_listener(&m_listener);
     return metadata;
@@ -128,7 +126,7 @@ TEST_F(TestJournalMetadata, DisconnectLaggyClient) {
 
   int max_concurrent_object_sets = 100;
   journal::JournalMetadataPtr metadata =
-    create_metadata(oid, "client1", 0.1, 0, max_concurrent_object_sets);
+    create_metadata(oid, "client1", 0.1, max_concurrent_object_sets);
   ASSERT_EQ(0, init_metadata(metadata));
   ASSERT_TRUE(wait_for_update(metadata));
 
diff --git a/src/tools/rbd_mirror/ImageReplayer.cc b/src/tools/rbd_mirror/ImageReplayer.cc
index ccf8ef86f049..f3940e8dec0a 100644
--- a/src/tools/rbd_mirror/ImageReplayer.cc
+++ b/src/tools/rbd_mirror/ImageReplayer.cc
@@ -441,8 +441,6 @@ void ImageReplayer<I>::prepare_remote_image() {
   journal::Settings journal_settings;
   journal_settings.commit_interval = cct->_conf.get_val<double>(
     "rbd_mirror_journal_commit_age");
-  journal_settings.max_fetch_bytes = cct->_conf.get_val<Option::size_t>(
-    "rbd_mirror_journal_max_fetch_bytes");
 
   Context *ctx = create_context_callback<
     ImageReplayer, &ImageReplayer<I>::handle_prepare_remote_image>(this);