ceph-osd-prestart.sh: drop Upstart-specific code #9667
Conversation
|
LGTM (untested) |
|
I'm not sure we want to do this. Especially when this is considered in conjunction with http://tracker.ceph.com/issues/15990 where we constantly get the ceph-disk failures because we treat this situation as an error and not just a warning. I'd suggest to do the same for 15990 and just warn (not error out) in case one of the devices is not up, yet. |
| stop | ||
| exit 0 | ||
| echo "ceph-osd(${cluster:-ceph}-$id): journal still not present, aborting." 1>&2 | ||
| exit 1 |
There was a problem hiding this comment.
@b-ranto So, change this line to "exit 0" and perhaps change the warning in the previous line to "journal device still not present after 5 seconds; giving up" ?
There was a problem hiding this comment.
I think we should be good if we just dropped the 'stop' line in this PR. The messages at their current 'master' form look sane to me.
smithfarm
changed the title
Before this patch, the ceph-osd-prestart.sh script would do Upstart-specific things if the journal device failed to appear after a 5-second timeout. Fixes: http://tracker.ceph.com/issues/15984 Signed-off-by: Nathan Cutler <ncutler@suse.com>
|
Changelog:
|
|
Hey Jenkins, test this please |
|
@b-ranto Do you think this is OK to merge? |
|
Yup, seems pretty safe (merged it myself). |
http://tracker.ceph.com/issues/15984