From 58e03a9b2fb9df9c83ce70bf965dcb49b4cd693a Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Sat, 27 Jan 2018 11:02:23 -0600
Subject: [PATCH] osd: drop explicit calls to osr->flush

These are no longer needed as the implementations do it themselves.

Signed-off-by: Sage Weil <sage@redhat.com>
---
 src/osd/PG.cc                      |  2 --
 src/osd/PrimaryLogPG.cc            |  3 ---
 src/test/objectstore/store_test.cc | 16 ----------------
 3 files changed, 21 deletions(-)

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index e5d7c9f1ed8a1..12c9ff9669136 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -4258,7 +4258,6 @@ int PG::build_scrub_map_chunk(
   while (pos.empty()) {
     pos.deep = deep;
     map.valid_through = info.last_update;
-    ch->flush();
 
     // objects
     vector<ghobject_t> rollback_obs;
@@ -4665,7 +4664,6 @@ void PG::chunky_scrub(ThreadPool::TPHandle &handle)
           hobject_t start = scrubber.start;
 	  hobject_t candidate_end;
 	  vector<hobject_t> objects;
-	  ch->flush();
 	  ret = get_pgbackend()->objects_list_partial(
 	    start,
 	    min,
diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index fc58a5e71e4c6..bba5e454a053b 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -1208,7 +1208,6 @@ void PrimaryLogPG::do_pg_op(OpRequestRef op)
 	}
 
 	hobject_t current = lower_bound;
-	ch->flush();
 	int r = pgbackend->objects_list_partial(
 	  current,
 	  list_size,
@@ -1365,7 +1364,6 @@ void PrimaryLogPG::do_pg_op(OpRequestRef op)
 
 	hobject_t next;
 	hobject_t current = response.handle;
-	ch->flush();
 	int r = pgbackend->objects_list_partial(
 	  current,
 	  list_size,
@@ -13000,7 +12998,6 @@ void PrimaryLogPG::update_range(
   if (bi->version < info.log_tail) {
     dout(10) << __func__<< ": bi is old, rescanning local backfill_info"
 	     << dendl;
-    ch->flush();
     if (last_update_applied >= info.log_tail) {
       bi->version = last_update_applied;
     } else {
diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc
index 745b93e9ae5b4..b4b35081c1a56 100644
--- a/src/test/objectstore/store_test.cc
+++ b/src/test/objectstore/store_test.cc
@@ -2421,7 +2421,6 @@ TEST_P(StoreTest, SimpleAttrTest) {
     r = apply_transaction(store, ch, std::move(t));
     ASSERT_EQ(r, 0);
   }
-  ch->flush();
   {
     bool empty;
     int r = store->collection_empty(ch, &empty);
@@ -2441,7 +2440,6 @@ TEST_P(StoreTest, SimpleAttrTest) {
     r = apply_transaction(store, ch, std::move(t));
     ASSERT_EQ(r, 0);
   }
-  ch->flush();
   {
     bool empty;
     int r = store->collection_empty(ch, &empty);
@@ -2500,7 +2498,6 @@ TEST_P(StoreTest, SimpleListTest) {
     r = apply_transaction(store, ch, std::move(t));
     ASSERT_EQ(r, 0);
   }
-  ch->flush();
   {
     set<ghobject_t> saw;
     vector<ghobject_t> objects;
@@ -2565,7 +2562,6 @@ TEST_P(StoreTest, ListEndTest) {
     r = apply_transaction(store, ch, std::move(t));
     ASSERT_EQ(r, 0);
   }
-  ch->flush();
   {
     ghobject_t end(hobject_t(sobject_t("object_100", CEPH_NOSNAP)),
 		   ghobject_t::NO_GEN, shard_id_t(1));
@@ -2648,7 +2644,6 @@ TEST_P(StoreTest, MultipoolListTest) {
     r = apply_transaction(store, ch, std::move(t));
     ASSERT_EQ(r, 0);
   }
-  ch->flush();
   {
     vector<ghobject_t> objects;
     ghobject_t next, current;
@@ -3318,8 +3313,6 @@ TEST_P(StoreTest, ManyObjectTest) {
     ASSERT_TRUE(!store->stat(ch, *i, &buf));
   }
 
-  ch->flush();
-
   set<ghobject_t> listed, listed2;
   vector<ghobject_t> objects;
   r = store->collection_list(ch, ghobject_t(), ghobject_t::get_max(), INT_MAX, &objects, 0);
@@ -3578,7 +3571,6 @@ public:
   }
   void shutdown() {
     while (1) {
-      ch->flush();
       vector<ghobject_t> objects;
       int r = store->collection_list(ch, ghobject_t(), ghobject_t::get_max(),
 				     10, &objects, 0);
@@ -3617,7 +3609,6 @@ public:
   }
 
   void wait_for_done() {
-    ch->flush();
     Mutex::Locker locker(lock);
     while (in_flight)
       cond.Wait(lock);
@@ -4188,7 +4179,6 @@ public:
     EnterExit ee("scan");
     while (in_flight)
       cond.Wait(lock);
-    ch->flush();
     vector<ghobject_t> objects;
     set<ghobject_t> objects_set, objects_set2;
     ghobject_t next, current;
@@ -4610,7 +4600,6 @@ TEST_P(StoreTest, HashCollisionTest) {
   }
   }
   vector<ghobject_t> objects;
-  ch->flush();
   r = store->collection_list(ch, ghobject_t(), ghobject_t::get_max(), INT_MAX, &objects, 0);
   ASSERT_EQ(r, 0);
   set<ghobject_t> listed(objects.begin(), objects.end());
@@ -4708,7 +4697,6 @@ TEST_P(StoreTest, ScrubTest) {
     ASSERT_EQ(r, 0);
   }
 
-  ch->flush();
   vector<ghobject_t> objects;
   r = store->collection_list(ch, ghobject_t(), ghobject_t::get_max(),
 			     INT_MAX, &objects, 0);
@@ -5184,7 +5172,6 @@ void colsplittest(
     ASSERT_EQ(r, 0);
   }
 
-  ch->flush();
   ObjectStore::Transaction t;
   vector<ghobject_t> objects;
   r = store->collection_list(ch, ghobject_t(), ghobject_t::get_max(),
@@ -5205,7 +5192,6 @@ void colsplittest(
     }
   }
 
-  ch->flush();
   objects.clear();
   r = store->collection_list(tch, ghobject_t(), ghobject_t::get_max(),
 			     INT_MAX, &objects, 0);
@@ -5484,8 +5470,6 @@ TEST_P(StoreTest, BigRGWObjectName) {
     ASSERT_EQ(r, 0);
   }
 
-  ch->flush();
-
   {
     vector<ghobject_t> objects;
     r = store->collection_list(ch, ghobject_t(), ghobject_t::get_max(),
-- 
2.39.5