]> git.apps.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)
committerSage Weil <sage@redhat.com>
Thu, 7 Jun 2018 19:20:55 +0000 (14:20 -0500)
Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/PG.h

index 083056dff825c2c49029a03205bac32542a74404..c9656412b38c769242d40628f119ec9592d4efa2 100644 (file)
@@ -1033,6 +1033,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));
+    }
   };
 protected:
 
@@ -1994,8 +2000,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;