From 057b046402ac68998dec1f9e8f51d9a76861185c Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Thu, 5 Nov 2009 22:22:27 -0800
Subject: [PATCH] init-ceph: tell user we're mounting btrfs

---
 src/TODO         | 2 ++
 src/init-ceph.in | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/TODO b/src/TODO
index f4f1a5a2dde25..0a64e7c255ed5 100644
--- 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 6a946503bfc0e..7f384a8c13f96 100644
--- 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"
-- 
2.39.5