mon: clean up some osdmon/pgmon interactions #12403
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
liewegas
force-pushed
the
wip-mon-mgr-cleanups
branch
from
28c24d3
to
1ee31a1
Compare
tchaikov
requested changes
Dec 9, 2016
| @@ -790,9 +790,6 @@ COMMAND("osd test-reweight-by-pg " \ | |||
| "name=pools,type=CephPoolname,n=N,req=false", \ | |||
| "dry run of reweight OSDs by PG distribution [overload-percentage-for-consideration, default 120]", \ | |||
| "osd", "rw", "cli,rest") | |||
| COMMAND("osd thrash " \ | |||
| "name=num_epochs,type=CephInt,range=0", \ | |||
| "thrash OSDs for <num_epochs>", "osd", "rw", "cli,rest") | |||
| COMMAND("osd df " \ | |||
There was a problem hiding this comment.
need to remove the test of test_ceph_argparse.TestOSD.test_thrash in src/test/pybind/test_ceph_argparse.py. it uses get_command_descriptions to get the command descriptions. and get_command_description includes mon/MonCommands.h for the list of available mon commands.
There was a problem hiding this comment.
FAIL: test_ceph_argparse.TestOSD.test_thrash
----------------------------------------------------------------------
Traceback (most recent call last):
File "/usr/lib/python2.7/dist-packages/nose/case.py", line 197, in runTest
self.test(*self.arg)
File "/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/pybind/test_ceph_argparse.py", line 1125, in test_thrash
self.check_1_natural_arg('osd', 'thrash')
File "/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/pybind/test_ceph_argparse.py", line 52, in check_1_natural_arg
self.assert_valid_command([prefix, command, '1'])
File "/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/pybind/test_ceph_argparse.py", line 48, in assert_valid_command
assert_not_equal(result,None)
AssertionError: None == None
| err = 0; | ||
| if (ret) | ||
| goto update; | ||
| } else { | ||
| err = -EINVAL; |
There was a problem hiding this comment.
might want to put the
} else {back, otherwise some commands would fail with error of EINVAL if they don't goto reply or goto update.
for instance:
ceph osd reweight-by-utilization 110
2016-12-09 04:35:37.347093 7f19eb809700 -1 WARNING: the following dangerous and experimental features are enabled: *
2016-12-09 04:35:37.356792 7f19eb809700 -1 WARNING: the following dangerous and experimental features are enabled: *
Error EINVAL: no change
b91e919
to
d7aa5ca
Compare
This is a dev hack to generate a bunch of bogus osdmaps. The maps are all screwed up anyway (e.g., invalid addrs) and this is minimally useful. Signed-off-by: Sage Weil <sage@redhat.com>
Signed-off-by: Sage Weil <sage@redhat.com>
Signed-off-by: Sage Weil <sage@redhat.com>
This dates back to the original split code circa 78ddc62 (v0.2) when the creating pg code was a special case. These days we rely on the generic peering code, which has no issues with splits. Signed-off-by: Sage Weil <sage@redhat.com>
liewegas
force-pushed
the
wip-mon-mgr-cleanups
branch
from
d7aa5ca
to
8010f43
Compare
|
updated and rebased |
tchaikov
approved these changes
Dec 27, 2016
|
http://pulpito.ceph.com/sage-2016-12-27_18:31:32-rados-wip-sage-testing---basic-smithi/670924 is due to this. mon sync removed older map, mon hasn't caught up? i think? |
We will definitely have published (and stored) a new osdmap since then. Signed-off-by: Sage Weil <sage@redhat.com>
liewegas
force-pushed
the
wip-mon-mgr-cleanups
branch
from
8010f43
to
c2535c1
Compare
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.
This is some easy baggage to remove to pave the way for mon->mgr changes.
These are all items off this list: http://pad.ceph.com/p/stats-from-mon-to-mgr