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

mon: clean up some osdmon/pgmon interactions #12403

Merged
merged 5 commits into from Dec 29, 2016

Conversation

Projects
None yet
2 participants
@liewegas
Member

liewegas commented Dec 9, 2016

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

@liewegas liewegas requested a review from tchaikov 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 " \

This comment has been minimized.

@tchaikov

tchaikov Dec 9, 2016

Contributor

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.

This comment has been minimized.

@tchaikov

tchaikov Dec 9, 2016

Contributor
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

see https://jenkins.ceph.com/job/ceph-pull-requests/15547/consoleFull#842358957c212b007-e891-4176-9ee7-2f60eca393b7

err = 0;
if (ret)
goto update;
} else {
err = -EINVAL;

This comment has been minimized.

@tchaikov

tchaikov Dec 9, 2016

Contributor

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

see https://jenkins.ceph.com/job/ceph-pull-requests/15547/consoleFull#842358957c212b007-e891-4176-9ee7-2f60eca393b7。

liewegas added some commits Dec 9, 2016

mon/OSDMonitor: remove 'osd thrash' command
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>
mon: drop support for "classic" (dumpling) mons
Signed-off-by: Sage Weil <sage@redhat.com>
mon/OSDMonitor: do not use PGMap to check pg existence
Signed-off-by: Sage Weil <sage@redhat.com>
mon/OSDMonitor: remove obsolete pg[p]_num vs creating pgs restriction
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

This comment has been minimized.

Member

liewegas commented Dec 19, 2016

updated and rebased

@liewegas

This comment has been minimized.

Member

liewegas commented 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?

mon/OSDMonitor: remove workaround for dumpling-era bug
We will definitely have published (and stored) a new osdmap since then.

Signed-off-by: Sage Weil <sage@redhat.com>

@liewegas liewegas merged commit f706819 into ceph:master Dec 29, 2016

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

@liewegas liewegas deleted the liewegas:wip-mon-mgr-cleanups branch Dec 29, 2016

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