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

mon: fix 'mon metadata' for lone monitors, and enable listing all metadata at once #9097

Merged
merged 6 commits into from May 26, 2016

Conversation

jcsp
Copy link
Contributor

@jcsp jcsp commented May 12, 2016

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

@jcsp jcsp changed the title mon: fix 'mon metadata' for lone monitors [DNM] mon: fix 'mon metadata' for lone monitors May 12, 2016
@jcsp
Copy link
Contributor Author

jcsp commented May 12, 2016

Hmm, don't merge just yet, I think I broke the multi-mon case by removing Monitor::metadata

@jcsp jcsp changed the title [DNM] mon: fix 'mon metadata' for lone monitors mon: fix 'mon metadata' for lone monitors May 13, 2016
@jcsp
Copy link
Contributor Author

jcsp commented May 13, 2016

False jenkins failure (it's actually FATAL: org.acegisecurity.providers.UsernamePasswordAuthenticationToken cannot be cast to org.jenkinsci.plugins.GithubAuthenticationToken)

This should be good to go now

@jcsp jcsp added the core label May 13, 2016
@jcsp jcsp changed the title mon: fix 'mon metadata' for lone monitors mon: fix 'mon metadata' for lone monitors, and enable listing all metadata at once May 13, 2016
@tchaikov
Copy link
Contributor

thanks for fixing this.

tested, lgtm!

@tchaikov
Copy link
Contributor

John, could you add the commit of jcsp#1 into your PR?

John Spray and others added 4 commits May 16, 2016 10:56
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>
Same as we already have for osd metadata, where
if you omit the ID you get all daemons.

Signed-off-by: John Spray <john.spray@redhat.com>
Same as mon and osd, leave out ID to get all.

Signed-off-by: John Spray <john.spray@redhat.com>
to avoid copying of the std::map

Signed-off-by: Kefu Chai <kchai@redhat.com>
@jcsp
Copy link
Contributor Author

jcsp commented May 16, 2016

@tchaikov I've merged your commit, thanks

@tchaikov
Copy link
Contributor

lgtm! thanks for merging my change,

@yuriw
Copy link
Contributor

yuriw commented May 20, 2016

@jcsp per IRC with @athanatos, jobs 203924 and 203673 failed in http://pulpito.ceph.com/yuriw-2016-05-19_20:44:04-rados-wip-yuri-testing2-distro-basic-smithi/

Logs of one: /a/yuriw-2016-05-19_20:44:04-rados-wip-yuri-testing2-distro-basic-smithi/203924

2016-05-20T01:31:43.288 INFO:tasks.workunit.client.0.smithi030.stderr:/home/ubuntu/cephtest/workunit.client.0/cephtool/test.sh:798: test_mon_mds: ceph mds metadata
2016-05-20T01:31:43.480 INFO:tasks.workunit.client.0.smithi030.stderr:Error ENOSYS: unrecognized command

John Spray added 2 commits May 21, 2016 22:38
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>
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>
@jcsp jcsp assigned yuriw and unassigned tchaikov May 21, 2016
@jcsp
Copy link
Contributor Author

jcsp commented May 21, 2016

@yuriw I've pushed updates, please retest

@yuriw yuriw added the needs-qa label May 21, 2016
@liewegas liewegas merged commit 08874ee into ceph:master May 26, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants