From: Sage Weil <sage@inktank.com>
Date: Wed, 17 Jul 2013 16:36:36 +0000 (-0700)
Subject: qa/workunits/cephtest/test.sh: put 'osd ls' before any 'osd create' tests
X-Git-Tag: v0.67-rc1~45
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=56c5b83589ce420fec79019a8182003117967f17;p=ceph.git

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>
---

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index d99821cf1231..a26adcdd2aa2 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