mgr/BaseMgrStandbyModule: parse prefix properly #26920
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes: http://tracker.ceph.com/issues/38705 Signed-off-by: Sage Weil <sage@redhat.com>
votdev
approved these changes
Mar 13, 2019
epuertat
approved these changes
Mar 13, 2019
| @@ -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)) { | |||
There was a problem hiding this comment.
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
When mgr/selftest/testkey = foo and mgr/selftest/x/testkey is not set, then get_localized() should return foo. Signed-off-by: Sage Weil <sage@redhat.com>
liewegas
added a commit
that referenced
this pull request
Mar 13, 2019
* refs/pull/26920/head: qa/tasks/mgr/test_module_selftest: fix localized value test mgr/BaseMgrStandbyModule: parse prefix properly Reviewed-by: Volker Theile <vtheile@suse.com> Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: http://tracker.ceph.com/issues/38705
Signed-off-by: Sage Weil sage@redhat.com