Skip to content

Commit

Permalink
workunits/ceph-helpers.sh: Fixes for FreeBSD
Browse files Browse the repository at this point in the history
 - stat(1) does not have '%T'
 - test compares numeric with -ne
 - Need a bit of delay to get 'osd down' visible

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
  • Loading branch information
wjwithagen committed Nov 23, 2016
1 parent eb8b4c8 commit 46cec5b
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion qa/workunits/ceph-helpers.sh
Expand Up @@ -117,7 +117,8 @@ function test_setup() {
function teardown() {
local dir=$1
kill_daemons $dir KILL
if [ $(stat -f -c '%T' .) == "btrfs" ]; then
if [ `uname` != FreeBSD ] \
&& [ $(stat -f -c '%T' .) == "btrfs" ]; then
__teardown_btrfs $dir
fi
rm -fr $dir
Expand Down Expand Up @@ -285,7 +286,9 @@ function test_kill_daemons() {
# killing just the osd and verify the mon still is responsive
#
kill_daemons $dir TERM osd || return 1

ceph osd dump | grep "osd.0 down" || return 1

#
# kill the mon and verify it cannot be reached
#
Expand Down

0 comments on commit 46cec5b

Please sign in to comment.