rename stop.sh to ceph_stop, added to Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 753665b95ffcc7a89b41c0b9fc61828cab0935df..2629081d2dd12be5158eb872474e858bda70d8df 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -50,7 +50,7 @@ bin_PROGRAMS = \
        streamtest dupstore dumpjournal testmsgr \
        mount.ceph
 
-bin_SCRIPTS = crun cephd
+bin_SCRIPTS = crun cephd ceph_stop
 
 
 testmsgr_SOURCES = testmsgr.cc msg/SimpleMessenger.cc
@@ -164,7 +164,8 @@ noinst_LIBRARIES = \
 noinst_LIBRARIES += libcrush_so.a #libcephclient_so.a
 
 # extra bits
-EXTRA_DIST = dstart.sh dstop.sh mkcephfs.sh montest.sh restart.sh stop.sh verify-mds-journal.sh vstart.sh crun cephd
+EXTRA_DIST = dstart.sh dstop.sh mkcephfs.sh montest.sh restart.sh stop.sh verify-mds-journal.sh vstart.sh \
+            crun cephd ceph_stop
 
 # cleaning
 clean-local:

diff --git a/src/ceph_stop b/src/ceph_stop
new file mode 100755 (executable)
index 0000000..9837a0a
--- /dev/null
+++ b/src/ceph_stop
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+do_killall() {
+       pg=`pgrep -f crun.*$1`
+       [ "$pg" != "" ] && kill $pg
+       killall $1
+}
+
+usage="usage: $0 [all] [mon] [mds] [osd]\n"
+
+let stop_all=1
+let stop_mon=0
+let stop_mds=0
+let stop_osd=0
+
+while [ $# -ge 1 ]; do
+    case $1 in
+       all )
+           stop_all=1
+           ;;
+       mon | cmon )
+           stop_mon=1
+           stop_all=0
+           ;;
+       mds | cmds )
+           stop_mds=1
+           stop_all=0
+           ;;
+       osd | cosd )
+           stop_osd=1
+           stop_all=0
+           ;;
+       * )
+           printf "$usage"
+           exit
+        esac
+        shift
+done
+
+if [ $stop_all -eq 1 ]; then
+       killall crun cmon cmds cosd
+       pkill -f valgrind.bin.\*cmon
+       pkill -f valgrind.bin.\*cosd
+       pkill -f valgrind.bin.\*cmds
+else
+       [ $stop_mon -eq 1 ] && do_killall cmon
+       [ $stop_mds -eq 1 ] && do_killall cmds
+       [ $stop_osd -eq 1 ] && do_killall cosd
+fi

diff --git a/src/cephd b/src/cephd
index 5c6e85e42c1c5edf377e16e0afc7df66bc6d8fcb..2ea58f609ee334a174c1fa891fafe453b1a27c87 100755 (executable)
--- a/src/cephd
+++ b/src/cephd
@@ -101,7 +101,7 @@ if [ $do_stop -eq 1 ]; then
        [ $select_mon -eq 1 ] && stop_str=$stop_str" mon"
        [ $select_mds -eq 1 ] && stop_str=$stop_str" mds"
        [ $select_osd -eq 1 ] && stop_str=$stop_str" osd"
-       $SCRIPT_BIN/stop.sh $stop_str
+       $SCRIPT_BIN/ceph_stop $stop_str
 fi
 
 [ $do_start -eq 0 ] && exit

diff --git a/src/stop.sh b/src/stop.sh
deleted file mode 100755 (executable)
index 9837a0a..0000000
--- a/src/stop.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-do_killall() {
-       pg=`pgrep -f crun.*$1`
-       [ "$pg" != "" ] && kill $pg
-       killall $1
-}
-
-usage="usage: $0 [all] [mon] [mds] [osd]\n"
-
-let stop_all=1
-let stop_mon=0
-let stop_mds=0
-let stop_osd=0
-
-while [ $# -ge 1 ]; do
-    case $1 in
-       all )
-           stop_all=1
-           ;;
-       mon | cmon )
-           stop_mon=1
-           stop_all=0
-           ;;
-       mds | cmds )
-           stop_mds=1
-           stop_all=0
-           ;;
-       osd | cosd )
-           stop_osd=1
-           stop_all=0
-           ;;
-       * )
-           printf "$usage"
-           exit
-        esac
-        shift
-done
-
-if [ $stop_all -eq 1 ]; then
-       killall crun cmon cmds cosd
-       pkill -f valgrind.bin.\*cmon
-       pkill -f valgrind.bin.\*cosd
-       pkill -f valgrind.bin.\*cmds
-else
-       [ $stop_mon -eq 1 ] && do_killall cmon
-       [ $stop_mds -eq 1 ] && do_killall cmds
-       [ $stop_osd -eq 1 ] && do_killall cosd
-fi