New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mgr: fix bugs in init, beacons #14374

Merged
merged 2 commits into from Apr 7, 2017

Conversation

Projects
None yet
2 participants
@liewegas
Member

liewegas commented Apr 6, 2017

No description provided.

@liewegas liewegas requested a review from tchaikov Apr 6, 2017

@liewegas

This comment has been minimized.

Member

liewegas commented Apr 6, 2017

http://pulpito.ceph.com/sage-2017-04-06_17:19:30-rados:thrash-wip-mgr-init---basic-smithi/

the pg dump failures are gone! (and we have a new set of regressions.. but they are in master and unrelated to mgr)

@liewegas

This comment has been minimized.

Member

liewegas commented Apr 6, 2017

retest this please

@@ -159,6 +159,10 @@ bool MgrMonitor::preprocess_beacon(MonOpRequestRef op)
return true;
}
if (!mon->is_leader()) {

This comment has been minimized.

@tchaikov

tchaikov Apr 7, 2017

Contributor

maybe a better fix is to just do the minimum check in MgrMonitor::preprocess_beacon(): just check the cap and fsid, and move the other checks to prepare_beacon(). please note that we update last_beacon[] twice, which does not make sense.

mon/MgrMonitor: send mgr beacons to leader
The leader has the last_beacon map that matters; make sure all
beacons go there.

At the same time drop the somewhat redundant checks in
preprocess_beaon and just send *everything* to prepare_beacon,
which is smart enough to do no update if there is none.

Fixes: http://tracker.ceph.com/issues/19502
Signed-off-by: Sage Weil <sage@redhat.com>
@liewegas

This comment has been minimized.

Member

liewegas commented Apr 7, 2017

updated with simpler fix

@tchaikov tchaikov added the needs-qa label Apr 7, 2017

@liewegas liewegas merged commit b6fdd60 into ceph:master Apr 7, 2017

3 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodifed Submodules submodules for project are unmodified
Details
default Build finished.
Details

@liewegas liewegas deleted the liewegas:wip-mgr-init branch Apr 7, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment