diff options
| author | Samuel Just <samuel.just@dreamhost.com> | 2012-04-26 15:44:21 -0700 |
|---|---|---|
| committer | Samuel Just <samuel.just@dreamhost.com> | 2012-04-26 15:45:35 -0700 |
| commit | 3e880174dd233a3df88c63785186d36f9b12a137 (patch) | |
| tree | 8c6cdd4c3860bce548939f738d575fe39448bd2b | |
| parent | 7fe45fd65dcf30370a36d32af88751a7f152fb9e (diff) | |
| download | ceph-3e880174dd233a3df88c63785186d36f9b12a137.tar.gz | |
PG: get_infos() should not post GotInfo
The MNotifyRec handler also posts GotInfo under the same conditions
after calling get_infos().
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
| -rw-r--r-- | src/osd/PG.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/osd/PG.cc b/src/osd/PG.cc index ade015804ad..504049a3c58 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -4366,6 +4366,9 @@ PG::RecoveryState::GetInfo::GetInfo(my_context ctx) pg->update_stats(); get_infos(); + if (peer_info_requested.empty() && !prior_set->pg_down) { + post_event(GotInfo()); + } } void PG::RecoveryState::GetInfo::get_infos() @@ -4394,10 +4397,6 @@ void PG::RecoveryState::GetInfo::get_infos() peer_info_requested.insert(peer); } } - - if (peer_info_requested.empty() && !prior_set->pg_down) { - post_event(GotInfo()); - } } boost::statechart::result PG::RecoveryState::GetInfo::react(const MNotifyRec& infoevt) |