]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mon/OSDMonitor: require mon_allow_pool_delete = true to remove pools 4788/head
authorSage Weil <sage@redhat.com>
Fri, 16 Jan 2015 15:54:22 +0000 (07:54 -0800)
committerNathan Cutler <ncutler@suse.com>
Fri, 24 Jul 2015 09:32:48 +0000 (11:32 +0200)
commitf122788b3592da516cdb9f6abdc3383a2e7424a2
tree77d04dc364bfa45f5c97623d8196b49618812a6a
parent57bbc8e630e6611d1ab74b9756c96daf0e91be6b
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 6b982e4cc00f9f201d7fbffa0282f8f3295f2309)

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
src/common/config_opts.h
src/mon/OSDMonitor.cc
src/test/mon/osd-pool-create.sh