[sheepdog] [PATCH 1/3] tool: rename kill_zk_session as zk_control
Liu Yuan
namei.unix at gmail.com
Tue Jul 23 14:06:11 CEST 2013
This is prepared to add more methods
Signed-off-by: Liu Yuan <namei.unix at gmail.com>
---
.gitignore | 2 +-
tests/functional/common.rc | 2 +-
tools/Makefile.am | 6 +++---
tools/{kill_zk_session.c => zk_control.c} | 0
4 files changed, 5 insertions(+), 5 deletions(-)
rename tools/{kill_zk_session.c => zk_control.c} (100%)
diff --git a/.gitignore b/.gitignore
index 197ad95..7ab7bea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,7 +35,7 @@ collie/collie
sheep/sheep
sheepfs/sheepfs
shepherd/shepherd
-tools/kill_zk_session
+tools/zk_control
tests/unit/collie/test_common
tests/unit/sheep/test_vdi
tests/unit/sheep/test_cluster_driver
diff --git a/tests/functional/common.rc b/tests/functional/common.rc
index 48be377..8571ea3 100644
--- a/tests/functional/common.rc
+++ b/tests/functional/common.rc
@@ -478,7 +478,7 @@ _kill_zk_session()
{
local path="/sheepdog/member/IPv4 ip:127.0.0.1 port:$((7000+$1))"
if [[ "$DRIVER" == zoo* ]]; then
- ../../tools/kill_zk_session "$path"
+ ../../tools/zk_control "$path"
if [ $? -ne 0 ]; then
_die "failed to kill session"
fi
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 3656da8..7f05c93 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -3,11 +3,11 @@ MAINTAINERCLEANFILES = Makefile.in
sbin_PROGRAMS =
if BUILD_ZOOKEEPER
-sbin_PROGRAMS += kill_zk_session
+sbin_PROGRAMS += zk_control
-kill_zk_session_SOURCES = kill_zk_session.c
+zk_control_SOURCES = zk_control.c
-kill_zk_session_LDADD = -lzookeeper_mt
+zk_control_LDADD = -lzookeeper_mt
endif
noinst_PROGRAMS = $(sbin_PROGRAMS)
diff --git a/tools/kill_zk_session.c b/tools/zk_control.c
similarity index 100%
rename from tools/kill_zk_session.c
rename to tools/zk_control.c
--
1.7.9.5
More information about the sheepdog
mailing list