diff options
| author | Sage Weil <sage@inktank.com> | 2014-03-20 09:19:58 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2014-03-20 09:19:58 -0700 |
| commit | b395cb19511d9c9ec77d08c7c47f28a984e9b432 (patch) | |
| tree | 5db2f63929e1b4494a7e72b71dcb6cb1dbf4d136 | |
| parent | bf68dabaaacb2d6b3ebe667d3960586bea73fef1 (diff) | |
| parent | d7284268f908299fbd42bdb56ee0f9eea397a463 (diff) | |
| download | ceph-b395cb19511d9c9ec77d08c7c47f28a984e9b432.tar.gz | |
Merge pull request #1507 from ceph/wip-7733
PG::start_peering_interval: always send_notify if !primary
Reviewed-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/osd/PG.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/osd/PG.cc b/src/osd/PG.cc index a4029f82a0b..3dd8d41c4f7 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -4725,6 +4725,9 @@ void PG::start_peering_interval( assert(!deleting); + // should we tell the primary we are here? + send_notify = !is_primary(); + if (role != oldrole || was_old_primary != is_primary()) { // did primary change? @@ -4747,16 +4750,10 @@ void PG::start_peering_interval( // take active waiters requeue_ops(waiting_for_active); - // should we tell the primary we are here? - send_notify = !is_primary(); - } else { // no role change. // did primary change? if (get_primary() != old_acting_primary) { - // we need to announce - send_notify = true; - dout(10) << *this << " " << oldacting << " -> " << acting << ", acting primary " << old_acting_primary << " -> " << get_primary() |