]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
test: Use feature to get last array element
authorDavid Zafman <dzafman@redhat.com>
Wed, 27 Sep 2017 21:29:25 +0000 (14:29 -0700)
committerDavid Zafman <dzafman@redhat.com>
Fri, 3 Nov 2017 02:02:49 +0000 (19:02 -0700)
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 43e3206de2a20bf17ad9f2b16b7e486804097bf2)

src/test/erasure-code/test-erasure-eio.sh

index 6e105ed89f88f84ee4002da7361d9ec1f5520a9b..55254166bb1fb5b2a24b1e00c8a329a9e328498f 100755 (executable)
@@ -126,13 +126,13 @@ function rados_put_get() {
         # recovery didn't crash the primary.
         #
         local -a initial_osds=($(get_osds $poolname $objname))
-        local last=$((${#initial_osds[@]} - 1))
+        local last_osd=${initial_osds[-1]}
         # Kill OSD
-        kill_daemons $dir TERM osd.${initial_osds[$last]} >&2 < /dev/null || return 1
-        ceph osd out ${initial_osds[$last]} || return 1
-        ! get_osds $poolname $objname | grep '\<'${initial_osds[$last]}'\>' || return 1
-        ceph osd in ${initial_osds[$last]} || return 1
-        run_osd $dir ${initial_osds[$last]} || return 1
+        kill_daemons $dir TERM osd.${last_osd} >&2 < /dev/null || return 1
+        ceph osd out ${last_osd} || return 1
+        ! get_osds $poolname $objname | grep '\<'${last_osd}'\>' || return 1
+        ceph osd in ${last_osd} || return 1
+        run_osd $dir ${last_osd} || return 1
         wait_for_clean || return 1
     fi