init-ceph: tell user we're mounting btrfs

diff --git a/src/TODO b/src/TODO
index f4f1a5a2dde254ab38a170f8f15adbbce5c4d326..0a64e7c255ed5543219b546099b028e65f7cde74 100644 (file)
--- a/src/TODO
+++ b/src/TODO
@@ -48,6 +48,8 @@ v0.18
 - big endian fixes (required protocol/disk format change)
 
 
+- mount btrfs by UUID?
+
 - qa
 - osd: rebuild pg log
 - osd: handle storage errors

diff --git a/src/init-ceph.in b/src/init-ceph.in
index 6a946503bfc0e01989907315c250679a2f93d460..7f384a8c13f960e5068c129d4fc1dd1e861bb167 100644 (file)
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
@@ -45,7 +45,7 @@ signal_daemon() {
     signal=$4
     action=$5
     [ -z "$action" ] && action="Stopping"
-    echo -n "$action ceph $name on $host..."
+    echo -n "$action Ceph $name on $host..."
     do_cmd "if [ -e $pidfile ]; then
         pid=`cat $pidfile`
         if [ -e /proc/\$pid ] && grep -q $daemon /proc/\$pid/cmdline ; then
@@ -64,7 +64,7 @@ stop_daemon() {
     signal=$4
     action=$5
     [ -z "$action" ] && action="Stopping"
-    echo -n "$action ceph $name on $host..."
+    echo -n "$action Ceph $name on $host..."
     do_cmd "while [ 1 ]; do 
        [ -e $pidfile ] || break
        pid=\`cat $pidfile\`
@@ -199,14 +199,15 @@ for name in $what; do
 
            cmd="$wrap $cmd $runmode"
            
-           echo Starting ceph $name on $host...
            if [ $dobtrfs -eq 1 ] && [ -n "$btrfs_devs" ]; then
                get_conf pre_mount "true" "pre mount command"
                get_conf btrfs_opt "flushoncommit" "btrfs options"
                [ -n "$btrfs_opt" ] && btrfs_opt="-o $btrfs_opt"
                [ -n "$pre_mount" ] && do_cmd "$pre_mount"
+               echo Mounting Btrfs on $host:$btrfs_path
                do_root_cmd "modprobe btrfs ; btrfsctl -a ; egrep -q '^[^ ]+ $btrfs_path' /proc/mounts || mount -t btrfs $btrfs_opt $first_dev $btrfs_path"
            fi
+           echo Starting Ceph $name on $host...
            get_conf pre_start_eval "" "pre start eval"
            [ -n "$pre_start_eval" ] && $pre_start_eval
            get_conf pre_start "" "pre start command"