From: Sage Weil <sage@inktank.com>
Date: Tue, 12 Jun 2012 20:58:22 +0000 (-0700)
Subject: init-ceph: make 'status' report running version
X-Git-Tag: v0.48argonaut~72
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6e551f7341aebfda30ec33b300f7b85242549410;p=ceph.git

init-ceph: make 'status' report running version

Try to report the running version with 'status'.

Backport: dho
Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/init-ceph.in b/src/init-ceph.in
index f2702e3de0b63..a8c5a29e8bd65 100644
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
@@ -297,7 +297,9 @@ for name in $what; do
 
 	status)
 	    if daemon_is_running $name ceph-$type $id $pid_file; then
-                echo "$name: running..."
+		get_conf asok "/var/run/ceph/ceph-$type.$id.asok" "admin socket"
+		version=`$BINDIR/ceph --admin-daemon $asok version 2>/dev/null || echo unknown`
+                echo "$name: running $version"
             elif [ -e "$pid_file" ]; then
                 # daemon is dead, but pid file still exists
                 echo "$name: dead."