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,osd: do not create rbd pool by default #15894

Merged
merged 17 commits into from Jun 29, 2017

Conversation

Projects
None yet
4 participants
@liewegas
Member

liewegas commented Jun 23, 2017

Fix a zillion tests to make that work.

@liewegas liewegas added core rbd labels Jun 23, 2017

@xiexingguo

This comment has been minimized.

Member

xiexingguo commented Jun 24, 2017

\o/

@liewegas

This comment has been minimized.

Member

liewegas commented Jun 26, 2017

retest this please

@liewegas liewegas requested a review from jdurgin Jun 26, 2017

@liewegas

This comment has been minimized.

Member

liewegas commented Jun 26, 2017

retest this please

@liewegas

This comment has been minimized.

Member

liewegas commented Jun 27, 2017

Need to fix the osd-scrub-repair.sh unit test, and needs final review, but otherwise this is ready to merge!

@dzafman

This comment has been minimized.

Member

dzafman commented Jun 27, 2017

@liewegas There is a conflict in upmap.t because a new line was added in master and needs what I assume is a change because of the pool number.

ceph osd pg-upmap-items 0.9e 210 209 27 28

@liewegas

This comment has been minimized.

Member

liewegas commented Jun 27, 2017

gregsfortytwo and others added some commits Jun 14, 2017

src/jobs: remove these definitely-broken old testing scripts
They haven't been touched in 6 years and were considered broken then.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
osdmap: do not automatically create an rbd pool on cluster creation; …
…skip pool 0

We don't use pool ID 0 any more because CephFS can't handle it.
Update the user quick-start to include it, and add some links to support that process.
Fix the tests to handle the new state of life.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
pgmap: extend mon_pg_warn_min_objects to cover the PG-per-OSD warning…
…s too

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
TestOSDMap: actually loop through the pools as intended
Looks like this was meant to be a loop but (unlike the other tests)
just referred to a constant pool 0. Whoops!

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
TestOSDMap: provide more flexibility in the PrimaryAffinity check
Fix the margins for the primary affinity test.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
Signed-off-by: Sage Weil <sage@redhat.com>
cephtool/test: create an rbd pool since it's no longer automatic
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
osdmap: reference the correct value in debug output
Looks like we've been printing out the (possibly-still-default-initialized)
num_osd member variable instead of the given nosd value! Luckily
I don't see any other misuse and we fill out

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
osdmap: maintain a pool-creating build_simple() for use in unit tests
Change the standard build_simple() so it no longer takes pg[p]_num -- these
params were unused. Add a new build_simple_with_pool() that can be called
when we want the rbd pool to be created by default. These are implemented
via a simple switched function (marked private).

Update the existing callers so they choose the right one for their needs.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
test: update TestPGLog's pool_id for the new world (no pool 0)
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
qa/workunits/ceph-helpers: shorten mon connect timeout
Signed-off-by: Sage Weil <sage@redhat.com>
qa/tasks/ceph: create rbd pool after starting the osds
Signed-off-by: Sage Weil <sage@redhat.com>
mon/OSDMonitor: do not start mapping job on empty map
The Mapper doesn't do the completion.  Just avoid it in the caller instead
of adding a Finisher or something similarly annoying for the completion.

Signed-off-by: Sage Weil <sage@redhat.com>
test,qa/workunits: fix a zillion tests
Signed-off-by: Sage Weil <sage@redhat.com>
@dzafman

This comment has been minimized.

Member

dzafman commented Jun 29, 2017

@liewegas See 18e87ee...dzafman:wip-no-default-pool-zafman for 3 more commits for this pull request. You can skip the one commit that removes the extra log output.

dzafman added some commits Jun 28, 2017

test: Give time for OSDs to see map with flag change
Signed-off-by: David Zafman <dzafman@redhat.com>
test: Clean up extra json output from log
Signed-off-by: David Zafman <dzafman@redhat.com>
test: Fix osd-scrub-repair for movement of shards
Signed-off-by: David Zafman <dzafman@redhat.com>
@liewegas

This comment has been minimized.

Member

liewegas commented Jun 29, 2017

retest this please

@liewegas liewegas merged commit 5712698 into ceph:master Jun 29, 2017

4 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
default Build finished.
Details
make check make check succeeded
Details

@liewegas liewegas deleted the liewegas:wip-no-default-pool branch Jun 29, 2017

smithfarm added a commit to smithfarm/DeepSea that referenced this pull request Jun 30, 2017

Refrain from creating a demo RBD image
The rbd pool is longer created as of ceph/ceph#15894 -
so don't create a demo image in it, either.

Signed-off-by: Nathan Cutler <ncutler@suse.com>

smithfarm added a commit to SUSE/ceph that referenced this pull request Jul 1, 2017

tests: create rbd pool in rbd/cli_generic.sh
See ceph#15894

Signed-off-by: Nathan Cutler <ncutler@suse.com>

smithfarm added a commit to SUSE/ceph that referenced this pull request Jul 1, 2017

tests: create rbd pool in rbd/cli_generic.sh
See ceph#15894

Signed-off-by: Nathan Cutler <ncutler@suse.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment