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.

Sign up for GitHub

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

Jump to bottom

mgr/BaseMgrStandbyModule: parse prefix properly #26920

Merged
merged 2 commits into from Mar 13, 2019
Merged

mgr/BaseMgrStandbyModule: parse prefix properly #26920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e66ed58
mgr/BaseMgrStandbyModule: parse prefix properly
liewegas Mar 12, 2019
ebdd003
qa/tasks/mgr/test_module_selftest: fix localized value test
liewegas Mar 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion qa/tasks/mgr/test_module_selftest.py
View file
Open in desktop
Expand Up @@ -97,7 +97,7 @@ def get_localized_value():
return self.mgr_cluster.mon_manager.raw_cluster_cmd(
"mgr", "self-test", "config", "get_localized", "testkey").strip()

self.assertEqual(get_localized_value(), "None")
self.assertEqual(get_localized_value(), "foo")
self.mgr_cluster.mon_manager.raw_cluster_cmd(
"config", "set", "mgr", "mgr/selftest/{}/testkey".format(
self.mgr_cluster.get_active_id()),
Expand Down
2 changes: 1 addition & 1 deletion src/mgr/BaseMgrStandbyModule.cc
View file
Open in desktop
Expand Up @@ -65,7 +65,7 @@ ceph_get_module_option(BaseMgrStandbyModule *self, PyObject *args)
{
char *what = nullptr;
char *prefix = nullptr;
if (!PyArg_ParseTuple(args, "ss:ceph_get_module_option", &what)) {
if (!PyArg_ParseTuple(args, "ss:ceph_get_module_option", &what, &prefix)) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh man, I complained about the Active-Standby mismatching interfaces, and overlooked the big thing here 🤦‍♂️

Nevertheless, I've filed a separate issue for refactoring this, as the amount of duplicate code in this area is high: http://tracker.ceph.com/issues/38717

derr << "Invalid args!" << dendl;
return nullptr;
}
Expand Down