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

osd: fix some osd beacon bugs #14274

Merged
merged 2 commits into from Apr 3, 2017

Conversation

Projects
None yet
4 participants
@liewegas
Member

liewegas commented Mar 31, 2017

No description provided.

liewegas added some commits Mar 31, 2017

osd: fix beacon condition
- && should have been ||
- change this to instead not send when monmap epoch==0,
  and only set last_sent_beacon if we actually send.  That
  way we'll send on the next tick after we get a real monmap.

Signed-off-by: Sage Weil <sage@redhat.com>
osd: only send beacon on connect if active
Otherwise the mon will just ignore it and we'll wait another
cycle.

Signed-off-by: Sage Weil <sage@redhat.com>
@gregsfortytwo

Reviewed-by: Greg Farnum gfarnum@redhat.com

@dmick

This comment has been minimized.

Member

dmick commented Mar 31, 2017

Is there an ||-to-&& change somewhere here I'm not seeing?

@gregsfortytwo

This comment has been minimized.

Member

gregsfortytwo commented Mar 31, 2017

"change this to instead not send when monmap epoch==0"
(emphasis mine)

@liewegas

This comment has been minimized.

Member

liewegas commented Apr 1, 2017

const auto& monmap = monc->monmap;
// send beacon to mon even if we are just connected, and the monmap is not
// initialized yet by then.
if (monmap.epoch == 0 &&
if (monmap.epoch > 0 &&

This comment has been minimized.

@tchaikov

tchaikov Apr 1, 2017

Contributor

right, || is what was intended. maybe we can remove the comment above, which will be confusing then.

@tchaikov tchaikov merged commit d79d85b into ceph:master Apr 3, 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-osd-beacon-fix branch Apr 3, 2017

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