Merge pull request #21431 from Songweibin/wip-ec-cleanups

osd: miscellaneous cleanups Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn> Reviewed-by: Sage Weil <sage@redhat.com>
ceph · Apr 16, 2018 · d8d5b31 · d8d5b31
2 parents 661a56b + cfde37c
commit d8d5b31
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 11 deletions.
diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc
@@ -233,7 +233,6 @@ struct OnRecoveryReadComplete :
   public GenContext<pair<RecoveryMessages*, ECBackend::read_result_t& > &> {
   ECBackend *pg;
   hobject_t hoid;
-  set<int> want;
   OnRecoveryReadComplete(ECBackend *pg, const hobject_t &hoid)
     : pg(pg), hoid(hoid) {}
   void finish(pair<RecoveryMessages *, ECBackend::read_result_t &> &in) override {
@@ -2078,9 +2077,7 @@ void ECBackend::objects_read_async(
       sinfo.offset_len_to_stripe_bounds(
 	make_pair(i->first.get<0>(), i->first.get<1>()));
 
-    extent_set esnew;
-    esnew.insert(tmp.first, tmp.second);
-    es.union_of(esnew);
+    es.union_insert(tmp.first, tmp.second);
     flags |= i->first.get<2>();
   }
 
@@ -2192,7 +2189,6 @@ struct CallClientContexts :
     if (res.r != 0)
       goto out;
     assert(res.returned.size() == to_read.size());
-    assert(res.r == 0);
     assert(res.errors.empty());
     for (auto &&read: to_read) {
       pair<uint64_t, uint64_t> adjusted =

diff --git a/src/osd/ECTransaction.cc b/src/osd/ECTransaction.cc
@@ -14,7 +14,6 @@
 
 #include <iostream>
 #include <vector>
-#include <vector>
 #include <sstream>
 
 #include "ECTransaction.h"
@@ -117,10 +116,6 @@ void ECTransaction::generate_transactions(
 
   auto &hash_infos = plan.hash_infos;
 
-  assert(transactions);
-  assert(temp_added);
-  assert(temp_removed);
-
   map<hobject_t, pg_log_entry_t*> obj_to_log;
   for (auto &&i: entries) {
     obj_to_log.insert(make_pair(i.soid, &i));

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
@@ -112,7 +112,6 @@
 
 #include "messages/MOSDScrub.h"
 #include "messages/MOSDScrub2.h"
-#include "messages/MOSDScrubReserve.h"
 #include "messages/MOSDRepScrub.h"
 
 #include "messages/MMonCommand.h"