summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-07-17 09:36:36 -0700
committerSage Weil <sage@inktank.com>2013-07-17 09:36:36 -0700
commit56c5b83589ce420fec79019a8182003117967f17 (patch)
treed99492901a62693f88d7fc4c4f4cd33b6bf260c2
parentad9a1044db392484f5d10afb81cb8d9e34469378 (diff)
downloadceph-56c5b83589ce420fec79019a8182003117967f17.tar.gz
qa/workunits/cephtest/test.sh: put 'osd ls' before any 'osd create' tests
A monc/mon connection fault or the dup command test flag may mean an extra osd id is created that we isn't actually up; reorder so that doesn't screw up 'osd ls'. Signed-off-by: Sage Weil <sage@inktank.com>
-rwxr-xr-xqa/workunits/cephtool/test.sh9
1 files changed, 4 insertions, 5 deletions
diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index d99821cf123..a26adcdd2aa 100755
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -165,6 +165,10 @@ ceph osd getmaxosd | grep 'max_osd = 10'
ceph osd setmaxosd $save
ceph osd getmaxosd | grep "max_osd = $save"
+for id in `ceph osd ls` ; do
+ ceph tell osd.$id version
+done
+
id=`ceph osd create`
ceph osd lost $id --yes-i-really-mean-it
ceph osd rm $id
@@ -189,11 +193,6 @@ ceph osd pool delete data3 data3 --yes-i-really-really-mean-it
ceph osd stat | grep up,
-for id in `ceph osd ls` ; do
- ceph tell osd.$id version
-done
-
-
ceph pg debug unfound_objects_exist
ceph pg debug degraded_pgs_exist
ceph pg deep-scrub 0.0