Skip to content
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

jewel: mon: OSDMonitor: only reject MOSDBoot based on up_from if inst matches #12067

Merged
1 commit merged into from Dec 3, 2016

Conversation

smithfarm
Copy link
Contributor

@smithfarm smithfarm commented Nov 18, 2016

@smithfarm smithfarm added this to the jewel milestone Nov 18, 2016
@smithfarm smithfarm self-assigned this Nov 18, 2016
@smithfarm smithfarm changed the title OSDMonitor: only reject MOSDBoot based on up_from if inst matches jewel: OSDMonitor: only reject MOSDBoot based on up_from if inst matches Nov 18, 2016
@smithfarm smithfarm changed the title jewel: OSDMonitor: only reject MOSDBoot based on up_from if inst matches jewel: mon: OSDMonitor: only reject MOSDBoot based on up_from if inst matches Nov 18, 2016
ghost pushed a commit that referenced this pull request Nov 23, 2016
…ot based on up_from if inst matches

Reviewed-by: Loic Dachary <ldachary@redhat.com>
@ktdreyer
Copy link
Member

@theanalyst , @athanatos , should this go in before v10.2.4?

@athanatos
Copy link
Contributor

I'd like to get this into 10.2.4, but I think this still needs to be tested. @Abhishekvrshny @dachary @smithfarm ?

@ghost
Copy link

ghost commented Dec 1, 2016

@athanatos this is @theanalyst decision, I think.

@ghost
Copy link

ghost commented Dec 2, 2016

It was included in http://tracker.ceph.com/issues/17851#note-9 which had a flawless rados suite run at http://tracker.ceph.com/issues/17851#note-12 . Note however that this is the usual X/2000 designed for pre-merge verification and not the X/50 designed to validate a release.

Beware: if this is merged it will be 10.2.5. To merge it in 10.2.4 the target must be changed from jewel-next to jewel.

@athanatos
Copy link
Contributor

@dachary This should be switched to 10.2.4, can you take care of that?

@ghost ghost changed the base branch from jewel-next to jewel December 2, 2016 16:58
@ghost ghost changed the title jewel: mon: OSDMonitor: only reject MOSDBoot based on up_from if inst matches DNM: jewel: mon: OSDMonitor: only reject MOSDBoot based on up_from if inst matches Dec 2, 2016
@ghost
Copy link

ghost commented Dec 2, 2016

@smithfarm could you please rebase to jewel & repush ? I changed the target branch already, as you can see ;-)

If the osd actually restarts, there is no guarrantee that the epoch will
advance past up_from.  If the inst is different, it can't really be a
dup.  At worst, it might be a queued MOSDBoot from a previous inst, but
in that case, the real inst would see itself marked up, and then back
down causing it to try booting again.

Fixes: http://tracker.ceph.com/issues/17899
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 033ad5b)
@smithfarm
Copy link
Contributor Author

@dachary done

@smithfarm smithfarm changed the title DNM: jewel: mon: OSDMonitor: only reject MOSDBoot based on up_from if inst matches jewel: mon: OSDMonitor: only reject MOSDBoot based on up_from if inst matches Dec 2, 2016
@ghost
Copy link

ghost commented Dec 3, 2016

The flake8 error is the only one and is expected. The rest passes.

ERROR:   flake8: commands failed
  py27: commands succeeded

@ghost ghost merged commit 4d9a28d into ceph:jewel Dec 3, 2016
@smithfarm smithfarm deleted the wip-17953-jewel branch December 3, 2016 10:49
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants