From: Loic Dachary Date: Thu, 16 Jul 2015 17:22:29 +0000 (+0200) Subject: tests: test-erasure-code.sh/rados_osds_out_in must wait_for_clean X-Git-Tag: v9.1.0~412^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F5267%2Fhead;p=ceph.git tests: test-erasure-code.sh/rados_osds_out_in must wait_for_clean 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 --- diff --git a/src/test/erasure-code/test-erasure-code.sh b/src/test/erasure-code/test-erasure-code.sh index cbc25bf32558e..8d99bf760564a 100755 --- a/src/test/erasure-code/test-erasure-code.sh +++ b/src/test/erasure-code/test-erasure-code.sh @@ -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