workunits/ceph-helpers.sh: Fixes for FreeBSD #12085
Conversation
| __teardown_btrfs $dir | ||
| fi | ||
| rm -fr $dir | ||
| } | ||
|
|
||
| function teardown_error() { |
There was a problem hiding this comment.
@dachary
At the moment it is not used in this change, but I have further changes to keep post-mortum in developer-mode. SO this would beter go with that change as well.
| @@ -206,6 +217,8 @@ function test_kill_daemon() { | |||
| kill_daemon $pidfile TERM || return 1 | |||
| done | |||
|
|
|||
| # Wait a bit to get things reported down. | |||
| sleep 3 | |||
There was a problem hiding this comment.
this must not be necessary. If it fails, that should be fixed elsewhere.
There was a problem hiding this comment.
@dachary
I've seen this happen on very loaded hosts. Where there seemed to be a race and ceph-mon had not processed all status updates. Resulting in weird responses here.
But I'll remove it...
There was a problem hiding this comment.
If you ever run into this again, please ping me about it. There is absolutely no reason why timing should be an issue here.
| @@ -608,7 +625,7 @@ function activate_osd() { | |||
| --mark-init=none \ | |||
| $osd_data || return 1 | |||
|
|
|||
| [ "$id" = "$(cat $osd_data/whoami)" ] || return 1 | |||
| [ "$id" -eq "$(cat $osd_data/whoami)" ] || return 1 | |||
There was a problem hiding this comment.
this is cosmetic and I'd rather not have that change in a portability commit
There was a problem hiding this comment.
@dachary
I'll remove it,
Although it is nor really a cosmetic fix. = is a string compair, and I've seen tools output with an extra so that 3 != 3. -eq does not suffer from that. Especially is there are ""'s around.
wjwithagen
force-pushed
the
wip-freebsd-ceph-helpers-2
branch
from
f6bea2a
to
46cec5b
Compare
|
@wjwithagen nit: could you remove the added empty lines as well to keep this commit contained to what is absolutely necessary ? Thanks for being so agreeable ! |
ghost
self-assigned this
- stat(1) does not have '%T' Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
wjwithagen
force-pushed
the
wip-freebsd-ceph-helpers-2
branch
from
46cec5b
to
e4629b3
Compare
|
@dachary |
ghost
merged commit 
Signed-off-by: Willem Jan Withagen wjw@digiware.nl