]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/PG: move send_notify() into RecoveryCtx
authorSage Weil <sage@redhat.com>
Thu, 7 Jun 2018 13:20:54 +0000 (08:20 -0500)
committerNathan Cutler <ncutler@suse.com>
Wed, 13 Jun 2018 10:16:41 +0000 (12:16 +0200)
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 856fd0243346ca99fa4a3ba5014a7bcdf2c29450)

src/osd/PG.h

index 932dc51a181c3bd00567c5fc882bac5aee031d55..e042a8afd0a0fed901a5379477fe6866253bdb09 100644 (file)
@@ -698,6 +698,12 @@ public:
        ovec.insert(ovec.end(), i->second.begin(), i->second.end());
       }
     }
+
+    void send_notify(pg_shard_t to,
+                    const pg_notify_t &info, const PastIntervals &pi) {
+      assert(notify_list);
+      (*notify_list)[to.osd].push_back(make_pair(info, pi));
+    }
   };
 
 
@@ -1751,8 +1757,7 @@ protected:
       void send_notify(pg_shard_t to,
                       const pg_notify_t &info, const PastIntervals &pi) {
        assert(state->rctx);
-       assert(state->rctx->notify_list);
-       (*state->rctx->notify_list)[to.osd].push_back(make_pair(info, pi));
+       state->rctx->send_notify(to, info, pi);
       }
     };
     friend class RecoveryMachine;