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: "mon metadata" fails when only one monitor exists #10654

Merged
4 commits merged into from Aug 25, 2016
Merged

jewel: mon: "mon metadata" fails when only one monitor exists #10654

4 commits merged into from Aug 25, 2016

Conversation

ghost
Copy link

@ghost ghost commented Aug 10, 2016

John Spray and others added 4 commits August 10, 2016 12:28
Previously, writing to the store was only
triggered when MMonMetadata was received
from peers, so if you had a single mon then
you would always get ENOENT from "mon metadata"

Fixes: http://tracker.ceph.com/issues/15866
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 93ab00c)
to avoid copying of the std::map

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit dd67eaa)
Because 'r' was set inside loop, these would
fail to set it (leaving ENOSYS) if no
metadata is present.

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 5fe4fe4)

Conflicts:
        src/mon/Monitor.cc and src/mon/MDSMonitor.cc
        changes relate to features that are not backported to jewel
Just because one OSD's metadata is missing,
don't give up on outputting all the other
OSDs' metadata.

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 2c7dd5f)
@ghost ghost added bug-fix core labels Aug 10, 2016
@ghost ghost added this to the jewel milestone Aug 10, 2016
@ghost ghost assigned ghost and jcsp Aug 10, 2016
@ghost
Copy link
Author

ghost commented Aug 10, 2016

@jcsp this is the continuation of #9577 (with @Abhishekvrshny permission ;-). Does it look ok ?

@jcsp
Copy link
Contributor

jcsp commented Aug 10, 2016

Looks fine to me

ghost pushed a commit that referenced this pull request Aug 12, 2016
… one monitor exists

Reviewed-by: Loic Dachary <ldachary@redhat.com>
ghost pushed a commit that referenced this pull request Aug 16, 2016
… one monitor exists

Reviewed-by: Loic Dachary <ldachary@redhat.com>
ghost pushed a commit that referenced this pull request Aug 17, 2016
… one monitor exists

Reviewed-by: Loic Dachary <ldachary@redhat.com>
ghost pushed a commit that referenced this pull request Aug 22, 2016
… one monitor exists

Reviewed-by: Loic Dachary <ldachary@redhat.com>
ghost pushed a commit that referenced this pull request Aug 22, 2016
… one monitor exists

Reviewed-by: Loic Dachary <ldachary@redhat.com>
ghost pushed a commit that referenced this pull request Aug 23, 2016
… one monitor exists

Reviewed-by: Loic Dachary <ldachary@redhat.com>
ghost pushed a commit that referenced this pull request Aug 24, 2016
… one monitor exists

Reviewed-by: Loic Dachary <ldachary@redhat.com>
ghost pushed a commit that referenced this pull request Aug 24, 2016
… one monitor exists

Reviewed-by: Loic Dachary <ldachary@redhat.com>
ghost pushed a commit that referenced this pull request Aug 24, 2016
… one monitor exists

Reviewed-by: Loic Dachary <ldachary@redhat.com>
ghost pushed a commit that referenced this pull request Aug 24, 2016
… one monitor exists

Reviewed-by: Loic Dachary <ldachary@redhat.com>
ghost pushed a commit that referenced this pull request Aug 24, 2016
… one monitor exists

Reviewed-by: Loic Dachary <ldachary@redhat.com>
@ghost ghost merged commit 94eb163 into ceph:jewel Aug 25, 2016
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
Development

Successfully merging this pull request may close these issues.

2 participants