mon: fix crush_ops.sh tests

Make it work.  Also, make note that these aren't handled idempotently by
the mon currently.  Doh!

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

diff --git a/qa/workunits/mon/crush_ops.sh b/qa/workunits/mon/crush_ops.sh
index 05bc87108df223c93caa22edf0dd82a7fbcd19d1..536c3d12934e98a9c0e2418e8d0ef186355c7fad 100755 (executable)
--- a/qa/workunits/mon/crush_ops.sh
+++ b/qa/workunits/mon/crush_ops.sh
@@ -36,27 +36,32 @@ ceph osd tree | grep -c osd.$o1 | grep -q 2
 ceph osd tree | grep -c host1 | grep -q 2
 ceph osd tree | grep -c osd.$o2 | grep -q 2
 ceph osd tree | grep -c host2 | grep -q 2
+# FIXME: these should be idempotent!
 ceph osd crush rm host1 foo && exit 1 || true   # not empty
 ceph osd crush unlink host1 foo
+# FIXME: these should be idempotent!
 ceph osd crush unlink host1 foo && exit 1 || true # not there anymore
 ceph osd tree | grep -c host1 | grep -q 1
 
+# FIXME: these should be idempotent!
 ceph osd crush rm foo && exit 1 || true
 ceph osd crush rm bar && exit 1 || true
 ceph osd crush unlink host1 bar
 ceph osd tree | grep -c host1 | grep -q 1   # now an orphan
-ceph osd crush rm osd.1 host1
+ceph osd crush rm osd.$o1 host1
 ceph osd crush rm host1
 ceph osd tree | grep -c host1 | grep -q 0
 
+# FIXME: these should be idempotent!
 ceph osd crush rm bar && exit 1 || true
 ceph osd crush unlink host2
 ceph osd crush rm bar
 ceph osd crush rm foo
 ceph osd crush rm osd.$o2 host2
 ceph osd crush rm host2
-ceph osd crush rm osd.$o1
-ceph osd crush rm osd.$o2
-ceph osd crush rm osd.$o2 && exti 1 || true
+
+# FIXME: these should be idempotent!
+ceph osd crush rm osd.$o1 && exit 1 || true
+ceph osd crush rm osd.$o2 && exit 1 || true
 
 echo OK