diff options
| author | Sage Weil <sage@inktank.com> | 2013-02-26 11:10:44 -0800 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-02-26 11:10:44 -0800 |
| commit | 95a379aa7391b988c32765891b0010b2f46014fc (patch) | |
| tree | 043a8d6b5cc68747540c31fc1e91f4ce3ea3e29f | |
| parent | 9096d70642880946b0b477e33f7debabbefec9fa (diff) | |
| download | ceph-95a379aa7391b988c32765891b0010b2f46014fc.tar.gz | |
ceph_common.sh: tolerate missing mds, mon, osds in conf
With set -e this seems to fail (at least on some machines) if, say, there
is no MDS in the conf file. This fixes it.
Tested-by: Mark Nelson <mark.nelson@inktank.com>
Signed-off-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/ceph_common.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ceph_common.sh b/src/ceph_common.sh index af2576b3cd4..4851a785e8f 100644 --- a/src/ceph_common.sh +++ b/src/ceph_common.sh @@ -147,9 +147,9 @@ get_name_list() { orig="$*" # extract list of monitors, mdss, osds defined in startup.conf - allconf=`$CCONF -c $conf -l mon | egrep -v '^mon$' ; \ - $CCONF -c $conf -l mds | egrep -v '^mds$' ; \ - $CCONF -c $conf -l osd | egrep -v '^osd$'` + allconf=`$CCONF -c $conf -l mon | egrep -v '^mon$' || true ; \ + $CCONF -c $conf -l mds | egrep -v '^mds$' || true ; \ + $CCONF -c $conf -l osd | egrep -v '^osd$' || true` if [ -z "$orig" ]; then what="$allconf $local" |