diff options
| author | Sage Weil <sage@inktank.com> | 2013-07-21 17:16:10 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-07-21 17:16:10 -0700 |
| commit | c4193013d5e6fdf480fa9e9b14fec5c748c7f87d (patch) | |
| tree | f65f1eea44d5ec7cf95efd9ee15f125f3a28ee11 /src/mon/OSDMonitor.h | |
| parent | 6d386bda93099dc2e450cde7139487b5983f8889 (diff) | |
| parent | 73b4003f6545ae1ed9efd3abc3b25bd3ebd73c46 (diff) | |
| download | ceph-wip-5672.tar.gz | |
Merge remote-tracking branch 'gh/next' into wip-5672wip-5672
Diffstat (limited to 'src/mon/OSDMonitor.h')
| -rw-r--r-- | src/mon/OSDMonitor.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h index d6553228321..d7cb8fdf369 100644 --- a/src/mon/OSDMonitor.h +++ b/src/mon/OSDMonitor.h @@ -118,8 +118,6 @@ public: OSDMap osdmap; private: - map<epoch_t, list<PaxosServiceMessage*> > waiting_for_map; - // [leader] OSDMap::Incremental pending_inc; map<int, failure_info_t> failure_info; @@ -192,7 +190,6 @@ private: bool can_mark_in(int o); // ... - void send_to_waiting(); // send current map to waiters. MOSDMap *build_latest_full(); MOSDMap *build_incremental(epoch_t first, epoch_t last); void send_full(PaxosServiceMessage *m); @@ -212,7 +209,7 @@ private: bool prepare_failure(class MOSDFailure *m); bool prepare_mark_me_down(class MOSDMarkMeDown *m); void process_failures(); - void kick_all_failures(); + void take_all_failures(list<MOSDFailure*>& ls); bool preprocess_boot(class MOSDBoot *m); bool prepare_boot(class MOSDBoot *m); |