]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
init-ceph: fix status version check across machines
authorSage Weil <sage@inktank.com>
Fri, 28 Dec 2012 00:06:24 +0000 (16:06 -0800)
committerSage Weil <sage@inktank.com>
Fri, 28 Dec 2012 20:12:26 +0000 (12:12 -0800)
The local state isn't propagated into the backtick shell, resulting in
'unknown' for all remote daemons.  Avoid backticks altogether.

Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 6c7b667badc5e7608b69c533a119a2afc062e257)

src/init-ceph.in

index 31aeb2872236bfccdc9f16a06beb852bc42d9a77..7344bf8f02b7e2c958d2029c3b5736b494f594fb 100644 (file)
@@ -298,8 +298,8 @@ for name in $what; do
        status)
            if daemon_is_running $name ceph-$type $id $pid_file; then
                get_conf asok "/var/run/ceph/ceph-$type.$id.asok" "admin socket"
-               version=`do_cmd "$BINDIR/ceph --admin-daemon $asok version 2>/dev/null" || echo unknown`
-                echo "$name: running $version"
+               echo -n "$name: running "
+               do_cmd "$BINDIR/ceph --admin-daemon $asok version 2>/dev/null" || echo unknown
             elif [ -e "$pid_file" ]; then
                 # daemon is dead, but pid file still exists
                 echo "$name: dead."