]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
tests: test-erasure-code.sh/rados_osds_out_in must wait_for_clean 5267/head
authorLoic Dachary <ldachary@redhat.com>
Thu, 16 Jul 2015 17:22:29 +0000 (19:22 +0200)
committerLoic Dachary <ldachary@redhat.com>
Thu, 16 Jul 2015 17:22:29 +0000 (19:22 +0200)
get_osds $poolname $objname must be called after wait_for_clean to
ensure the mapping is final (no pg_temp). Otherwise, depending on how
fast the machine is, a temporary mapping will be returned and it won't
match the final mapping returned later.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
src/test/erasure-code/test-erasure-code.sh

index cbc25bf32558e259c47195e37197e9a99b0d83ca..8d99bf760564a3f92f08ad6595e2e3b9693a3090 100755 (executable)
@@ -125,6 +125,7 @@ function rados_osds_out_in() {
     # implies the PG have been moved to use the remaining OSDs.  Check
     # the object can still be retrieved.
     #
+    wait_for_clean || return 1
     local osds_list=$(get_osds $poolname $objname)
     local -a osds=($osds_list)
     for osd in 0 1 ; do