RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-29 14:34:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

ceph: when osd_location_hook does not exist, we should exit error.

Browse Source 
If the user define "osd crush location hook" in ceph.conf, but the
    osd_location_hook tool does not exist,we should exit error.

Signed-off-by:song baisen <song.baisen@zte.com.cn>
This commit is contained in:
songbaisen 2017-01-16 11:27:07 +08:00
parent 49eafeb573
commit e885500756
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/crush/CrushLocation.cc
View File

@ -42,6 +42,12 @@ int CrushLocation::update_from_hook()
{
if (cct->_conf->crush_location_hook.length() == 0)
return 0;
if (0 != access(cct->_conf->crush_location_hook.c_str(), R_OK)) {
lderr(cct) << "the user define crush location hook: " << cct->_conf->crush_location_hook
<< " may not exist or can not access it" << dendl;
return errno;
}
SubProcessTimed hook(
cct->_conf->crush_location_hook.c_str(),

4
src/init-ceph.in
View File

@ -408,6 +408,10 @@ for name in $what; do
case "${update_crush:-1}" in 1|[Tt][Rr][Uu][Ee])
# update location in crush
get_conf osd_location_hook "$BINDIR/ceph-crush-location" "osd crush location hook"
if [ ! -e "$osd_location_hook" ]; then
EXIT_STATUS=2
continue
fi
osd_location=`$osd_location_hook --cluster $cluster --id $id --type osd`
get_conf osd_weight "" "osd crush initial weight"
defaultweight="$(df -P -k $osd_data/. | tail -1 | awk '{ print sprintf("%.4f",$2/1073741824) }')"