From: Kefu Chai <kchai@redhat.com>
Date: Sun, 1 Nov 2020 03:14:48 +0000 (+0800)
Subject: crimson/osd: drop ShardServices::_sent_pg_temp()
X-Git-Tag: v16.1.0~716^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dbbd2d32f3abfa22023eed3e29d12cdf1e2b64cd;p=ceph.git

crimson/osd: drop ShardServices::_sent_pg_temp()

there is no need to define a wrapper for moving pg_temp_wanted to
pg_temp_pending. and it hurts the readability.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/osd/shard_services.cc b/src/crimson/osd/shard_services.cc
index e96a8e6ca888..4e393df84461 100644
--- a/src/crimson/osd/shard_services.cc
+++ b/src/crimson/osd/shard_services.cc
@@ -161,17 +161,12 @@ void ShardServices::remove_want_pg_temp(pg_t pgid)
   pg_temp_pending.erase(pgid);
 }
 
-void ShardServices::_sent_pg_temp()
-{
-  pg_temp_pending.merge(pg_temp_wanted);
-}
-
 void ShardServices::requeue_pg_temp()
 {
   unsigned old_wanted = pg_temp_wanted.size();
   unsigned old_pending = pg_temp_pending.size();
-  _sent_pg_temp();
-  pg_temp_wanted.swap(pg_temp_pending);
+  pg_temp_wanted.merge(pg_temp_pending);
+  pg_temp_pending.clear();
   logger().debug(
     "{}: {} + {} -> {}",
     __func__ ,
@@ -213,7 +208,8 @@ seastar::future<> ShardServices::send_pg_temp()
 	return seastar::now();
       }
     }).then([this] {
-      _sent_pg_temp();
+      pg_temp_pending.merge(pg_temp_wanted);
+      pg_temp_wanted.clear();
     });
 }
 
diff --git a/src/crimson/osd/shard_services.h b/src/crimson/osd/shard_services.h
index 934e91437113..2957639c6347 100644
--- a/src/crimson/osd/shard_services.h
+++ b/src/crimson/osd/shard_services.h
@@ -142,7 +142,6 @@ private:
   };
   map<pg_t, pg_temp_t> pg_temp_wanted;
   map<pg_t, pg_temp_t> pg_temp_pending;
-  void _sent_pg_temp();
   friend std::ostream& operator<<(std::ostream&, const pg_temp_t&);
 public:
   void queue_want_pg_temp(pg_t pgid, const vector<int>& want,