diff options
| author | Sage Weil <sage@inktank.com> | 2013-03-06 17:09:51 -0800 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-03-06 17:09:58 -0800 |
| commit | a58eec90caf3a3d04c9e7bd4e6b9c160b6b69175 (patch) | |
| tree | 4496515d753d708eb5707053a1d614c2f14e0ff8 | |
| parent | de2c5b3fb758ce4b6e635d2b1f8671afb3e73634 (diff) | |
| download | ceph-a58eec90caf3a3d04c9e7bd4e6b9c160b6b69175.tar.gz | |
init-ceph: fix run dir
Signed-off-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/init-ceph.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/init-ceph.in b/src/init-ceph.in index 101ccab28c0..5c04dd036f5 100644 --- a/src/init-ceph.in +++ b/src/init-ceph.in @@ -245,6 +245,8 @@ for name in $what; do lockfile="" fi + get_conf asok "$RUN_DIR/ceph-$type.$id.asok" "admin socket" + case "$command" in start) # Increase max_open_files, if the configuration calls for it. @@ -327,7 +329,6 @@ for name in $what; do # via mkcephfs, which is fine too; there is no harm # in creating these keys. get_conf mon_data "/var/lib/ceph/mon/ceph-$id" "mon data" - get_conf asok "/var/run/ceph-$type.$id.asok" "admin socket" if [ "$mon_data" = "/var/lib/ceph/mon/ceph-$id" -a "$asok" = "/var/run/ceph/ceph-mon.$id.asok" ]; then echo Starting ceph-create-keys on $host... cmd2="$SBINDIR/ceph-create-keys -i $id 2> /dev/null &" @@ -354,7 +355,6 @@ for name in $what; do status) if daemon_is_running $name ceph-$type $id $pid_file; then - get_conf asok "$RUN_DIR/ceph-$type.$id.asok" "admin socket" echo -n "$name: running " do_cmd "$BINDIR/ceph --admin-daemon $asok version 2>/dev/null" || echo unknown elif [ -e "$pid_file" ]; then |