osd/OSD: small cleanup. curmap will be assigned inside the following loops.

    Signed-off-by: Jie Wang <jie.wang@kylin-cloud.com>

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 97025576026a4bce6c1b2ed32a0477a93e4ba5e9..d805a03e930c69f47a2ac5548fc0ca12b5c4285a 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -9030,7 +9030,7 @@ void OSD::process_peering_events(
 {
   bool need_up_thru = false;
   epoch_t same_interval_since = 0;
-  OSDMapRef curmap = service.get_osdmap();
+  OSDMapRef curmap;
   PG::RecoveryCtx rctx = create_context();
   rctx.handle = &handle;
   for (list<PG*>::const_iterator i = pgs.begin();

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index a79aa161b88c0ab17d77d242a01092ed508eeac0..960013f7fdff797dd2b6e11a440faf35f304fb46 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -1944,6 +1944,7 @@ private:
     void _process(
       const list<PG *> &pgs,
       ThreadPool::TPHandle &handle) override {
+      assert(!pgs.empty());
       osd->process_peering_events(pgs, handle);
       for (list<PG *>::const_iterator i = pgs.begin();
           i != pgs.end();