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

tests: add MGR=1 so 'pg dump' won't be blocked #14266

Merged
merged 3 commits into from Mar 31, 2017

Conversation

Projects
None yet
3 participants
@tchaikov
Contributor

tchaikov commented Mar 31, 2017

Signed-off-by: Kefu Chai kchai@redhat.com

tests: add MGR=1 so 'pg dump' won't be blocked
Signed-off-by: Kefu Chai <kchai@redhat.com>

@tchaikov tchaikov added the tests label Mar 31, 2017

@tchaikov tchaikov requested a review from liewegas Mar 31, 2017

tchaikov added some commits Mar 31, 2017

mgr: use OSDMap::get_pg_acting_primary() to get the primary
OSDMap::pg_to_acting_osds() assumes that the "acting" parameter is not
null.

Signed-off-by: Kefu Chai <kchai@redhat.com>
osd/OSDMap: use _pg_to_up_acting_osds() to get_pg_acting_primary()
avoid unnecessary swap() call of vector<int> which will be dropped on
the floor after getting its first element, which can be retrieved using
another parameter using _pg_to_up_acting_osds() directly.

Signed-off-by: Kefu Chai <kchai@redhat.com>

@tchaikov tchaikov added the bug fix label Mar 31, 2017

@@ -498,7 +498,7 @@ bool DaemonServer::handle_command(MCommand *m)
int acting_primary = -1;
entity_inst_t inst;
cluster_state.with_osdmap([&](const OSDMap& osdmap) {
osdmap.pg_to_acting_osds(pgid, nullptr, &acting_primary);
acting_primary = osdmap.get_pg_acting_primary(pgid);

This comment has been minimized.

@tchaikov

tchaikov Mar 31, 2017

Contributor

osdmap.pg_to_acting_osds() segfaults when compiled using -O0 where the returned value of this method is not optimized out, so the compiled does translate return acting->size() to deadly instructions.

@liewegas liewegas added the needs-qa label Mar 31, 2017

@liewegas liewegas merged commit 5954850 into ceph:master Mar 31, 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

@tchaikov tchaikov deleted the tchaikov:wip-require-mgr-for-pg-dump branch Mar 31, 2017

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