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: Make it more difficult to delete pools in firefly #4788

Merged
merged 1 commit into from Sep 4, 2015

Conversation

Projects
None yet
4 participants
@smithfarm
Contributor

smithfarm commented May 28, 2015

@smithfarm smithfarm added this to the firefly milestone May 28, 2015

@smithfarm smithfarm self-assigned this May 28, 2015

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented May 28, 2015

This backport was requested by Wido.

@wido

This comment has been minimized.

Member

wido commented May 28, 2015

Thanks! Would be great if this made it back into Firefly.

@ghost

This comment has been minimized.

ghost commented May 28, 2015

for the record it was also marked as backport to firefly by sage in the original commit message

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented May 29, 2015

@dachary: rebased to fix 127.0.0.1 - thanks for debugging!

@ghost

This comment has been minimized.

ghost commented Jul 8, 2015

@smithfarm #4788 conflicts with #4635 #4636 #4597, could you make it so they play nice together ?

@ghost ghost changed the title from Make it more difficult to delete pools in firefly to [DNM] Make it more difficult to delete pools in firefly Jul 8, 2015

mon/OSDMonitor: require mon_allow_pool_delete = true to remove pools
This is a simple safety check.  Since we default to true it is currently
opt-in.

Backport: giant, firefly
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 6b982e4)

Conflicts:
     src/test/mon/osd-pool-create.sh

     Changed $CEPH_MON to 127.0.0.1 -- the CEPH_MON was introduced after
     firefly to allow tests to run in parallel. Back in firefly all tests
     use the same port because 127.0.0.1 was hardcoded. We can't
     conveniently backport all that's necessary for tests to run in
     parallel, therefore we keep the 127.0.0.1 hardcoded.

Conflicts:
	src/test/mon/osd-pool-create.sh
            TEST_no_pool_delete() follows a different test than in master
@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jul 24, 2015

@dachary done - can be merged provided make check succeeds

@smithfarm smithfarm changed the title from [DNM] Make it more difficult to delete pools in firefly to Make it more difficult to delete pools in firefly Jul 24, 2015

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Sep 4, 2015

@liewegas Hi, this is a backport of 6b982e4 which you authored and merged. It has passed a rados suite as detailed by http://tracker.ceph.com/issues/11644#rados . Do you think it's ready to merge?

@liewegas

This comment has been minimized.

Member

liewegas commented Sep 4, 2015

👍

smithfarm added a commit that referenced this pull request Sep 4, 2015

Merge pull request #4788 from SUSE/wip-11801-firefly
Make it more difficult to delete pools in firefly

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

@smithfarm smithfarm merged commit 7744518 into ceph:firefly Sep 4, 2015

@smithfarm smithfarm deleted the SUSE:wip-11801-firefly branch Sep 4, 2015

@ghost ghost changed the title from Make it more difficult to delete pools in firefly to mon: Make it more difficult to delete pools in firefly Oct 24, 2015

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