]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
ceph-disk: always check zap is applied on a full device 5755/head
authorLoic Dachary <ldachary@redhat.com>
Sun, 31 May 2015 17:42:45 +0000 (19:42 +0200)
committerLoic Dachary <ldachary@redhat.com>
Wed, 2 Sep 2015 06:31:40 +0000 (08:31 +0200)
commita478385334323071b5cfa4d546eef5b0ef43dce7
tree5500888540282c0371fe1f222eaffa12f5d76358
parenta89c1731e0e327acdb876d39df574e27379aaa1e
ceph-disk: always check zap is applied on a full device

zap only makes sense on a full device and this is verified for

    ceph-disk prepare --zap-disk

but not for

    ceph-disk zap

Unify the two and add a test to check that it fails as expected when
trying to zap a directory.

http://tracker.ceph.com/issues/11272 Fixes: #11272

Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit 8e1bcf21f090fc98ac9b495d76614e3012f5872a)

Conflicts:
src/test/ceph-disk.sh : trivial resolution
src/ceph-disk
src/test/ceph-disk.sh