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: Return correct osd_objectstore in OSD metadata #13072

Merged
merged 1 commit into from Jan 25, 2017

Conversation

Projects
None yet
3 participants
@wido
Member

wido commented Jan 23, 2017

Do not simply read the configuration value as it might have changed
during OSD startup by reading the type from disk.

Fixes: #18638
Signed-off-by: Wido den Hollander wido@42on.com

@@ -5115,7 +5115,7 @@ void OSD::_collect_metadata(map<string,string> *pm)
(*pm)["hb_back_addr"] = stringify(hb_back_server_messenger->get_myaddr());
// backend
(*pm)["osd_objectstore"] = cct->_conf->osd_objectstore;
(*pm)["osd_objectstore"] = store->store_type();

This comment has been minimized.

@liewegas

liewegas Jan 23, 2017

Member

store->get_type() should suffice (it already exists). you can drop the rest of the patch

This comment has been minimized.

@liewegas

liewegas Jan 23, 2017

Member

also, please do Fixes: tracker url instead of the #number syntax or else github thinks you're talking about a github PR/issue.

@wido

This comment has been minimized.

Member

wido commented Jan 23, 2017

Fixed @liewegas. Missed that function :)

@liewegas liewegas added the needs-qa label Jan 23, 2017

@liewegas

This comment has been minimized.

Member

liewegas commented Jan 23, 2017

Thanks! Do you mind fixing the Fixes: line in the git commit? Otherwise github can get confused (and close the PR with that id)

@liewegas

This comment has been minimized.

Member

liewegas commented Jan 24, 2017

retest this please

@liewegas

This comment has been minimized.

Member

liewegas commented Jan 24, 2017

retest this please

osd: Return correct osd_objectstore in OSD metadata
Do not simply read the configuration value as it might have changed
during OSD startup by reading the type from disk.

Fixes: http://tracker.ceph.com/issues/18638

Signed-off-by: Wido den Hollander <wido@42on.com>
@wido

This comment has been minimized.

Member

wido commented Jan 24, 2017

@liewegas I pushed a new version of the commit

@wido

This comment has been minimized.

Member

wido commented Jan 24, 2017

I see that the tests now complete.

If we merge this, shall I submit a PR for kraken as well?

@liewegas liewegas merged commit 2947cf3 into ceph:master Jan 25, 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment