[sheepdog] [PATCH 1/3] rename collie as dog
Liu Yuan
namei.unix at gmail.com
Mon Aug 12 11:39:23 CEST 2013
Signed-off-by: Liu Yuan <namei.unix at gmail.com>
---
.gitignore | 6 +-
INSTALL | 2 +-
Makefile.am | 10 +--
README | 12 ++--
configure.ac | 6 +-
debian/sheepdog.bash-completion | 2 +-
{collie => dog}/Makefile.am | 22 +++----
{collie => dog}/cluster.c | 14 ++---
{collie => dog}/common.c | 14 ++---
collie/collie.c => dog/dog.c | 16 ++---
collie/collie.h => dog/dog.h | 6 +-
{collie => dog}/farm/farm.c | 4 +-
{collie => dog}/farm/farm.h | 2 +-
{collie => dog}/farm/object_tree.c | 2 +-
{collie => dog}/farm/sha1_file.c | 0
{collie => dog}/farm/slice.c | 0
{collie => dog}/farm/snap.c | 0
{collie => dog}/farm/trunk.c | 0
{collie => dog}/node.c | 12 ++--
{collie => dog}/trace.c | 12 ++--
{collie => dog}/treeview.c | 0
{collie => dog}/treeview.h | 0
{collie => dog}/vdi.c | 24 ++++----
include/internal_proto.h | 4 +-
lib/logger.c | 2 +-
man/Makefile.am | 10 +--
man/{collie.8.in => dog.8.in} | 10 +--
man/sheep.8.in | 4 +-
man/sheepfs.8.in | 4 +-
script/Makefile.am | 2 +-
...{bash_completion_collie => bash_completion_dog} | 64 ++++++++++----------
sheep/sheep.c | 2 +-
sheep/store.c | 2 +-
sheepdog.spec.in | 4 +-
sheepfs/cluster.c | 2 +-
sheepfs/node.c | 4 +-
sheepfs/vdi.c | 2 +-
sheepfs/volume.c | 2 +-
tests/dynamorio/journaling/01.sh | 4 +-
tests/functional/001 | 2 +-
tests/functional/002 | 2 +-
tests/functional/003 | 2 +-
tests/functional/004 | 2 +-
tests/functional/005 | 4 +-
tests/functional/006 | 2 +-
tests/functional/007 | 6 +-
tests/functional/008 | 6 +-
tests/functional/009 | 6 +-
tests/functional/010 | 32 +++++-----
tests/functional/011 | 2 +-
tests/functional/012 | 2 +-
tests/functional/014 | 12 ++--
tests/functional/015 | 48 +++++++--------
tests/functional/016 | 10 +--
tests/functional/017 | 2 +-
tests/functional/018 | 8 +--
tests/functional/019 | 6 +-
tests/functional/020 | 4 +-
tests/functional/022 | 2 +-
tests/functional/023 | 4 +-
tests/functional/024 | 2 +-
tests/functional/025 | 4 +-
tests/functional/026 | 6 +-
tests/functional/027 | 4 +-
tests/functional/028 | 18 +++---
tests/functional/029 | 12 ++--
tests/functional/030 | 62 +++++++++----------
tests/functional/031 | 4 +-
tests/functional/032 | 8 +--
tests/functional/033 | 8 +--
tests/functional/034 | 10 +--
tests/functional/035 | 12 ++--
tests/functional/036 | 6 +-
tests/functional/037 | 8 +--
tests/functional/038 | 8 +--
tests/functional/039 | 34 +++++------
tests/functional/040 | 2 +-
tests/functional/041 | 46 +++++++-------
tests/functional/042 | 14 ++---
tests/functional/043 | 24 ++++----
tests/functional/044 | 42 ++++++-------
tests/functional/045 | 8 +--
tests/functional/046 | 24 ++++----
tests/functional/047 | 10 +--
tests/functional/048 | 20 +++---
tests/functional/049 | 6 +-
tests/functional/050 | 8 +--
tests/functional/051 | 6 +-
tests/functional/052 | 16 ++---
tests/functional/053 | 10 +--
tests/functional/054 | 6 +-
tests/functional/055 | 26 ++++----
tests/functional/056 | 18 +++---
tests/functional/057 | 24 ++++----
tests/functional/058 | 8 +--
tests/functional/059 | 8 +--
tests/functional/060 | 16 ++---
tests/functional/061 | 4 +-
tests/functional/062 | 36 +++++------
tests/functional/063 | 12 ++--
tests/functional/064 | 16 ++---
tests/functional/065 | 6 +-
tests/functional/066 | 12 ++--
tests/functional/067 | 4 +-
tests/functional/068 | 6 +-
tests/functional/069 | 6 +-
tests/functional/070 | 4 +-
tests/functional/071 | 6 +-
tests/functional/072 | 6 +-
tests/functional/check | 2 +-
tests/functional/common.config | 4 +-
tests/functional/common.filter | 2 +-
tests/functional/common.rc | 24 ++++----
tests/functional/group | 4 +-
tests/unit/Makefile.am | 2 +-
tests/unit/{collie => dog}/Makefile.am | 10 +--
.../unit/{collie/mock_collie.c => dog/mock_dog.c} | 4 +-
tests/unit/{collie => dog}/test_common.c | 2 +-
118 files changed, 586 insertions(+), 586 deletions(-)
rename {collie => dog}/Makefile.am (69%)
rename {collie => dog}/cluster.c (97%)
rename {collie => dog}/common.c (95%)
rename collie/collie.c => dog/dog.c (96%)
rename collie/collie.h => dog/dog.h (96%)
rename {collie => dog}/farm/farm.c (99%)
rename {collie => dog}/farm/farm.h (99%)
rename {collie => dog}/farm/object_tree.c (99%)
rename {collie => dog}/farm/sha1_file.c (100%)
rename {collie => dog}/farm/slice.c (100%)
rename {collie => dog}/farm/snap.c (100%)
rename {collie => dog}/farm/trunk.c (100%)
rename {collie => dog}/node.c (97%)
rename {collie => dog}/trace.c (96%)
rename {collie => dog}/treeview.c (100%)
rename {collie => dog}/treeview.h (100%)
rename {collie => dog}/vdi.c (98%)
rename man/{collie.8.in => dog.8.in} (78%)
rename script/{bash_completion_collie => bash_completion_dog} (83%)
rename tests/unit/{collie => dog}/Makefile.am (62%)
rename tests/unit/{collie/mock_collie.c => dog/mock_dog.c} (95%)
rename tests/unit/{collie => dog}/test_common.c (98%)
diff --git a/.gitignore b/.gitignore
index fdbf367..69aca9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,12 +31,12 @@ GSYMS
#
# programs
#
-collie/collie
+dog/dog
sheep/sheep
sheepfs/sheepfs
shepherd/shepherd
tools/zk_control
-tests/unit/collie/test_common
+tests/unit/dog/test_common
tests/unit/sheep/test_vdi
tests/unit/sheep/test_cluster_driver
@@ -73,7 +73,7 @@ tests/*.out.bad
*.patch
man/sheep.8
-man/collie.8
+man/dog.8
man/sheepfs.8
*.deb
diff --git a/INSTALL b/INSTALL
index 1a23091..28fbb55 100644
--- a/INSTALL
+++ b/INSTALL
@@ -65,7 +65,7 @@ Installing from source
$ make rpm
$ sudo rpm -ivh x86_64/sheepdog-0.*
-Please read the README file, the sheep(8), collie(8) or sheepfs(8) man page for
+Please read the README file, the sheep(8), dog(8) or sheepfs(8) man page for
further usage instructions.
===============================================================================
diff --git a/Makefile.am b/Makefile.am
index beafa1c..915ce54 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@ sheepdogsysconfdir = ${SHEEPDOGCONFDIR}
sheepdogsysconf_DATA =
-SUBDIRS = lib collie sheep include script shepherd tools
+SUBDIRS = lib dog sheep include script shepherd tools
if BUILD_SHEEPFS
SUBDIRS += sheepfs
@@ -92,7 +92,7 @@ sparse:
CHECK_STYLE=../script/checkpatch.pl -f --no-summary --terse
check-style:
- @for dir in lib collie sheep include sheepfs; do \
+ @for dir in lib dog sheep include sheepfs; do \
make -C $$dir check-style CHECK_STYLE="$(CHECK_STYLE)"; \
done
@@ -100,12 +100,12 @@ if BUILD_COVERAGE
coverage: clean check
@rm -rf coverage
- @for dir in collie sheep tests/unit/collie tests/unit/sheep ; do\
+ @for dir in dog sheep tests/unit/dog tests/unit/sheep ; do\
$(MAKE) -C $$dir coverage; \
done
- @lcov -a collie/collie.info -a sheep/sheep.info \
- -a tests/unit/collie/collie.info -a tests/unit/sheep/sheep.info \
+ @lcov -a dog/dog.info -a sheep/sheep.info \
+ -a tests/unit/dog/dog.info -a tests/unit/sheep/sheep.info \
-o sheep.info && \
lcov -r sheep.info /usr/include/\* -o sheep.info && \
lcov -r sheep.info tests/unit/\* -o sheep.info && \
diff --git a/README b/README
index f130e86..8561db3 100644
--- a/README
+++ b/README
@@ -82,7 +82,7 @@ Usage
2. Make fs
- $ collie cluster format --copies=3
+ $ dog cluster format --copies=3
--copies specifies the number of default data redundancy. In this case,
the replicated data is stored on three machines.
@@ -91,7 +91,7 @@ Usage
Following list shows that Sheepdog is running on 32 nodes.
- $ collie node list
+ $ dog node list
Idx Node id (FNV-1a) - Host:Port
------------------------------------------------
0 0308164db75cff7e - 10.68.13.15:7000
@@ -138,7 +138,7 @@ Usage
3. See Sheepdog images by the following command.
- $ collie vdi list
+ $ dog vdi list
name id size used shared creation time object id
--------------------------------------------------------------------
Bob 0 2.0 GB 1.6 GB 0.0 MB 2010-03-23 16:16 80000
@@ -151,7 +151,7 @@ Usage
2. Following command checks used images.
- $ collie vm list
+ $ dog vm list
Name |Vdi size |Allocated| Shared | Status
----------------+---------+---------+---------+------------
Bob | 2.0 GB| 1.6 GB| 0.0 MB| running on xx.xx.xx.xx
@@ -167,7 +167,7 @@ Usage
2. After getting snapshot, a new virtual machine images are added as a not-
current image.
- $ collie vdi list
+ $ dog vdi list
name id size used shared creation time object id
--------------------------------------------------------------------
Bob 0 2.0 GB 1.6 GB 0.0 MB 2010-03-23 16:16 80000
@@ -185,7 +185,7 @@ Usage
2. Charlie's image is added to the virtual machine list.
- $ collie vdi list
+ $ dog vdi list
name id size used shared creation time object id
--------------------------------------------------------------------
Bob 0 2.0 GB 1.6 GB 0.0 MB 2010-03-23 16:16 80000
diff --git a/configure.ac b/configure.ac
index 9831379..991a869 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ AC_INIT([sheepdog], m4_default(git_version, sheepdog_version),
[sheepdog at lists.wpkg.org])
AM_INIT_AUTOMAKE([-Wno-portability])
-AC_CONFIG_SRCDIR([collie/collie.c])
+AC_CONFIG_SRCDIR([dog/dog.c])
AC_CONFIG_HEADER([include/config.h])
AC_CANONICAL_HOST
@@ -127,7 +127,7 @@ AC_CHECK_FUNCS([alarm alphasort atexit bzero dup2 endgrent endpwent fcntl \
strerror strrchr strspn strstr])
AC_CONFIG_FILES([Makefile
- collie/Makefile
+ dog/Makefile
sheep/Makefile
sheepfs/Makefile
include/Makefile
@@ -137,7 +137,7 @@ AC_CONFIG_FILES([Makefile
shepherd/Makefile
tests/unit/Makefile
tests/unit/mock/Makefile
- tests/unit/collie/Makefile
+ tests/unit/dog/Makefile
tests/unit/sheep/Makefile
tools/Makefile])
diff --git a/debian/sheepdog.bash-completion b/debian/sheepdog.bash-completion
index 3406bc5..ba7fc2b 100644
--- a/debian/sheepdog.bash-completion
+++ b/debian/sheepdog.bash-completion
@@ -1 +1 @@
-script/bash_completion_collie collie
+script/bash_completion_dog dog
diff --git a/collie/Makefile.am b/dog/Makefile.am
similarity index 69%
rename from collie/Makefile.am
rename to dog/Makefile.am
index 2b57f5a..fc826d9 100644
--- a/collie/Makefile.am
+++ b/dog/Makefile.am
@@ -21,36 +21,36 @@ AM_CFLAGS =
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
-sbin_PROGRAMS = collie
+sbin_PROGRAMS = dog
-collie_SOURCES = farm/object_tree.c farm/sha1_file.c farm/snap.c \
+dog_SOURCES = farm/object_tree.c farm/sha1_file.c farm/snap.c \
farm/trunk.c farm/farm.c farm/slice.c \
- collie.c common.c treeview.c vdi.c node.c cluster.c
+ dog.c common.c treeview.c vdi.c node.c cluster.c
if BUILD_TRACE
-collie_SOURCES += trace.c
+dog_SOURCES += trace.c
override CFLAGS := $(subst -pg,,$(CFLAGS))
endif
-collie_LDADD = ../lib/libsheepdog.a -lpthread
-collie_DEPENDENCIES = ../lib/libsheepdog.a
+dog_LDADD = ../lib/libsheepdog.a -lpthread
+dog_DEPENDENCIES = ../lib/libsheepdog.a
-noinst_HEADERS = treeview.h collie.h farm/farm.h
+noinst_HEADERS = treeview.h dog.h farm/farm.h
EXTRA_DIST =
all-local:
- @echo Built collie
+ @echo Built dog
clean-local:
- rm -f collie *.o gmon.out *.da *.bb *.bbg
+ rm -f dog *.o gmon.out *.da *.bb *.bbg
# support for GNU Flymake
check-syntax:
$(COMPILE) -fsyntax-only $(CHK_SOURCES)
check-style:
- @$(CHECK_STYLE) $(collie_SOURCES) $(noinst_HEADERS)
+ @$(CHECK_STYLE) $(dog_SOURCES) $(noinst_HEADERS)
coverage:
- @lcov -d . -c -o collie.info
+ @lcov -d . -c -o dog.info
diff --git a/collie/cluster.c b/dog/cluster.c
similarity index 97%
rename from collie/cluster.c
rename to dog/cluster.c
index ef87bc4..4c7654d 100644
--- a/collie/cluster.c
+++ b/dog/cluster.c
@@ -14,7 +14,7 @@
#include <ctype.h>
#include <sys/time.h>
-#include "collie.h"
+#include "dog.h"
#include "farm/farm.h"
static struct sd_option cluster_options[] = {
@@ -43,7 +43,7 @@ static int list_store(void)
sd_init_req(&hdr, SD_OP_GET_STORE_LIST);
hdr.data_length = 512;
- ret = collie_exec_req(sdhost, sdport, &hdr, buf);
+ ret = dog_exec_req(sdhost, sdport, &hdr, buf);
if (ret < 0)
return EXIT_SYSFAIL;
@@ -82,7 +82,7 @@ static int cluster_format(int argc, char **argv)
sd_init_req(&hdr, SD_OP_READ_VDIS);
hdr.data_length = sizeof(vdi_inuse);
- ret = collie_exec_req(sdhost, sdport, &hdr, &vdi_inuse);
+ ret = dog_exec_req(sdhost, sdport, &hdr, &vdi_inuse);
if (ret < 0)
return EXIT_SYSFAIL;
@@ -103,7 +103,7 @@ static int cluster_format(int argc, char **argv)
hdr.flags |= SD_FLAG_CMD_WRITE;
printf("using backend %s store\n", store_name);
- ret = collie_exec_req(sdhost, sdport, &hdr, store_name);
+ ret = dog_exec_req(sdhost, sdport, &hdr, store_name);
if (ret < 0)
return EXIT_SYSFAIL;
@@ -135,7 +135,7 @@ static int cluster_info(int argc, char **argv)
sd_init_req(&hdr, SD_OP_STAT_CLUSTER);
hdr.data_length = log_length;
- ret = collie_exec_req(sdhost, sdport, &hdr, logs);
+ ret = dog_exec_req(sdhost, sdport, &hdr, logs);
if (ret < 0)
goto error;
@@ -379,7 +379,7 @@ static int cluster_force_recover(int argc, char **argv)
sd_init_req(&hdr, SD_OP_FORCE_RECOVER);
hdr.data_length = sizeof(nodes);
- ret = collie_exec_req(sdhost, sdport, &hdr, nodes);
+ ret = dog_exec_req(sdhost, sdport, &hdr, nodes);
if (ret < 0)
return EXIT_SYSFAIL;
@@ -479,7 +479,7 @@ static struct subcommand cluster_cmd[] = {
cluster_snapshot_cmd, CMD_NEED_ARG,
cluster_snapshot, cluster_options},
{"recover", NULL, "afph",
- "See 'collie cluster recover' for more information",
+ "See 'dog cluster recover' for more information",
cluster_recover_cmd, CMD_NEED_ARG,
cluster_recover, cluster_options},
{"reweight", NULL, "aph", "reweight the cluster", NULL, 0,
diff --git a/collie/common.c b/dog/common.c
similarity index 95%
rename from collie/common.c
rename to dog/common.c
index 3237608..14d3b1d 100644
--- a/collie/common.c
+++ b/dog/common.c
@@ -9,7 +9,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "collie.h"
+#include "dog.h"
#include "sha1.h"
#include "sockfd_cache.h"
@@ -54,7 +54,7 @@ int sd_read_object(uint64_t oid, void *data, unsigned int datalen,
if (direct)
hdr.flags |= SD_FLAG_CMD_DIRECT;
- ret = collie_exec_req(sdhost, sdport, &hdr, data);
+ ret = dog_exec_req(sdhost, sdport, &hdr, data);
if (ret < 0) {
sd_err("Failed to read object %" PRIx64, oid);
return SD_RES_EIO;
@@ -96,7 +96,7 @@ int sd_write_object(uint64_t oid, uint64_t cow_oid, void *data,
hdr.obj.cow_oid = cow_oid;
hdr.obj.offset = offset;
- ret = collie_exec_req(sdhost, sdport, &hdr, data);
+ ret = dog_exec_req(sdhost, sdport, &hdr, data);
if (ret < 0) {
sd_err("Failed to write object %" PRIx64, oid);
return SD_RES_EIO;
@@ -124,7 +124,7 @@ int parse_vdi(vdi_parser_func_t func, size_t size, void *data)
sd_init_req(&req, SD_OP_READ_VDIS);
req.data_length = sizeof(vdi_inuse);
- ret = collie_exec_req(sdhost, sdport, &req, &vdi_inuse);
+ ret = dog_exec_req(sdhost, sdport, &req, &vdi_inuse);
if (ret < 0)
goto out;
@@ -167,7 +167,7 @@ out:
return ret;
}
-int collie_exec_req(const uint8_t *addr, int port, struct sd_req *hdr,
+int dog_exec_req(const uint8_t *addr, int port, struct sd_req *hdr,
void *buf)
{
struct node_id nid = {};
@@ -182,7 +182,7 @@ int collie_exec_req(const uint8_t *addr, int port, struct sd_req *hdr,
return -1;
/*
- * Retry forever for collie because
+ * Retry forever for dog because
* 1. We can't get the newest epoch
* 2. Some operations might take unexpected long time
*/
@@ -196,7 +196,7 @@ int collie_exec_req(const uint8_t *addr, int port, struct sd_req *hdr,
/* Light request only contains header, without body content. */
int send_light_req(struct sd_req *hdr, const uint8_t *addr, int port)
{
- int ret = collie_exec_req(addr, port, hdr, NULL);
+ int ret = dog_exec_req(addr, port, hdr, NULL);
if (ret == -1)
return -1;
diff --git a/collie/collie.c b/dog/dog.c
similarity index 96%
rename from collie/collie.c
rename to dog/dog.c
index f95f3c5..cca8e66 100644
--- a/collie/collie.c
+++ b/dog/dog.c
@@ -15,13 +15,13 @@
#include "sheepdog_proto.h"
#include "sheep.h"
-#include "collie.h"
+#include "dog.h"
#include "util.h"
#include "sockfd_cache.h"
#define EPOLL_SIZE 4096
-static const char program_name[] = "collie";
+static const char program_name[] = "dog";
/* default sdhost is "127.0.0.1" */
uint8_t sdhost[16] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 0, 0, 1 };
int sdport = SD_LISTEN_PORT;
@@ -29,9 +29,9 @@ bool highlight = true;
bool raw_output;
bool verbose;
-static const struct sd_option collie_options[] = {
+static const struct sd_option dog_options[] = {
- /* common options for all collie commands */
+ /* common options for all dog commands */
{'a', "address", true, "specify the daemon address (default: localhost)"},
{'p', "port", true, "specify the daemon port"},
{'r', "raw", false, "raw output mode: omit headers, separate fields with\n"
@@ -65,7 +65,7 @@ int update_node_list(int max_nodes)
hdr.data_length = size;
- ret = collie_exec_req(sdhost, sdport, &hdr, buf);
+ ret = dog_exec_req(sdhost, sdport, &hdr, buf);
if (ret < 0)
goto out;
@@ -111,7 +111,7 @@ static const struct sd_option *find_opt(int ch)
const struct sd_option *opt;
/* search for common options */
- sd_for_each_option(opt, collie_options) {
+ sd_for_each_option(opt, dog_options) {
if (opt->ch == ch)
return opt;
}
@@ -316,13 +316,13 @@ static const struct sd_option *build_sd_options(const char *opts)
static void crash_handler(int signo)
{
- sd_err("collie exits unexpectedly (%s).", strsignal(signo));
+ sd_err("dog exits unexpectedly (%s).", strsignal(signo));
sd_backtrace();
/*
* OOM raises SIGABRT in xmalloc but the administrator expects
- * that collie exits with EXIT_SYSFAIL. We have to give up
+ * that dog exits with EXIT_SYSFAIL. We have to give up
* dumping a core file in this case.
*/
if (signo == SIGABRT)
diff --git a/collie/collie.h b/dog/dog.h
similarity index 96%
rename from collie/collie.h
rename to dog/dog.h
index 5f6797d..92dd4d2 100644
--- a/collie/collie.h
+++ b/dog/dog.h
@@ -8,8 +8,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __COLLIE_H__
-#define __COLLIE_H__
+#ifndef __DOG_H__
+#define __DOG_H__
#include <stdio.h>
#include <stdlib.h>
@@ -72,7 +72,7 @@ int sd_read_object(uint64_t oid, void *data, unsigned int datalen,
int sd_write_object(uint64_t oid, uint64_t cow_oid, void *data,
unsigned int datalen, uint64_t offset, uint32_t flags,
int copies, bool create, bool direct);
-int collie_exec_req(const uint8_t *addr, int port, struct sd_req *hdr,
+int dog_exec_req(const uint8_t *addr, int port, struct sd_req *hdr,
void *data);
int send_light_req(struct sd_req *hdr, const uint8_t *addr, int port);
int do_generic_subcommand(struct subcommand *sub, int argc, char **argv);
diff --git a/collie/farm/farm.c b/dog/farm/farm.c
similarity index 99%
rename from collie/farm/farm.c
rename to dog/farm/farm.c
index ff8be39..92514ad 100644
--- a/collie/farm/farm.c
+++ b/dog/farm/farm.c
@@ -37,7 +37,7 @@ struct snapshot_work {
struct strbuf *trunk_buf;
struct work work;
};
-static struct work_queue *wq;
+struct work_queue *wq;
static uatomic_bool work_error;
static struct vdi_entry *find_vdi(const char *name)
@@ -186,7 +186,7 @@ static int notify_vdi_add(uint32_t vdi_id, uint32_t nr_copies)
hdr.vdi_state.copies = nr_copies;
hdr.vdi_state.set_bitmap = true;
- ret = collie_exec_req(sdhost, sdport, &hdr, buf);
+ ret = dog_exec_req(sdhost, sdport, &hdr, buf);
if (ret)
sd_err("Fail to notify vdi add event(%"PRIx32", %d)", vdi_id,
diff --git a/collie/farm/farm.h b/dog/farm/farm.h
similarity index 99%
rename from collie/farm/farm.h
rename to dog/farm/farm.h
index 4c03a83..0f457e4 100644
--- a/collie/farm/farm.h
+++ b/dog/farm/farm.h
@@ -13,7 +13,7 @@
#include <sys/mman.h>
#include <linux/limits.h>
-#include "collie.h"
+#include "dog.h"
#include "sheep.h"
#include "strbuf.h"
#include "sha1.h"
diff --git a/collie/farm/object_tree.c b/dog/farm/object_tree.c
similarity index 99%
rename from collie/farm/object_tree.c
rename to dog/farm/object_tree.c
index 00cad2d..d778a4f 100644
--- a/collie/farm/object_tree.c
+++ b/dog/farm/object_tree.c
@@ -98,7 +98,7 @@ void object_tree_free(void)
free(cached_entry);
}
-int object_tree_size(void)
+int object_tree_size()
{
return tree.nr_objs;
}
diff --git a/collie/farm/sha1_file.c b/dog/farm/sha1_file.c
similarity index 100%
rename from collie/farm/sha1_file.c
rename to dog/farm/sha1_file.c
diff --git a/collie/farm/slice.c b/dog/farm/slice.c
similarity index 100%
rename from collie/farm/slice.c
rename to dog/farm/slice.c
diff --git a/collie/farm/snap.c b/dog/farm/snap.c
similarity index 100%
rename from collie/farm/snap.c
rename to dog/farm/snap.c
diff --git a/collie/farm/trunk.c b/dog/farm/trunk.c
similarity index 100%
rename from collie/farm/trunk.c
rename to dog/farm/trunk.c
diff --git a/collie/node.c b/dog/node.c
similarity index 97%
rename from collie/node.c
rename to dog/node.c
index 028d804..e00058e 100644
--- a/collie/node.c
+++ b/dog/node.c
@@ -9,7 +9,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "collie.h"
+#include "dog.h"
static struct node_cmd_data {
bool all_nodes;
@@ -115,7 +115,7 @@ static int get_recovery_state(struct recovery_state *state)
sd_init_req(&req, SD_OP_STAT_RECOVERY);
req.data_length = sizeof(*state);
- ret = collie_exec_req(sdhost, sdport, &req, state);
+ ret = dog_exec_req(sdhost, sdport, &req, state);
if (ret < 0) {
sd_err("Failed to execute request");
return -1;
@@ -205,7 +205,7 @@ static int node_recovery(int argc, char **argv)
sd_init_req(&req, SD_OP_STAT_RECOVERY);
req.data_length = sizeof(state);
- ret = collie_exec_req(sd_nodes[i].nid.addr,
+ ret = dog_exec_req(sd_nodes[i].nid.addr,
sd_nodes[i].nid.port, &req, &state);
if (ret < 0)
return EXIT_SYSFAIL;
@@ -271,7 +271,7 @@ static int node_md_info(struct node_id *nid)
sd_init_req(&hdr, SD_OP_MD_INFO);
hdr.data_length = sizeof(info);
- ret = collie_exec_req(nid->addr, nid->port, &hdr, &info);
+ ret = dog_exec_req(nid->addr, nid->port, &hdr, &info);
if (ret < 0)
return EXIT_SYSFAIL;
@@ -336,7 +336,7 @@ static int do_plug_unplug(char *disks, bool plug)
hdr.flags = SD_FLAG_CMD_WRITE;
hdr.data_length = strlen(disks) + 1;
- ret = collie_exec_req(sdhost, sdport, &hdr, disks);
+ ret = dog_exec_req(sdhost, sdport, &hdr, disks);
if (ret < 0)
return EXIT_SYSFAIL;
@@ -405,7 +405,7 @@ static struct subcommand node_cmd[] = {
CMD_NEED_NODELIST, node_info},
{"recovery", NULL, "aphPr", "show recovery information of nodes", NULL,
CMD_NEED_NODELIST, node_recovery, node_options},
- {"md", "[disks]", "apAh", "See 'collie node md' for more information",
+ {"md", "[disks]", "apAh", "See 'dog node md' for more information",
node_md_cmd, CMD_NEED_ARG, node_md, node_options},
{NULL,},
};
diff --git a/collie/trace.c b/dog/trace.c
similarity index 96%
rename from collie/trace.c
rename to dog/trace.c
index 1271e7c..162a935 100644
--- a/collie/trace.c
+++ b/dog/trace.c
@@ -20,7 +20,7 @@
#include <fcntl.h>
#include <sys/mman.h>
-#include "collie.h"
+#include "dog.h"
#include "rbtree.h"
#include "list.h"
@@ -92,7 +92,7 @@ read_buffer:
sd_init_req(&hdr, SD_OP_TRACE_READ_BUF);
hdr.data_length = TRACE_BUF_LEN;
- ret = collie_exec_req(sdhost, sdport, &hdr, buf);
+ ret = dog_exec_req(sdhost, sdport, &hdr, buf);
if (ret < 0)
return EXIT_SYSFAIL;
@@ -125,7 +125,7 @@ static int trace_enable(int argc, char **argv)
hdr.flags = SD_FLAG_CMD_WRITE;
hdr.data_length = strlen(tracer) + 1;
- ret = collie_exec_req(sdhost, sdport, &hdr, (void *)tracer);
+ ret = dog_exec_req(sdhost, sdport, &hdr, (void *)tracer);
if (ret < 0)
return EXIT_SYSFAIL;
@@ -157,7 +157,7 @@ static int trace_disable(int argc, char **argv)
hdr.flags = SD_FLAG_CMD_WRITE;
hdr.data_length = strlen(tracer) + 1;
- ret = collie_exec_req(sdhost, sdport, &hdr, (void *)tracer);
+ ret = dog_exec_req(sdhost, sdport, &hdr, (void *)tracer);
if (ret < 0)
return EXIT_SYSFAIL;
@@ -187,7 +187,7 @@ static int trace_status(int argc, char **argv)
sd_init_req(&hdr, SD_OP_TRACE_STATUS);
hdr.data_length = sizeof(buf);
- ret = collie_exec_req(sdhost, sdport, &hdr, buf);
+ ret = dog_exec_req(sdhost, sdport, &hdr, buf);
if (ret < 0)
return EXIT_SYSFAIL;
@@ -375,7 +375,7 @@ static struct subcommand trace_cmd[] = {
CMD_NEED_ARG, trace_disable},
{"status", NULL, "aph", "show tracer statuses", NULL,
0, trace_status},
- {"graph", NULL, "aph", "run collie trace graph for more information",
+ {"graph", NULL, "aph", "run dog trace graph for more information",
graph_cmd, CMD_NEED_ARG, trace_graph},
{NULL},
};
diff --git a/collie/treeview.c b/dog/treeview.c
similarity index 100%
rename from collie/treeview.c
rename to dog/treeview.c
diff --git a/collie/treeview.h b/dog/treeview.h
similarity index 100%
rename from collie/treeview.h
rename to dog/treeview.h
diff --git a/collie/vdi.c b/dog/vdi.c
similarity index 98%
rename from collie/vdi.c
rename to dog/vdi.c
index 1b48079..370ad7b 100644
--- a/collie/vdi.c
+++ b/dog/vdi.c
@@ -16,7 +16,7 @@
#include <sys/stat.h>
#include <fcntl.h>
-#include "collie.h"
+#include "dog.h"
#include "treeview.h"
#include "sha1.h"
@@ -315,7 +315,7 @@ static void parse_objs(uint64_t oid, obj_parser_func_t func, void *data, unsigne
hdr.obj.oid = oid;
- ret = collie_exec_req(sd_nodes[i].nid.addr,
+ ret = dog_exec_req(sd_nodes[i].nid.addr,
sd_nodes[i].nid.port, &hdr, buf);
if (ret < 0)
continue;
@@ -402,7 +402,7 @@ static int find_vdi_name(const char *vdiname, uint32_t snapid, const char *tag,
hdr.flags = SD_FLAG_CMD_WRITE;
hdr.vdi.snapid = snapid;
- ret = collie_exec_req(sdhost, sdport, &hdr, buf);
+ ret = dog_exec_req(sdhost, sdport, &hdr, buf);
if (ret < 0)
return -1;
@@ -469,7 +469,7 @@ int do_vdi_create(const char *vdiname, int64_t vdi_size,
hdr.vdi.vdi_size = vdi_size;
hdr.vdi.copies = nr_copies;
- ret = collie_exec_req(sdhost, sdport, &hdr, buf);
+ ret = dog_exec_req(sdhost, sdport, &hdr, buf);
if (ret < 0)
return EXIT_SYSFAIL;
@@ -755,7 +755,7 @@ static int do_vdi_delete(const char *vdiname, int snap_id, const char *snap_tag)
if (snap_tag)
pstrcpy(data + SD_MAX_VDI_LEN, SD_MAX_VDI_TAG_LEN, snap_tag);
- ret = collie_exec_req(sdhost, sdport, &hdr, data);
+ ret = dog_exec_req(sdhost, sdport, &hdr, data);
if (ret < 0)
return EXIT_SYSFAIL;
@@ -895,7 +895,7 @@ static int do_track_object(uint64_t oid, uint8_t nr_copies)
sd_init_req(&hdr, SD_OP_STAT_CLUSTER);
hdr.data_length = log_length;
- ret = collie_exec_req(sdhost, sdport, &hdr, logs);
+ ret = dog_exec_req(sdhost, sdport, &hdr, logs);
if (ret < 0)
goto error;
@@ -1033,7 +1033,7 @@ static int find_vdi_attr_oid(const char *vdiname, const char *tag, uint32_t snap
if (delete)
hdr.flags |= SD_FLAG_CMD_DEL;
- ret = collie_exec_req(sdhost, sdport, &hdr, &vattr);
+ ret = dog_exec_req(sdhost, sdport, &hdr, &vattr);
if (ret < 0)
return SD_RES_EIO;
@@ -1335,7 +1335,7 @@ static void *read_object_from(const struct sd_vnode *vnode, uint64_t oid)
hdr.obj.oid = oid;
- ret = collie_exec_req(vnode->nid.addr, vnode->nid.port, &hdr, buf);
+ ret = dog_exec_req(vnode->nid.addr, vnode->nid.port, &hdr, buf);
if (ret < 0)
exit(EXIT_SYSFAIL);
@@ -1372,7 +1372,7 @@ static void write_object_to(const struct sd_vnode *vnode, uint64_t oid,
hdr.data_length = get_objsize(oid);
hdr.obj.oid = oid;
- ret = collie_exec_req(vnode->nid.addr, vnode->nid.port, &hdr, buf);
+ ret = dog_exec_req(vnode->nid.addr, vnode->nid.port, &hdr, buf);
if (ret < 0)
exit(EXIT_SYSFAIL);
@@ -1453,7 +1453,7 @@ static void vdi_hash_check_work(struct work *work)
hdr.obj.oid = info->oid;
hdr.obj.tgt_epoch = sd_epoch;
- ret = collie_exec_req(vcw->vnode->nid.addr, vcw->vnode->nid.port, &hdr,
+ ret = dog_exec_req(vcw->vnode->nid.addr, vcw->vnode->nid.port, &hdr,
NULL);
if (ret < 0)
exit(EXIT_SYSFAIL);
@@ -1981,7 +1981,7 @@ static int vdi_cache_info(int argc, char **argv)
sd_init_req(&hdr, SD_OP_GET_CACHE_INFO);
hdr.data_length = sizeof(info);
- ret = collie_exec_req(sdhost, sdport, &hdr, &info);
+ ret = dog_exec_req(sdhost, sdport, &hdr, &info);
if (ret < 0)
return EXIT_SYSFAIL;
@@ -2085,7 +2085,7 @@ static struct subcommand vdi_cmd[] = {
{"restore", "<vdiname> <backup>", "saph", "restore snapshot images from a backup",
NULL, CMD_NEED_NODELIST|CMD_NEED_ARG,
vdi_restore, vdi_options},
- {"cache", "<vdiname>", "saph", "Run 'collie vdi cache' for more information",
+ {"cache", "<vdiname>", "saph", "Run 'dog vdi cache' for more information",
vdi_cache_cmd, CMD_NEED_ARG,
vdi_cache, vdi_options},
{NULL,},
diff --git a/include/internal_proto.h b/include/internal_proto.h
index 7a15336..8802300 100644
--- a/include/internal_proto.h
+++ b/include/internal_proto.h
@@ -13,7 +13,7 @@
/*
* This file specified the sheepdog-internal protocol, which is spoken between
- * sheepdog daemons, as well as between collie and sheepdog daemon for internal
+ * sheepdog daemons, as well as between dog and sheepdog daemon for internal
* operations.
*/
@@ -33,7 +33,7 @@
/*
* Operations with opcodes above 0x80 are considered part of the inter-sheep
- * include sheep-collie protocol and are versioned using SD_SHEEP_PROTO_VER
+ * include sheep-dog protocol and are versioned using SD_SHEEP_PROTO_VER
* instead of SD_PROTO_VER.
*
* These same applies for the above 0x80 flags and error values below.
diff --git a/lib/logger.c b/lib/logger.c
index b7dbd2f..012cfa2 100644
--- a/lib/logger.c
+++ b/lib/logger.c
@@ -117,7 +117,7 @@ static int64_t max_logsize = 500 * 1024 * 1024; /*500MB*/
static pthread_mutex_t logsize_lock = PTHREAD_MUTEX_INITIALIZER;
/*
- * We need to set default log formatter because collie doesn't want to call
+ * We need to set default log formatter because dog doesn't want to call
* select_log_formatter().
*/
static void __attribute__((constructor(65535)))
diff --git a/man/Makefile.am b/man/Makefile.am
index 6962bb8..6d34cdd 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,12 +1,12 @@
MAINTAINERCLEANFILES = Makefile.in
-dist_man_MANS = sheep.8 collie.8
+dist_man_MANS = sheep.8 dog.8
if BUILD_SHEEPFS
dist_man_MANS += sheepfs.8
endif
-EXTRA_DIST = sheep.8.in collie.8.in sheepfs.8.in
+EXTRA_DIST = sheep.8.in dog.8.in sheepfs.8.in
sheep.8.options = $(shell ../sheep/sheep -h | \
perl -ne 'print ".TP\n.BI $$1 \"\\fR, \\fP\" $$2\n$$3\n" if /^ ([^,]+), (\S+)\s+(.+)/' | \
@@ -14,9 +14,9 @@ sheep.8.options = $(shell ../sheep/sheep -h | \
sed 's/"/\\"/g' | \
perl -pe 's/\n/\\n/g')
-collie.8.options = $(shell ../collie/collie -h | \
- perl -ne 'if (/^ (.+?) \s+(.+)/) {system "../collie/collie $$1 -h"; print "Description:\n $$2\n"}'| \
- sed 's/Usage: collie \(.*\)/.TP\n.BI "\1"/g' | \
+dog.8.options = $(shell ../dog/dog -h | \
+ perl -ne 'if (/^ (.+?) \s+(.+)/) {system "../dog/dog $$1 -h"; print "Description:\n $$2\n"}'| \
+ sed 's/Usage: dog \(.*\)/.TP\n.BI "\1"/g' | \
sed 's/\(^[a-zA-Z]*:\)/\n\1/g' | \
sed 's/\\/\\\\\\/g' | \
sed 's/"/\\"/g' | \
diff --git a/man/collie.8.in b/man/dog.8.in
similarity index 78%
rename from man/collie.8.in
rename to man/dog.8.in
index 7fdee4a..9834a56 100644
--- a/man/collie.8.in
+++ b/man/dog.8.in
@@ -1,10 +1,10 @@
.TH SHEEPDOG 8 @DATE@
.SH NAME
-collie \- Command line utility for the sheep daemon
+dog \- Command line utility for the sheep daemon
.SH SYNOPSIS
-.B "collie <command> <subcommand> [options]"
+.B "dog <command> <subcommand> [options]"
.SH DESCRIPTION
-.B collie
+.B dog
- Sheepdog is a distributed storage system for QEMU. It provides
highly available block level storage volumes to virtual machines.
Sheepdog supports advanced volume management features such as snapshot,
@@ -12,10 +12,10 @@ cloning, and thin provisioning. The architecture of Sheepdog is fully
symmetric; there is no central node such as a meta-data server.
The server daemon is called sheep(8). A command line utility is available
-via collie(8). QEMU virtual machines use the sheep daemon via a block
+via dog(8). QEMU virtual machines use the sheep daemon via a block
driver available in qemu(1).
-For more information, run 'collie <command> <subcommand> --help'.
+For more information, run 'dog <command> <subcommand> --help'.
.SH COMMAND & SUBCOMMAND
@OPTIONS@
diff --git a/man/sheep.8.in b/man/sheep.8.in
index 93295a8..6f855c2 100644
--- a/man/sheep.8.in
+++ b/man/sheep.8.in
@@ -12,7 +12,7 @@ cloning, and thin provisioning. The architecture of Sheepdog is fully
symmetric; there is no central node such as a meta-data server.
The server daemon is called sheep(8). A command line utility is available
-via collie(8). QEMU virtual machines use the sheep daemon via a block
+via dog(8). QEMU virtual machines use the sheep daemon via a block
driver available in qemu(1).
.SH OPTIONS
@OPTIONS@
@@ -32,7 +32,7 @@ mount \-o remount,user_xattr /var/lib/sheepdog
.B /var/lib/sheepdog - Directory containing block storage information
.SH SEE ALSO
-.BR collie(8),
+.BR dog(8),
.BR qemu(1),
.BR sheepfs(8),
.BR corosync_overview(8)
diff --git a/man/sheepfs.8.in b/man/sheepfs.8.in
index 58d8624..0a3a3a1 100644
--- a/man/sheepfs.8.in
+++ b/man/sheepfs.8.in
@@ -12,7 +12,7 @@ cloning, and thin provisioning. The architecture of Sheepdog is fully
symmetric; there is no central node such as a meta-data server.
The server daemon is called sheep(8). A command line utility is available
-via collie(8). A pseudo file system is available via sheepfs(8). QEMU
+via dog(8). A pseudo file system is available via sheepfs(8). QEMU
virtual machines use the sheep daemon via a block driver available in qemu(1).
Sheepfs is a FUSE-based pseudo file system in userland to access both
@@ -47,7 +47,7 @@ none
.SH SEE ALSO
.BR sheep(8),
-.BR collie(8),
+.BR dog(8),
.BR qemu(1),
.BR corosync_overview(8)
diff --git a/script/Makefile.am b/script/Makefile.am
index 6ae958d..66ee428 100644
--- a/script/Makefile.am
+++ b/script/Makefile.am
@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = generic.in
-noinst_HEADERS = bash_completion_collie checkarch.sh vditest
+noinst_HEADERS = bash_completion_dog checkarch.sh vditest
target_INIT = generic
diff --git a/script/bash_completion_collie b/script/bash_completion_dog
similarity index 83%
rename from script/bash_completion_collie
rename to script/bash_completion_dog
index a368184..89c9544 100644
--- a/script/bash_completion_collie
+++ b/script/bash_completion_dog
@@ -1,6 +1,6 @@
#!bash
-_collie_cluster_format()
+_dog_cluster_format()
{
local cur
cur="${COMP_WORDS[COMP_CWORD]}"
@@ -15,7 +15,7 @@ _collie_cluster_format()
esac
}
-_collie_cluster_recover()
+_dog_cluster_recover()
{
local cur
cur="${COMP_WORDS[COMP_CWORD]}"
@@ -30,7 +30,7 @@ _collie_cluster_recover()
esac
}
-_collie_vdi_create()
+_dog_vdi_create()
{
local cur
cur="${COMP_WORDS[COMP_CWORD]}"
@@ -45,7 +45,7 @@ _collie_vdi_create()
esac
}
-_collie_vdi_snapshot()
+_dog_vdi_snapshot()
{
local cur
cur="${COMP_WORDS[COMP_CWORD]}"
@@ -60,7 +60,7 @@ _collie_vdi_snapshot()
esac
}
-_collie_vdi_clone()
+_dog_vdi_clone()
{
local cur
cur="${COMP_WORDS[COMP_CWORD]}"
@@ -75,7 +75,7 @@ _collie_vdi_clone()
esac
}
-_collie_vdi_read()
+_dog_vdi_read()
{
local cur
cur="${COMP_WORDS[COMP_CWORD]}"
@@ -90,12 +90,12 @@ _collie_vdi_read()
esac
}
-_collie_vdi_delete()
+_dog_vdi_delete()
{
- local cur collie vdilist
+ local cur dog vdilist
cur="${COMP_WORDS[COMP_CWORD]}"
- collie="${COMP_WORDS[0]}"
- vdilist="$(${collie} vdi list | tail -n+3 | grep '^ ' | awk '{print $1}')"
+ dog="${COMP_WORDS[0]}"
+ vdilist="$(${dog} vdi list | tail -n+3 | grep '^ ' | awk '{print $1}')"
case "$cur" in
-*)
@@ -110,12 +110,12 @@ _collie_vdi_delete()
esac
}
-_collie_vdi_object()
+_dog_vdi_object()
{
- local cur collie vdilist
+ local cur dog vdilist
cur="${COMP_WORDS[COMP_CWORD]}"
- collie="${COMP_WORDS[0]}"
- vdilist="$(${collie} vdi list | tail -n+3 | grep '^ ' | awk '{print $1}')"
+ dog="${COMP_WORDS[0]}"
+ vdilist="$(${dog} vdi list | tail -n+3 | grep '^ ' | awk '{print $1}')"
case "$cur" in
-*)
@@ -130,7 +130,7 @@ _collie_vdi_object()
esac
}
-_collie_vdi_setattr()
+_dog_vdi_setattr()
{
local cur
cur="${COMP_WORDS[COMP_CWORD]}"
@@ -145,7 +145,7 @@ _collie_vdi_setattr()
esac
}
-_collie_cluster()
+_dog_cluster()
{
local opts
opts="info format shutdown recover snapshot"
@@ -154,12 +154,12 @@ _collie_cluster()
info)
;;
format)
- _collie_cluster_format
+ _dog_cluster_format
;;
shutdown)
;;
recover)
- _collie_cluster_recover
+ _dog_cluster_recover
;;
snapshot)
;;
@@ -174,7 +174,7 @@ _collie_cluster()
esac
}
-_collie_node()
+_dog_node()
{
local opts
opts="info list recovery kill cache"
@@ -201,7 +201,7 @@ _collie_node()
esac
}
-_collie_vdi()
+_dog_vdi()
{
local opts
opts="create snapshot clone resize read write \
@@ -210,18 +210,18 @@ rollback flush backup restore"
case "$1" in
create)
- _collie_vdi_create
+ _dog_vdi_create
;;
snapshot)
- _collie_vdi_snapshot
+ _dog_vdi_snapshot
;;
clone)
- _collie_vdi_clone
+ _dog_vdi_clone
;;
resize)
;;
read)
- _collie_vdi_read
+ _dog_vdi_read
;;
write)
;;
@@ -232,13 +232,13 @@ rollback flush backup restore"
graph)
;;
delete)
- _collie_vdi_delete
+ _dog_vdi_delete
;;
object)
- _collie_vdi_object
+ _dog_vdi_object
;;
setattr)
- _collie_vdi_setattr
+ _dog_vdi_setattr
;;
getattr)
;;
@@ -265,7 +265,7 @@ rollback flush backup restore"
esac
}
-_collie()
+_dog()
{
local opts cur cmd subcmd i
opts="cluster node vdi"
@@ -283,13 +283,13 @@ _collie()
case "${cmd}" in
cluster)
- _collie_cluster ${subcmd}
+ _dog_cluster ${subcmd}
;;
node)
- _collie_node ${subcmd}
+ _dog_node ${subcmd}
;;
vdi)
- _collie_vdi ${subcmd}
+ _dog_vdi ${subcmd}
;;
"")
COMPREPLY=($( compgen -W "${opts}" -- ${cur} ))
@@ -300,4 +300,4 @@ _collie()
esac
}
-complete -F _collie collie
+complete -F _dog dog
diff --git a/sheep/sheep.c b/sheep/sheep.c
index 461a729..61d7f76 100644
--- a/sheep/sheep.c
+++ b/sheep/sheep.c
@@ -29,7 +29,7 @@ static const char bind_help[] =
"This tries to teach sheep listen to NIC of 192.168.1.1.\n"
"\nExample:\n\t$ sheep -b 0.0.0.0 ...\n"
"This tries to teach sheep listen to all the NICs available. It can be useful\n"
-"when you want sheep to response collie without specified address and port.\n";
+"when you want sheep to response dog without specified address and port.\n";
static const char ioaddr_help[] =
"Example:\n\t$ sheep -i host=192.168.1.1,port=7002 ...\n"
diff --git a/sheep/store.c b/sheep/store.c
index f4343b3..3e898b8 100644
--- a/sheep/store.c
+++ b/sheep/store.c
@@ -25,7 +25,7 @@ int update_epoch_log(uint32_t epoch, struct sd_node *nodes, size_t nr_nodes)
sd_debug("update epoch: %d, %zu", epoch, nr_nodes);
- /* Piggyback the epoch creation time for 'collie cluster info' */
+ /* Piggyback the epoch creation time for 'dog cluster info' */
time(&t);
nodes_len = nr_nodes * sizeof(struct sd_node);
len = nodes_len + sizeof(time_t);
diff --git a/sheepdog.spec.in b/sheepdog.spec.in
index 5e19366..b6ec4e6 100644
--- a/sheepdog.spec.in
+++ b/sheepdog.spec.in
@@ -63,12 +63,12 @@ fi
%doc COPYING README INSTALL
%{_sbindir}/sheep
%{_sbindir}/sheepfs
-%{_sbindir}/collie
+%{_sbindir}/dog
%attr(755,-,-)%config %{_initddir}/sheepdog
%dir %{_localstatedir}/lib/sheepdog
%{_mandir}/man8/sheep.8*
%{_mandir}/man8/sheepfs.8*
-%{_mandir}/man8/collie.8*
+%{_mandir}/man8/dog.8*
%changelog
* @date@ Autotools generated version <nobody at nowhere.org> - @version at -1.@alphatag@
diff --git a/sheepfs/cluster.c b/sheepfs/cluster.c
index 6665bce..3eb1d0b 100644
--- a/sheepfs/cluster.c
+++ b/sheepfs/cluster.c
@@ -50,7 +50,7 @@ size_t cluster_info_get_size(const char *path)
size_t len;
char cmd[COMMAND_LEN];
- snprintf(cmd, sizeof(cmd), "collie cluster info -a %s -p %d",
+ snprintf(cmd, sizeof(cmd), "dog cluster info -a %s -p %d",
sdhost, sdport);
buf = sheepfs_run_cmd(cmd);
if (!buf)
diff --git a/sheepfs/node.c b/sheepfs/node.c
index a3558d5..2a7df5b 100644
--- a/sheepfs/node.c
+++ b/sheepfs/node.c
@@ -57,7 +57,7 @@ size_t node_info_get_size(const char *path)
size_t len;
char cmd[COMMAND_LEN];
- snprintf(cmd, sizeof(cmd), "collie node info -a %s -p %d",
+ snprintf(cmd, sizeof(cmd), "dog node info -a %s -p %d",
sdhost, sdport);
buf = sheepfs_run_cmd(cmd);
if (!buf)
@@ -80,7 +80,7 @@ size_t node_list_get_size(const char *path)
size_t len;
char cmd[COMMAND_LEN];
- snprintf(cmd, sizeof(cmd), "collie node list -a %s -p %d",
+ snprintf(cmd, sizeof(cmd), "dog node list -a %s -p %d",
sdhost, sdport);
buf = sheepfs_run_cmd(cmd);
if (!buf)
diff --git a/sheepfs/vdi.c b/sheepfs/vdi.c
index 814a40b..f6d0639 100644
--- a/sheepfs/vdi.c
+++ b/sheepfs/vdi.c
@@ -62,7 +62,7 @@ size_t vdi_list_get_size(const char *path)
size_t len;
char cmd[COMMAND_LEN];
- snprintf(cmd, sizeof(cmd), "collie vdi list -a %s -p %d",
+ snprintf(cmd, sizeof(cmd), "dog vdi list -a %s -p %d",
sdhost, sdport);
buf = sheepfs_run_cmd(cmd);
if (!buf)
diff --git a/sheepfs/volume.c b/sheepfs/volume.c
index 73e7419..0558639 100644
--- a/sheepfs/volume.c
+++ b/sheepfs/volume.c
@@ -390,7 +390,7 @@ static int init_vdi_info(const char *entry, uint32_t *vid, size_t *size)
struct vdi_inode *inode = NULL, *dummy;
char command[COMMAND_LEN];
- snprintf(command, sizeof(command), "collie vdi list -r %s -a %s -p %d",
+ snprintf(command, sizeof(command), "dog vdi list -r %s -a %s -p %d",
entry, sdhost, sdport);
buf = sheepfs_run_cmd(command);
if (!buf)
diff --git a/tests/dynamorio/journaling/01.sh b/tests/dynamorio/journaling/01.sh
index 820793e..4d23929 100755
--- a/tests/dynamorio/journaling/01.sh
+++ b/tests/dynamorio/journaling/01.sh
@@ -15,7 +15,7 @@ sudo ~/dynamorio/build/bin64/drrun -c libjournaling.so 1 -- \
sleep 3
-collie cluster format -c 1
-collie vdi create test 100M
+dog cluster format -c 1
+dog vdi create test 100M
sudo sheep -d -c shepherd:127.0.0.1 -p 7000 -j size=64 /tmp/sheepdog/dynamorio/0
diff --git a/tests/functional/001 b/tests/functional/001
index 0897bb4..2c812e3 100755
--- a/tests/functional/001
+++ b/tests/functional/001
@@ -37,5 +37,5 @@ done
_wait_for_sheep 3
echo check whether all nodes have the same cluster info
for i in 0 1 2; do
- $COLLIE cluster info -p 700$i | _filter_cluster_info
+ $DOG cluster info -p 700$i | _filter_cluster_info
done
diff --git a/tests/functional/002 b/tests/functional/002
index 698f545..1812985 100755
--- a/tests/functional/002
+++ b/tests/functional/002
@@ -32,5 +32,5 @@ _wait_for_sheep 3
echo check whether all nodes have the same cluster info
for i in 0 1 2; do
- $COLLIE cluster info -p 700$i | _filter_cluster_info
+ $DOG cluster info -p 700$i | _filter_cluster_info
done
diff --git a/tests/functional/003 b/tests/functional/003
index c799164..d949bc1 100755
--- a/tests/functional/003
+++ b/tests/functional/003
@@ -30,5 +30,5 @@ done
_wait_for_sheep 3
echo check whether all nodes have the same cluster info
for i in 0 1 2; do
- $COLLIE cluster info -p 700$i | _filter_cluster_info
+ $DOG cluster info -p 700$i | _filter_cluster_info
done
diff --git a/tests/functional/004 b/tests/functional/004
index 83eb955..2a912db 100755
--- a/tests/functional/004
+++ b/tests/functional/004
@@ -38,5 +38,5 @@ done
_wait_for_sheep 5
echo check whether all nodes have the same cluster info
for i in 0 1 2 3 4; do
- $COLLIE cluster info -p 700$i | _filter_cluster_info
+ $DOG cluster info -p 700$i | _filter_cluster_info
done
diff --git a/tests/functional/005 b/tests/functional/005
index 5523b9e..09613fe 100755
--- a/tests/functional/005
+++ b/tests/functional/005
@@ -22,7 +22,7 @@ done
_wait_for_sheep 2 4
-$COLLIE cluster shutdown -p 7004
+$DOG cluster shutdown -p 7004
_wait_for_sheep_stop
nr=0
@@ -35,5 +35,5 @@ done
_wait_for_sheep 5
echo check whether all nodes have the same cluster info
for i in 0 1 2 3 4; do
- $COLLIE cluster info -p 700$i | _filter_cluster_info
+ $DOG cluster info -p 700$i | _filter_cluster_info
done
diff --git a/tests/functional/006 b/tests/functional/006
index 55ebbf8..308da48 100755
--- a/tests/functional/006
+++ b/tests/functional/006
@@ -19,7 +19,7 @@ _wait_for_sheep 10
echo check whether all nodes have the same cluster info
for i in `seq 0 9`; do
- $COLLIE cluster info -p 700$i | _filter_cluster_info > $STORE/cinfo.$i
+ $DOG cluster info -p 700$i | _filter_cluster_info > $STORE/cinfo.$i
done
for i in `seq 1 9`; do
diff -u $STORE/cinfo.0 $STORE/cinfo.$i
diff --git a/tests/functional/007 b/tests/functional/007
index 0fda0eb..0221033 100755
--- a/tests/functional/007
+++ b/tests/functional/007
@@ -9,7 +9,7 @@
_start_sheep 1
_wait_for_sheep 1 1
_cluster_format -p 7001 -c 1
-$COLLIE cluster shutdown -p 7001
+$DOG cluster shutdown -p 7001
_wait_for_sheep_stop
# start Sheepdog with one node
@@ -23,5 +23,5 @@ _wait_for_sheep 1
_start_sheep 2 # should succeed
_wait_for_sheep 2
-$COLLIE cluster info -p 7000 | _filter_cluster_info
-$COLLIE cluster info -p 7002 | _filter_cluster_info
+$DOG cluster info -p 7000 | _filter_cluster_info
+$DOG cluster info -p 7002 | _filter_cluster_info
diff --git a/tests/functional/008 b/tests/functional/008
index 665cb6b..9afe56b 100755
--- a/tests/functional/008
+++ b/tests/functional/008
@@ -13,11 +13,11 @@ _wait_for_sheep "8"
_cluster_format -c 3
for i in `seq 0 4`; do
- $COLLIE vdi create test$i 100M
+ $DOG vdi create test$i 100M
done
for i in `seq 0 4`; do
- _random | $COLLIE vdi write test$i -p 7000 &
+ _random | $DOG vdi write test$i -p 7000 &
done
sleep 3
@@ -43,7 +43,7 @@ wait
for i in `seq 0 4`; do
for port in `seq 0 7`; do
- $COLLIE vdi read test$i -p 700$port | md5sum > $STORE/csum.$port &
+ $DOG vdi read test$i -p 700$port | md5sum > $STORE/csum.$port &
done
wait
for port in `seq 1 7`; do
diff --git a/tests/functional/009 b/tests/functional/009
index acf9693..86a4806 100755
--- a/tests/functional/009
+++ b/tests/functional/009
@@ -14,13 +14,13 @@ _wait_for_sheep 3
_cluster_format -c 2
# create a pre-allocated vdi
-$COLLIE vdi create test 80M -P
+$DOG vdi create test 80M -P
# stop the 3rd node
_kill_sheep 2
# write data to the vdi
-_random | $COLLIE vdi write test
+_random | $DOG vdi write test
# restart the 3rd node
_start_sheep 2
@@ -29,7 +29,7 @@ _wait_for_sheep_recovery 0
# show md5sum of the vdi on each node
for i in 0 1 2; do
- $COLLIE vdi read test -p 700$i | md5sum > $STORE/csum.$i
+ $DOG vdi read test -p 700$i | md5sum > $STORE/csum.$i
done
diff -u $STORE/csum.0 $STORE/csum.1
diff --git a/tests/functional/010 b/tests/functional/010
index de7ddbb..d050941 100755
--- a/tests/functional/010
+++ b/tests/functional/010
@@ -11,13 +11,13 @@ done
_wait_for_sheep 5
_cluster_format
-$COLLIE cluster recover disable
+$DOG cluster recover disable
-$COLLIE vdi create test 4G
+$DOG vdi create test 4G
# create 8 objects
for i in `seq 0 7`; do
- echo $i | $COLLIE vdi write test $((i * 4 * 1024 * 1024)) 512
+ echo $i | $DOG vdi write test $((i * 4 * 1024 * 1024)) 512
done
ls $STORE/*/obj/* | _filter_store | sort
@@ -26,43 +26,43 @@ _kill_sheep 3
_kill_sheep 4
_wait_for_sheep 3
-$COLLIE cluster info | head -6 | _filter_cluster_info
+$DOG cluster info | head -6 | _filter_cluster_info
ls $STORE/*/obj/* | _filter_store | sort
# overwrite the objects to invoke object recovery
for i in `seq 4 7`; do
- $COLLIE vdi read test $((i * 4 * 1024 * 1024)) 512 | md5sum
- echo $(($i + 100)) | $COLLIE vdi write test $((i * 4 * 1024 * 1024)) 512
+ $DOG vdi read test $((i * 4 * 1024 * 1024)) 512 | md5sum
+ echo $(($i + 100)) | $DOG vdi write test $((i * 4 * 1024 * 1024)) 512
done
-$COLLIE cluster info | head -6 | _filter_cluster_info
+$DOG cluster info | head -6 | _filter_cluster_info
ls $STORE/*/obj/* | _filter_store | sort
-$COLLIE cluster recover enable
+$DOG cluster recover enable
_wait_for_sheep_recovery 0
-$COLLIE cluster info | head -6 | _filter_cluster_info
+$DOG cluster info | head -6 | _filter_cluster_info
ls $STORE/*/obj/* | _filter_store | sort
-$COLLIE cluster recover disable
+$DOG cluster recover disable
for i in `seq 3 7`; do
_start_sheep $i
done
_wait_for_sheep 8
-$COLLIE cluster info | head -6 | _filter_cluster_info
+$DOG cluster info | head -6 | _filter_cluster_info
ls $STORE/*/obj/* | _filter_store | sort
# overwrite the objects to invoke object recovery
for i in `seq 0 3`; do
- $COLLIE vdi read test $((i * 4 * 1024 * 1024)) 512 -p 7007 | md5sum
- echo $(($i + 200)) | $COLLIE vdi write test $((i * 4 * 1024 * 1024)) 512
+ $DOG vdi read test $((i * 4 * 1024 * 1024)) 512 -p 7007 | md5sum
+ echo $(($i + 200)) | $DOG vdi write test $((i * 4 * 1024 * 1024)) 512
done
-$COLLIE cluster info | head -6 | _filter_cluster_info
+$DOG cluster info | head -6 | _filter_cluster_info
ls $STORE/*/obj/* | _filter_store | sort
-$COLLIE cluster recover enable
+$DOG cluster recover enable
_wait_for_sheep_recovery 0
-$COLLIE cluster info | head -6 | _filter_cluster_info
+$DOG cluster info | head -6 | _filter_cluster_info
ls $STORE/*/obj/* | _filter_store | sort
diff --git a/tests/functional/011 b/tests/functional/011
index c2dcffd..71548f6 100755
--- a/tests/functional/011
+++ b/tests/functional/011
@@ -18,7 +18,7 @@ _wait_for_sheep 3
echo check the number of vnodes
for i in 0 1 2; do
- $COLLIE node list -p 700$i
+ $DOG node list -p 700$i
done
status=0
diff --git a/tests/functional/012 b/tests/functional/012
index 9b1657e..91ac244 100755
--- a/tests/functional/012
+++ b/tests/functional/012
@@ -16,4 +16,4 @@ _start_sheep 4 "-g"
_wait_for_sheep 4
echo check the number of vnodes
-$COLLIE node list
+$DOG node list
diff --git a/tests/functional/014 b/tests/functional/014
index b561ba4..764f3ee 100755
--- a/tests/functional/014
+++ b/tests/functional/014
@@ -11,19 +11,19 @@ done
_wait_for_sheep 2
_cluster_format -c 2
-$COLLIE vdi create test 4G
+$DOG vdi create test 4G
echo -n value > $STORE/tmp.dat
echo "key shouldn't be found"
-$COLLIE vdi getattr test key
+$DOG vdi getattr test key
-$COLLIE vdi setattr test key value
-$COLLIE vdi getattr test key | diff - $STORE/tmp.dat
+$DOG vdi setattr test key value
+$DOG vdi getattr test key | diff - $STORE/tmp.dat
-$COLLIE vdi setattr test key value -d
+$DOG vdi setattr test key value -d
echo "key shouldn't be found"
-$COLLIE vdi getattr test key
+$DOG vdi getattr test key
status=0
diff --git a/tests/functional/015 b/tests/functional/015
index 2492d3b..b985506 100755
--- a/tests/functional/015
+++ b/tests/functional/015
@@ -12,38 +12,38 @@ _wait_for_sheep 2
_cluster_format -c 2
-$COLLIE vdi create test 539545600
-$COLLIE vdi setattr test lock 1 -x &
-$COLLIE vdi setattr test lock 1 -x &
-$COLLIE vdi setattr test lock 1 -x &
-$COLLIE vdi setattr test lock 1 -x &
+$DOG vdi create test 539545600
+$DOG vdi setattr test lock 1 -x &
+$DOG vdi setattr test lock 1 -x &
+$DOG vdi setattr test lock 1 -x &
+$DOG vdi setattr test lock 1 -x &
wait
echo "there should be 3 setattr errors"
-$COLLIE vdi setattr test lock 1 -x &
-$COLLIE vdi setattr test lock 1 -x &
-$COLLIE vdi setattr test lock 1 -x &
-$COLLIE vdi setattr test lock 1 -x &
-$COLLIE vdi setattr test lock 1 -x &
-$COLLIE vdi setattr test lock 1 -x &
-$COLLIE vdi setattr test lock 1 -x &
-$COLLIE vdi setattr test lock 1 -x &
+$DOG vdi setattr test lock 1 -x &
+$DOG vdi setattr test lock 1 -x &
+$DOG vdi setattr test lock 1 -x &
+$DOG vdi setattr test lock 1 -x &
+$DOG vdi setattr test lock 1 -x &
+$DOG vdi setattr test lock 1 -x &
+$DOG vdi setattr test lock 1 -x &
+$DOG vdi setattr test lock 1 -x &
wait
echo "there should be 8 setattr errors"
-$COLLIE vdi setattr test lock 1 -x &
-$COLLIE vdi setattr test lock 1 -x &
-$COLLIE vdi setattr test lock 1 -x &
-$COLLIE vdi setattr test lock 1 -x &
-$COLLIE vdi setattr test lock 1 -x &
-$COLLIE vdi setattr test lock 1 -x &
+$DOG vdi setattr test lock 1 -x &
+$DOG vdi setattr test lock 1 -x &
+$DOG vdi setattr test lock 1 -x &
+$DOG vdi setattr test lock 1 -x &
+$DOG vdi setattr test lock 1 -x &
+$DOG vdi setattr test lock 1 -x &
wait
echo "there should be 6 setattr errors"
-$COLLIE vdi setattr test lock 1 -x &
-$COLLIE vdi setattr test lock 1 -x &
-$COLLIE vdi setattr test lock 1 -x &
-$COLLIE vdi setattr test lock 1 -x &
-$COLLIE vdi setattr test lock 1 -x &
+$DOG vdi setattr test lock 1 -x &
+$DOG vdi setattr test lock 1 -x &
+$DOG vdi setattr test lock 1 -x &
+$DOG vdi setattr test lock 1 -x &
+$DOG vdi setattr test lock 1 -x &
wait
echo "there should be 5 setattr errors"
diff --git a/tests/functional/016 b/tests/functional/016
index d52fd9c..92af8ef 100755
--- a/tests/functional/016
+++ b/tests/functional/016
@@ -11,23 +11,23 @@ done
_wait_for_sheep 3
_cluster_format -c 3
-$COLLIE vdi create base 100M -P
+$DOG vdi create base 100M -P
$QEMU_IMG snapshot -c tag sheepdog:base
sleep 1
-$COLLIE vdi clone -s 1 base test
+$DOG vdi clone -s 1 base test
sleep 1
-$COLLIE vdi delete test
+$DOG vdi delete test
sleep 1
-$COLLIE vdi delete base
+$DOG vdi delete base
sleep 1
-$COLLIE vdi delete -s 1 base
+$DOG vdi delete -s 1 base
sleep 3
echo there should be no vdi
diff --git a/tests/functional/017 b/tests/functional/017
index 30552f4..93e3d56 100755
--- a/tests/functional/017
+++ b/tests/functional/017
@@ -23,4 +23,4 @@ $QEMU_IMG snapshot -c tag2 sheepdog:test2
$QEMU_IO -c "write 0 512" sheepdog:test2:1 | _filter_qemu_io
$QEMU_IMG snapshot -c tag3 sheepdog:test2
-$COLLIE vdi tree | _filter_short_date
+$DOG vdi tree | _filter_short_date
diff --git a/tests/functional/018 b/tests/functional/018
index acec3c0..c0ab9ee 100755
--- a/tests/functional/018
+++ b/tests/functional/018
@@ -12,14 +12,14 @@ _wait_for_sheep "3"
_cluster_format -c 2
-$COLLIE vdi create test 4M
+$DOG vdi create test 4M
-_random | $COLLIE vdi write -w test
+_random | $DOG vdi write -w test
-$COLLIE vdi cache flush test
+$DOG vdi cache flush test
for port in `seq 0 2`; do
- $COLLIE vdi read test -p 700$port | md5sum > $STORE/csum.$port
+ $DOG vdi read test -p 700$port | md5sum > $STORE/csum.$port
done
for port in `seq 1 2`; do
diff --git a/tests/functional/019 b/tests/functional/019
index 7fc0921..efe8cb8 100755
--- a/tests/functional/019
+++ b/tests/functional/019
@@ -12,12 +12,12 @@ _wait_for_sheep "3"
_cluster_format -c 2
-$COLLIE vdi create test 4M
+$DOG vdi create test 4M
-_random | $COLLIE vdi write test
+_random | $DOG vdi write test
for port in `seq 0 2`; do
- $COLLIE vdi read test -p 700$port | md5sum > $STORE/csum.$port
+ $DOG vdi read test -p 700$port | md5sum > $STORE/csum.$port
done
for port in `seq 1 2`; do
diff --git a/tests/functional/020 b/tests/functional/020
index 53f1d20..77066bf 100755
--- a/tests/functional/020
+++ b/tests/functional/020
@@ -12,9 +12,9 @@ _wait_for_sheep "3"
_cluster_format -c 2
-$COLLIE vdi create test 40M
+$DOG vdi create test 40M
-_random | $COLLIE vdi write test
+_random | $DOG vdi write test
# check cache size, should be 20 * 80%
nr=`ls $STORE/0/cache/7c2b25 | wc -l`
diff --git a/tests/functional/022 b/tests/functional/022
index 6330dba..c2fe9f0 100755
--- a/tests/functional/022
+++ b/tests/functional/022
@@ -13,6 +13,6 @@ _wait_for_sheep "3"
_cluster_format -c 3
echo "creating a VDI should fail without data nodes available"
-$COLLIE vdi create test 100M
+$DOG vdi create test 100M
status=0
diff --git a/tests/functional/023 b/tests/functional/023
index 52e8281..dc3747f 100755
--- a/tests/functional/023
+++ b/tests/functional/023
@@ -10,7 +10,7 @@ done
_wait_for_sheep "1"
-$COLLIE cluster format -c 1
+$DOG cluster format -c 1
for i in `seq 1 9`; do
_start_sheep $i "-g"
@@ -21,7 +21,7 @@ _wait_for_sheep "10"
echo "comparing cluster info for all sheep. Should be the same"
for i in `seq 0 10`; do
- $COLLIE cluster info > $STORE/cinfo.$i
+ $DOG cluster info > $STORE/cinfo.$i
done
for i in `seq 1 10`; do
diff -u $STORE/cinfo.0 $STORE/cinfo.$i
diff --git a/tests/functional/024 b/tests/functional/024
index 9ef591d..87421a8 100755
--- a/tests/functional/024
+++ b/tests/functional/024
@@ -19,7 +19,7 @@ echo "formatting cluster"
_cluster_format -c 1
echo "creating vdi ${NAME}"
-$COLLIE vdi create ${VDI_NAME} ${VDI_SIZE}
+$DOG vdi create ${VDI_NAME} ${VDI_SIZE}
sleep 1
echo "filling ${VDI_NAME} with data"
diff --git a/tests/functional/025 b/tests/functional/025
index 2669888..2eb2f6d 100755
--- a/tests/functional/025
+++ b/tests/functional/025
@@ -23,7 +23,7 @@ echo "formatting cluster"
_cluster_format -c 2
echo "creating vdi ${NAME}"
-$COLLIE vdi create ${VDI_NAME} ${VDI_SIZE}
+$DOG vdi create ${VDI_NAME} ${VDI_SIZE}
echo "filling ${VDI_NAME} with data"
$QEMU_IO -c "write 0 ${VDI_SIZE}" sheepdog:${VDI_NAME} | _filter_qemu_io
@@ -40,5 +40,5 @@ _wait_for_sheep 4
echo "check that all sheep are alive"
for i in `seq 0 3`; do
- $COLLIE cluster info -p 700$i | _filter_cluster_info
+ $DOG cluster info -p 700$i | _filter_cluster_info
done
diff --git a/tests/functional/026 b/tests/functional/026
index 94af215..bf62a6d 100755
--- a/tests/functional/026
+++ b/tests/functional/026
@@ -19,7 +19,7 @@ _cluster_format
# create new vdis
(
for i in `seq 0 40`;do
- $COLLIE vdi create test$i 4M
+ $DOG vdi create test$i 4M
done
) &
@@ -36,7 +36,7 @@ _wait_for_sheep_recovery 0
for i in `seq 1 5`; do _start_sheep $i;done
_wait_for_sheep 8
-# wait for collie to finish
+# wait for dog to finish
wait
-echo `$COLLIE vdi list | wc -l`
+echo `$DOG vdi list | wc -l`
diff --git a/tests/functional/027 b/tests/functional/027
index 455e300..e851e69 100755
--- a/tests/functional/027
+++ b/tests/functional/027
@@ -12,8 +12,8 @@ _wait_for_sheep "4"
_cluster_format -c 2
-$COLLIE vdi create test0 40M
-$COLLIE vdi create test1 40M
+$DOG vdi create test0 40M
+$DOG vdi create test1 40M
_kill_sheep 3
diff --git a/tests/functional/028 b/tests/functional/028
index 4b34db3..ff813c5 100755
--- a/tests/functional/028
+++ b/tests/functional/028
@@ -10,13 +10,13 @@ _wait_for_sheep 2
_cluster_format -c 2
-$COLLIE vdi create test 100M
+$DOG vdi create test 100M
for i in `seq 0 24`; do
- echo $i | $COLLIE vdi write test $((i * 4 * 1024 * 1024)) 512
+ echo $i | $DOG vdi write test $((i * 4 * 1024 * 1024)) 512
done
-$COLLIE vdi read test | md5sum
+$DOG vdi read test | md5sum
for i in 2 3; do
_start_sheep $i
@@ -27,10 +27,10 @@ done
# write different content
for i in `seq 0 24`; do
- echo $(($i+1)) | $COLLIE vdi write test $((i * 4 * 1024 * 1024)) 512 -p 7002
+ echo $(($i+1)) | $DOG vdi write test $((i * 4 * 1024 * 1024)) 512 -p 7002
done
-$COLLIE vdi read test -p 7002 | md5sum
+$DOG vdi read test -p 7002 | md5sum
for i in 2 3; do
_start_sheep $(($i-2))
@@ -39,11 +39,11 @@ for i in 2 3; do
_wait_for_sheep_recovery $(($i-2))
done
-$COLLIE vdi read test | md5sum
-$COLLIE vdi read test -p 7001 | md5sum
+$DOG vdi read test | md5sum
+$DOG vdi read test -p 7001 | md5sum
-$COLLIE vdi object test
+$DOG vdi object test
for i in `seq 0 24`; do
- $COLLIE vdi object -i $i test
+ $DOG vdi object -i $i test
done
diff --git a/tests/functional/029 b/tests/functional/029
index ab361f4..7101d5e 100755
--- a/tests/functional/029
+++ b/tests/functional/029
@@ -13,11 +13,11 @@ _wait_for_sheep 7
_cluster_format -c 3
for i in `seq 2 4`; do
- $COLLIE vdi create test$i 20M -c $i -P
+ $DOG vdi create test$i 20M -c $i -P
done
-$COLLIE vdi snapshot -s tag test2
-$COLLIE vdi clone -s 1 test2 clone -c 3
+$DOG vdi snapshot -s tag test2
+$DOG vdi clone -s 1 test2 clone -c 3
for i in `seq 2 3`; do
@@ -30,12 +30,12 @@ done
_wait_for_sheep_recovery 0
-$COLLIE vdi delete clone
-$COLLIE vdi delete -s 1 test2
+$DOG vdi delete clone
+$DOG vdi delete -s 1 test2
_vdi_list
for i in `seq 2 4`; do
- $COLLIE vdi object test$i -i 1;
+ $DOG vdi object test$i -i 1;
done
diff --git a/tests/functional/030 b/tests/functional/030
index 7e9daae..219f348 100755
--- a/tests/functional/030
+++ b/tests/functional/030
@@ -13,26 +13,26 @@ rm -rf $TMPDIR
_cluster_format -c 3
-$COLLIE vdi create test1 10M
-$COLLIE vdi create test2 10M
-
-_random | $COLLIE vdi write test1
-_random | $COLLIE vdi write test2
-$COLLIE vdi read test1 | md5sum > $STORE/csum.11.org
-$COLLIE vdi read test2 | md5sum > $STORE/csum.21.org
-$COLLIE vdi snapshot test1
-$COLLIE vdi snapshot test2
-$COLLIE cluster snapshot save s1 $TMPDIR
-$COLLIE cluster snapshot list $TMPDIR | _filter_date
-
-_random | $COLLIE vdi write test1
-_random | $COLLIE vdi write test2
-$COLLIE vdi read test1 | md5sum > $STORE/csum.12.org
-$COLLIE vdi read test2 | md5sum > $STORE/csum.22.org
-$COLLIE vdi snapshot test1
-$COLLIE vdi snapshot test2
-$COLLIE cluster snapshot save s2 $TMPDIR
-$COLLIE cluster snapshot list $TMPDIR | _filter_date
+$DOG vdi create test1 10M
+$DOG vdi create test2 10M
+
+_random | $DOG vdi write test1
+_random | $DOG vdi write test2
+$DOG vdi read test1 | md5sum > $STORE/csum.11.org
+$DOG vdi read test2 | md5sum > $STORE/csum.21.org
+$DOG vdi snapshot test1
+$DOG vdi snapshot test2
+$DOG cluster snapshot save s1 $TMPDIR
+$DOG cluster snapshot list $TMPDIR | _filter_date
+
+_random | $DOG vdi write test1
+_random | $DOG vdi write test2
+$DOG vdi read test1 | md5sum > $STORE/csum.12.org
+$DOG vdi read test2 | md5sum > $STORE/csum.22.org
+$DOG vdi snapshot test1
+$DOG vdi snapshot test2
+$DOG cluster snapshot save s2 $TMPDIR
+$DOG cluster snapshot list $TMPDIR | _filter_date
_vdi_list
@@ -43,11 +43,11 @@ done
_wait_for_sheep 4
_cluster_format -c 3
-$COLLIE cluster snapshot load s1 $TMPDIR
+$DOG cluster snapshot load s1 $TMPDIR
_vdi_list
-$COLLIE vdi read test1 | md5sum > $STORE/csum.11.new
-$COLLIE vdi read test2 | md5sum > $STORE/csum.21.new
+$DOG vdi read test1 | md5sum > $STORE/csum.11.new
+$DOG vdi read test2 | md5sum > $STORE/csum.21.new
diff -u $STORE/csum.11.org $STORE/csum.11.new
diff -u $STORE/csum.21.org $STORE/csum.21.new
@@ -57,7 +57,7 @@ for i in `seq 0 3`; do
done
_wait_for_sheep 4
-$COLLIE cluster snapshot load s2 $TMPDIR
+$DOG cluster snapshot load s2 $TMPDIR
_vdi_list
_cleanup
@@ -66,20 +66,20 @@ for i in `seq 0 3`; do
done
_wait_for_sheep 4
-$COLLIE cluster snapshot load 2 $TMPDIR
+$DOG cluster snapshot load 2 $TMPDIR
_vdi_list
-$COLLIE vdi read -s 2 test1 | md5sum > $STORE/csum.12.new
-$COLLIE vdi read -s 2 test2 | md5sum > $STORE/csum.22.new
+$DOG vdi read -s 2 test1 | md5sum > $STORE/csum.12.new
+$DOG vdi read -s 2 test2 | md5sum > $STORE/csum.22.new
diff -u $STORE/csum.12.org $STORE/csum.12.new
diff -u $STORE/csum.22.org $STORE/csum.22.new
-$COLLIE vdi read test1 | md5sum > $STORE/csum.12.new
-$COLLIE vdi read test2 | md5sum > $STORE/csum.22.new
+$DOG vdi read test1 | md5sum > $STORE/csum.12.new
+$DOG vdi read test2 | md5sum > $STORE/csum.22.new
diff -u $STORE/csum.12.org $STORE/csum.12.new
diff -u $STORE/csum.22.org $STORE/csum.22.new
-$COLLIE vdi read -s 1 test1 | md5sum > $STORE/csum.11.new
-$COLLIE vdi read -s 1 test2 | md5sum > $STORE/csum.21.new
+$DOG vdi read -s 1 test1 | md5sum > $STORE/csum.11.new
+$DOG vdi read -s 1 test2 | md5sum > $STORE/csum.21.new
diff -u $STORE/csum.11.org $STORE/csum.11.new
diff -u $STORE/csum.21.org $STORE/csum.21.new
diff --git a/tests/functional/031 b/tests/functional/031
index dcb6a42..93623ff 100755
--- a/tests/functional/031
+++ b/tests/functional/031
@@ -10,12 +10,12 @@ _wait_for_sheep 1
_cluster_format -c 1
for i in 1 2 3; do
- $COLLIE vdi create test$i ${i}00MB
+ $DOG vdi create test$i ${i}00MB
done
_vdi_list
-$COLLIE cluster shutdown
+$DOG cluster shutdown
_wait_for_sheep_stop
_start_sheep 0
diff --git a/tests/functional/032 b/tests/functional/032
index 691d360..467a402 100755
--- a/tests/functional/032
+++ b/tests/functional/032
@@ -12,13 +12,13 @@ _wait_for_sheep 8
_cluster_format
-$COLLIE vdi create test 100MB
+$DOG vdi create test 100MB
# create 25 objects
for i in `seq 0 24`; do
- echo $i | $COLLIE vdi write test $((i * 4 * 1024 * 1024)) 512
+ echo $i | $DOG vdi write test $((i * 4 * 1024 * 1024)) 512
done
-$COLLIE vdi read test | md5sum
+$DOG vdi read test | md5sum
for i in `seq 7 -1 0`; do
_wait_for_sheep_recovery 0
@@ -42,4 +42,4 @@ for i in `seq 0 24`; do
done
ls $STORE/*/obj/.stale | _filter_store | sort
-$COLLIE vdi read test | md5sum
+$DOG vdi read test | md5sum
diff --git a/tests/functional/033 b/tests/functional/033
index b5aa00e..d752c5d 100755
--- a/tests/functional/033
+++ b/tests/functional/033
@@ -12,13 +12,13 @@ _wait_for_sheep 8
_cluster_format
-$COLLIE vdi create test 100MB
+$DOG vdi create test 100MB
# create 25 objects
for i in `seq 0 24`; do
- echo $i | $COLLIE vdi write test $((i * 4 * 1024 * 1024)) 512
+ echo $i | $DOG vdi write test $((i * 4 * 1024 * 1024)) 512
done
-$COLLIE vdi read test | md5sum
+$DOG vdi read test | md5sum
# kill 7 nodes without waiting to finish recovery
for i in 7 6 5; do
@@ -53,4 +53,4 @@ for i in `seq 0 24`; do
done
ls $STORE/*/obj/.stale | _filter_store | sort
-$COLLIE vdi read test | md5sum
+$DOG vdi read test | md5sum
diff --git a/tests/functional/034 b/tests/functional/034
index c0ccab7..07caf5c 100755
--- a/tests/functional/034
+++ b/tests/functional/034
@@ -17,10 +17,10 @@ _wait_for_sheep 8
_cluster_format
-$COLLIE vdi create test 100MB
+$DOG vdi create test 100MB
# create 25 objects
for i in `seq 0 24`; do
- echo $i | $COLLIE vdi write test $((i * 4 * 1024 * 1024)) 512
+ echo $i | $DOG vdi write test $((i * 4 * 1024 * 1024)) 512
done
# kill 5 nodes
@@ -35,10 +35,10 @@ _wait_for_sheep 3
# update vdi
for i in `seq 0 24`; do
- echo $(($i + 100)) | $COLLIE vdi write test $((i * 4 * 1024 * 1024)) 512
+ echo $(($i + 100)) | $DOG vdi write test $((i * 4 * 1024 * 1024)) 512
done
-$COLLIE vdi read test | md5sum
+$DOG vdi read test | md5sum
# start 5 nodes who have old objects
for i in `seq 3 7`; do
@@ -48,5 +48,5 @@ done
_wait_for_sheep 8
for i in `seq 0 7`; do
- $COLLIE vdi read test -p 700$i | md5sum
+ $DOG vdi read test -p 700$i | md5sum
done
diff --git a/tests/functional/035 b/tests/functional/035
index dda4dd4..c1559e0 100755
--- a/tests/functional/035
+++ b/tests/functional/035
@@ -22,8 +22,8 @@ _wait_for_sheep 6
_cluster_format -c 3
-$COLLIE vdi create test 40M
-_random | $COLLIE vdi write test &
+$DOG vdi create test 40M
+_random | $DOG vdi write test &
sleep 3
# Test write timeout
@@ -31,14 +31,14 @@ for i in `seq 1 4`; do
_simulate_machine_down $i
done
-# wait for collie to finish
+# wait for dog to finish
wait
_wait_for_sheep_recovery 0
-$COLLIE vdi read test | md5sum > $STORE/csum.1
+$DOG vdi read test | md5sum > $STORE/csum.1
for i in `seq 0 9`; do
- $COLLIE vdi object -i $i test
+ $DOG vdi object -i $i test
done
for i in 6 7 8; do
@@ -48,7 +48,7 @@ done
_wait_for_sheep_recovery 0
# Test read timeout
-$COLLIE vdi read test | md5sum > $STORE/csum.2 &
+$DOG vdi read test | md5sum > $STORE/csum.2 &
for i in `seq 5 7`; do
_simulate_machine_down $i
done
diff --git a/tests/functional/036 b/tests/functional/036
index 36db7c9..dd440dd 100755
--- a/tests/functional/036
+++ b/tests/functional/036
@@ -9,7 +9,7 @@ for i in `seq 0 7`; do
done
while true; do
- $COLLIE cluster format 2> /dev/null
+ $DOG cluster format 2> /dev/null
if [ $? == 0 ]; then
break
fi
@@ -30,6 +30,6 @@ kill $pid > /dev/null 2>&1
_wait_for_sheep 8
for i in `seq 0 7`; do
- $COLLIE cluster info -p 700$i | head -1
- $COLLIE node list -p 700$i
+ $DOG cluster info -p 700$i | head -1
+ $DOG node list -p 700$i
done
diff --git a/tests/functional/037 b/tests/functional/037
index a4753c8..c203752 100755
--- a/tests/functional/037
+++ b/tests/functional/037
@@ -10,13 +10,13 @@ done
_wait_for_sheep 8
-$COLLIE cluster format &
+$DOG cluster format &
for i in `seq 5 7`; do
_kill_sheep $i
done
-# wait for collie to finish
+# wait for dog to finish
wait
for i in `seq 5 7`; do
@@ -26,6 +26,6 @@ done
_wait_for_sheep "8"
for i in `seq 0 7`; do
- $COLLIE cluster info -p 700$i | head -1
- $COLLIE node list -p 700$i
+ $DOG cluster info -p 700$i | head -1
+ $DOG node list -p 700$i
done
diff --git a/tests/functional/038 b/tests/functional/038
index 4b07ee1..0c62988 100755
--- a/tests/functional/038
+++ b/tests/functional/038
@@ -9,7 +9,7 @@ for i in `seq 0 7`; do
done
while true; do
- $COLLIE cluster format 2> /dev/null
+ $DOG cluster format 2> /dev/null
if [ $? == 0 ]; then
break
fi
@@ -21,7 +21,7 @@ for i in `seq 4 7`; do
_kill_sheep $i
done
-# wait for collie to finish
+# wait for dog to finish
for cnt in `seq 60`; do # wait at most 60 seconds
jobs 1 > /dev/null 2>&1
if [ $? != 0 ]; then
@@ -38,6 +38,6 @@ done
_wait_for_sheep "8"
for i in `seq 0 7`; do
- $COLLIE cluster info -p 700$i | head -1
- $COLLIE node list -p 700$i
+ $DOG cluster info -p 700$i | head -1
+ $DOG node list -p 700$i
done
diff --git a/tests/functional/039 b/tests/functional/039
index 74bf2e1..b7e1f57 100755
--- a/tests/functional/039
+++ b/tests/functional/039
@@ -11,46 +11,46 @@ done
_wait_for_sheep 5
_cluster_format
-$COLLIE vdi create test 4G
+$DOG vdi create test 4G
$QEMU_IO -c "write 0 512 -P 1" sheepdog:test | _filter_qemu_io
-$COLLIE vdi snapshot test -s snap1
+$DOG vdi snapshot test -s snap1
$QEMU_IO -c "write 0 512 -P 2" sheepdog:test | _filter_qemu_io
-echo yes | $COLLIE vdi rollback test -s snap1
+echo yes | $DOG vdi rollback test -s snap1
$QEMU_IO -c "read 0 512 -P 1" sheepdog:test | _filter_qemu_io
-$COLLIE vdi tree | _filter_short_date
+$DOG vdi tree | _filter_short_date
_vdi_list
$QEMU_IO -c "write 0 512 -P 2" sheepdog:test | _filter_qemu_io
-$COLLIE vdi snapshot test -s snap2
+$DOG vdi snapshot test -s snap2
$QEMU_IO -c "write 0 512 -P 3" sheepdog:test | _filter_qemu_io
-echo yes | $COLLIE vdi rollback test -s snap1
+echo yes | $DOG vdi rollback test -s snap1
$QEMU_IO -c "read 0 512 -P 1" sheepdog:test | _filter_qemu_io
-$COLLIE vdi tree | _filter_short_date
+$DOG vdi tree | _filter_short_date
_vdi_list
-echo yes | $COLLIE vdi rollback test -s snap2
+echo yes | $DOG vdi rollback test -s snap2
$QEMU_IO -c "read 0 512 -P 2" sheepdog:test | _filter_qemu_io
-$COLLIE vdi tree | _filter_short_date
+$DOG vdi tree | _filter_short_date
_vdi_list
-echo yes | $COLLIE vdi rollback test -s snap1
+echo yes | $DOG vdi rollback test -s snap1
$QEMU_IO -c "read 0 512 -P 1" sheepdog:test | _filter_qemu_io
-$COLLIE vdi tree | _filter_short_date
+$DOG vdi tree | _filter_short_date
_vdi_list
$QEMU_IO -c "write 0 512 -P 3" sheepdog:test | _filter_qemu_io
-$COLLIE vdi snapshot test -s snap3
+$DOG vdi snapshot test -s snap3
$QEMU_IO -c "write 0 512 -P 4" sheepdog:test | _filter_qemu_io
-$COLLIE vdi snapshot test -s snap4
+$DOG vdi snapshot test -s snap4
# these fail since the snap ids don't belong to snapshots
-echo yes | $COLLIE vdi rollback test -s 0
-echo yes | $COLLIE vdi rollback test -s 5
+echo yes | $DOG vdi rollback test -s 0
+echo yes | $DOG vdi rollback test -s 5
-echo yes | $COLLIE vdi rollback test -s snap3
+echo yes | $DOG vdi rollback test -s snap3
$QEMU_IO -c "read 0 512 -P 3" sheepdog:test | _filter_qemu_io
-$COLLIE vdi tree | _filter_short_date
+$DOG vdi tree | _filter_short_date
_vdi_list
diff --git a/tests/functional/040 b/tests/functional/040
index 2935226..77bbb61 100755
--- a/tests/functional/040
+++ b/tests/functional/040
@@ -10,7 +10,7 @@ _wait_for_sheep 1
_cluster_format -c 1
# create vdi in background
-$COLLIE vdi create test 4G &
+$DOG vdi create test 4G &
# the created vdi object will be move from sheep 0 to sheep 1
_start_sheep 1
diff --git a/tests/functional/041 b/tests/functional/041
index f72708d..6b9d87b 100755
--- a/tests/functional/041
+++ b/tests/functional/041
@@ -11,51 +11,51 @@ done
_wait_for_sheep 5
_cluster_format
-$COLLIE vdi create test 12M
+$DOG vdi create test 12M
# create the first object
-echo 0 | $COLLIE vdi write test 0 512
-$COLLIE vdi snapshot test -s snap1
+echo 0 | $DOG vdi write test 0 512
+$DOG vdi snapshot test -s snap1
# create the second object
-echo 1 | $COLLIE vdi write test $((4 * 1024 * 1024)) 512
-$COLLIE vdi snapshot test -s snap2
+echo 1 | $DOG vdi write test $((4 * 1024 * 1024)) 512
+$DOG vdi snapshot test -s snap2
# update the first object
-echo 2 | $COLLIE vdi write test 0 512
-$COLLIE vdi snapshot test -s snap3
+echo 2 | $DOG vdi write test 0 512
+$DOG vdi snapshot test -s snap3
# check vdis
_vdi_list
-$COLLIE vdi tree | _filter_short_date
+$DOG vdi tree | _filter_short_date
for i in `seq 1 3`; do
- $COLLIE vdi read test -s snap$i | md5sum
+ $DOG vdi read test -s snap$i | md5sum
done
# create backup files between snapshots
-$COLLIE vdi backup test -F snap1 -s snap2 > $STORE/backup.1.2
-$COLLIE vdi backup test -F snap1 -s snap3 > $STORE/backup.1.3
-$COLLIE vdi backup test -F snap2 -s snap3 > $STORE/backup.2.3
+$DOG vdi backup test -F snap1 -s snap2 > $STORE/backup.1.2
+$DOG vdi backup test -F snap1 -s snap3 > $STORE/backup.1.3
+$DOG vdi backup test -F snap2 -s snap3 > $STORE/backup.2.3
# restore backups
-$COLLIE vdi restore test -s snap1 < $STORE/backup.1.2
+$DOG vdi restore test -s snap1 < $STORE/backup.1.2
_vdi_list
-$COLLIE vdi tree | _filter_short_date
+$DOG vdi tree | _filter_short_date
-$COLLIE vdi restore test -s 4 < $STORE/backup.2.3
+$DOG vdi restore test -s 4 < $STORE/backup.2.3
_vdi_list
-$COLLIE vdi tree | _filter_short_date
+$DOG vdi tree | _filter_short_date
-$COLLIE vdi restore test -s snap1 < $STORE/backup.1.3
+$DOG vdi restore test -s snap1 < $STORE/backup.1.3
_vdi_list
-$COLLIE vdi tree | _filter_short_date
+$DOG vdi tree | _filter_short_date
-$COLLIE vdi restore test -s snap2 < $STORE/backup.2.3
+$DOG vdi restore test -s snap2 < $STORE/backup.2.3
_vdi_list
-$COLLIE vdi tree | _filter_short_date
+$DOG vdi tree | _filter_short_date
# check vdi contents
-$COLLIE vdi read test | md5sum
-for i in `seq 1 $($COLLIE vdi list | grep "^s " | wc -l)`; do
- $COLLIE vdi read test -s $i | md5sum
+$DOG vdi read test | md5sum
+for i in `seq 1 $($DOG vdi list | grep "^s " | wc -l)`; do
+ $DOG vdi read test -s $i | md5sum
done
diff --git a/tests/functional/042 b/tests/functional/042
index df706a1..54e8a33 100755
--- a/tests/functional/042
+++ b/tests/functional/042
@@ -25,8 +25,8 @@ _wait_for_sheep 4
_cluster_format
# create two VDIs before there are enough spaces
-$COLLIE vdi create test0 100M
-$COLLIE vdi create test1 100M
+$DOG vdi create test0 100M
+$DOG vdi create test1 100M
# make sheep 0 and 1 disk full
dd if=/dev/zero of=$STORE/2/zero > /dev/null 2>&1
@@ -34,16 +34,16 @@ dd if=/dev/zero of=$STORE/3/zero > /dev/null 2>&1
# test data write against disk-full cluster
for i in `seq 0 10`; do
- echo $i | $COLLIE vdi write test0 $((i * 4 * 1024 * 1024)) 512 -p 7000
- echo $i | $COLLIE vdi write test1 $((i * 4 * 1024 * 1024)) 512 -p 7002
+ echo $i | $DOG vdi write test0 $((i * 4 * 1024 * 1024)) 512 -p 7000
+ echo $i | $DOG vdi write test1 $((i * 4 * 1024 * 1024)) 512 -p 7002
done
# test vdi creation against disk-full cluster
-$COLLIE vdi create test2 100M -p 7000
-$COLLIE vdi create test3 100M -p 7002
+$DOG vdi create test2 100M -p 7000
+$DOG vdi create test3 100M -p 7002
for i in `seq 0 3`; do
- $COLLIE node list -p 700$i
+ $DOG node list -p 700$i
done
_node_info
ls $STORE/*/obj/* | _filter_store | sort
diff --git a/tests/functional/043 b/tests/functional/043
index 2a59a4e..d336cf5 100755
--- a/tests/functional/043
+++ b/tests/functional/043
@@ -12,43 +12,43 @@ _wait_for_sheep 5
_cluster_format
-$COLLIE vdi create test 40M
+$DOG vdi create test 40M
for i in `seq 0 10`; do
- echo $i | $COLLIE vdi write test $((i * 4 * 1024 * 1024)) 512
+ echo $i | $DOG vdi write test $((i * 4 * 1024 * 1024)) 512
done
for i in 0 1 2 3 4; do
- $COLLIE vdi read test -p 700$i | md5sum
- $COLLIE cluster info -p 700$i | _filter_cluster_info
+ $DOG vdi read test -p 700$i | md5sum
+ $DOG cluster info -p 700$i | _filter_cluster_info
done
# remove obj directory to occur EIO
_safe_remove $STORE/4/obj
for i in `seq 0 10`; do
- echo $(($i + 100)) | $COLLIE vdi write test $((i * 4 * 1024 * 1024)) 512
+ echo $(($i + 100)) | $DOG vdi write test $((i * 4 * 1024 * 1024)) 512
done
for i in 0 1 2 3 4; do
- $COLLIE vdi read test -p 700$i | md5sum
- $COLLIE cluster info -p 700$i | _filter_cluster_info
+ $DOG vdi read test -p 700$i | md5sum
+ $DOG cluster info -p 700$i | _filter_cluster_info
done
# check whether sheep 4 can receive confchg event
_kill_sheep 3
for i in `seq 0 10`; do
- echo $(($i + 200)) | $COLLIE vdi write test $((i * 4 * 1024 * 1024)) 512
+ echo $(($i + 200)) | $DOG vdi write test $((i * 4 * 1024 * 1024)) 512
done
for i in 0 1 2 4; do
- $COLLIE vdi read test -p 700$i | md5sum
- $COLLIE cluster info -p 700$i | _filter_cluster_info
+ $DOG vdi read test -p 700$i | md5sum
+ $DOG cluster info -p 700$i | _filter_cluster_info
done
# check whether sheep 4 can receive notify event
-$COLLIE vdi create test2 20M
+$DOG vdi create test2 20M
for i in 0 1 2 4; do
_vdi_list -p 700$i
@@ -56,4 +56,4 @@ done
# check whether we can write to a gateway after EIO
_safe_remove $STORE/0/obj
-echo hello | $COLLIE vdi write test 0 512
+echo hello | $DOG vdi write test 0 512
diff --git a/tests/functional/044 b/tests/functional/044
index 75a427c..fc5d8be 100755
--- a/tests/functional/044
+++ b/tests/functional/044
@@ -11,55 +11,55 @@ done
_wait_for_sheep 3
_cluster_format
-$COLLIE vdi create base1 20M -p 7000
-$COLLIE vdi create base2 20M -p 7001
-$COLLIE vdi create base3 20M -p 7002
+$DOG vdi create base1 20M -p 7000
+$DOG vdi create base2 20M -p 7001
+$DOG vdi create base3 20M -p 7002
for i in `seq 0 4`; do
- echo $i | $COLLIE vdi write base1 $((i * 4 * 1024 * 1024)) 512
+ echo $i | $DOG vdi write base1 $((i * 4 * 1024 * 1024)) 512
done &
for i in `seq 0 4`; do
- echo $i | $COLLIE vdi write base2 $((i * 4 * 1024 * 1024)) 512
+ echo $i | $DOG vdi write base2 $((i * 4 * 1024 * 1024)) 512
done &
for i in `seq 0 4`; do
- echo $i | $COLLIE vdi write base3 $((i * 4 * 1024 * 1024)) 512
+ echo $i | $DOG vdi write base3 $((i * 4 * 1024 * 1024)) 512
done &
wait
-$COLLIE vdi snapshot -s snap0 base1 -p 7000
-$COLLIE vdi snapshot -s snap0 base2 -p 7001
-$COLLIE vdi snapshot -s snap0 base3 -p 7002
+$DOG vdi snapshot -s snap0 base1 -p 7000
+$DOG vdi snapshot -s snap0 base2 -p 7001
+$DOG vdi snapshot -s snap0 base3 -p 7002
sleep 1
for i in `seq 1 10`; do
- $COLLIE vdi snapshot -s snap$i base1 -p 7000
- $COLLIE vdi delete -s snap$(($i - 1)) base1 -p 7000
+ $DOG vdi snapshot -s snap$i base1 -p 7000
+ $DOG vdi delete -s snap$(($i - 1)) base1 -p 7000
sleep 1
done &
for i in `seq 1 10`; do
- $COLLIE vdi snapshot -s snap$i base2 -p 7001
- $COLLIE vdi delete -s snap$(($i - 1)) base2 -p 7001
+ $DOG vdi snapshot -s snap$i base2 -p 7001
+ $DOG vdi delete -s snap$(($i - 1)) base2 -p 7001
sleep 1
done &
for i in `seq 1 10`; do
- $COLLIE vdi snapshot -s snap$i base3 -p 7002
- $COLLIE vdi delete -s snap$(($i - 1)) base3 -p 7002
+ $DOG vdi snapshot -s snap$i base3 -p 7002
+ $DOG vdi delete -s snap$(($i - 1)) base3 -p 7002
sleep 1
done &
wait
-$COLLIE vdi delete base1 -p 7000
-$COLLIE vdi delete base2 -p 7001
-$COLLIE vdi delete base3 -p 7002
-$COLLIE vdi delete -s snap10 base1 -p 7000
-$COLLIE vdi delete -s snap10 base2 -p 7001
-$COLLIE vdi delete -s snap10 base3 -p 7002
+$DOG vdi delete base1 -p 7000
+$DOG vdi delete base2 -p 7001
+$DOG vdi delete base3 -p 7002
+$DOG vdi delete -s snap10 base1 -p 7000
+$DOG vdi delete -s snap10 base2 -p 7001
+$DOG vdi delete -s snap10 base3 -p 7002
echo there should be no vdi
_vdi_list
diff --git a/tests/functional/045 b/tests/functional/045
index d8f6583..530af28 100755
--- a/tests/functional/045
+++ b/tests/functional/045
@@ -11,14 +11,14 @@ done
_wait_for_sheep 3
_cluster_format -c 2
-$COLLIE vdi create test 4M
+$DOG vdi create test 4M
for i in `seq 0 7`; do
- echo $i | $COLLIE vdi write test $(($i * 1536 + 512)) 512
+ echo $i | $DOG vdi write test $(($i * 1536 + 512)) 512
done
for i in `seq 0 7`; do
- $COLLIE vdi read test $(($i * 1536 + 512)) 512 | md5sum
+ $DOG vdi read test $(($i * 1536 + 512)) 512 | md5sum
done
-$COLLIE vdi read test | md5sum
+$DOG vdi read test | md5sum
diff --git a/tests/functional/046 b/tests/functional/046
index 84b2a21..9d58658 100755
--- a/tests/functional/046
+++ b/tests/functional/046
@@ -13,27 +13,27 @@ _wait_for_sheep 3
_cluster_format -c 2
echo "delete snapshot image before current one"
-$COLLIE vdi create test 4G
-$COLLIE vdi snapshot test -s snap
+$DOG vdi create test 4G
+$DOG vdi snapshot test -s snap
_vdi_list
-$COLLIE vdi delete test -s snap
-$COLLIE vdi delete test -s snap # error
+$DOG vdi delete test -s snap
+$DOG vdi delete test -s snap # error
_vdi_list
-$COLLIE vdi delete test
-$COLLIE vdi delete test # error
+$DOG vdi delete test
+$DOG vdi delete test # error
_vdi_list
echo "delete current image before snapshot one"
-$COLLIE vdi create test 4G
-$COLLIE vdi snapshot test -s snap
+$DOG vdi create test 4G
+$DOG vdi snapshot test -s snap
_vdi_list
-$COLLIE vdi delete test
-$COLLIE vdi delete test # error
+$DOG vdi delete test
+$DOG vdi delete test # error
_vdi_list
-$COLLIE vdi delete test -s snap
-$COLLIE vdi delete test -s snap # error
+$DOG vdi delete test -s snap
+$DOG vdi delete test -s snap # error
_vdi_list
diff --git a/tests/functional/047 b/tests/functional/047
index feda20b..675f74e 100755
--- a/tests/functional/047
+++ b/tests/functional/047
@@ -10,11 +10,11 @@ _wait_for_sheep 1
_cluster_format -c 1
-$COLLIE vdi create test 4G
+$DOG vdi create test 4G
# write something to vdi 'test'
-echo "hello" | $COLLIE vdi write test 0 512
-echo "sheepdog" | $COLLIE vdi write test 4M 512
+echo "hello" | $DOG vdi write test 0 512
+echo "sheepdog" | $DOG vdi write test 4M 512
# corrupt the vdi...
_kill_sheep 0
if $MD; then
@@ -32,7 +32,7 @@ _wait_for_sheep 1
sleep 3
_vdi_list
-$COLLIE vdi read test 0 512 | tr -d [:cntrl:]
+$DOG vdi read test 0 512 | tr -d [:cntrl:]
echo -n ' '
-$COLLIE vdi read test 4M 512 | tr -d [:cntrl:]
+$DOG vdi read test 4M 512 | tr -d [:cntrl:]
echo ''
diff --git a/tests/functional/048 b/tests/functional/048
index b44819e..c487704 100755
--- a/tests/functional/048
+++ b/tests/functional/048
@@ -1,6 +1,6 @@
#!/bin/bash
-# Test some collie commands
+# Test some dog commands
. ./common
@@ -12,14 +12,14 @@ _wait_for_sheep 3
_cluster_format
-$COLLIE vdi create test 1G
+$DOG vdi create test 1G
-echo hello | $COLLIE vdi write test 4M 512
+echo hello | $DOG vdi write test 4M 512
# kill the master gracefully
-$COLLIE node kill 0
+$DOG node kill 0
sleep 2
_wait_for_sheep_recovery 1
-$COLLIE node list -p 7001
+$DOG node list -p 7001
nr=2
for i in 3 4 0; do
@@ -29,12 +29,12 @@ for i in 3 4 0; do
done
_wait_for_sheep_recovery 0
-$COLLIE vdi track test
-$COLLIE vdi track -i 1 test
+$DOG vdi track test
+$DOG vdi track -i 1 test
_vdi_list test
-$COLLIE vdi list -r test | awk '{$7="MASKED";print $0}'
+$DOG vdi list -r test | awk '{$7="MASKED";print $0}'
-$COLLIE vdi check test
+$DOG vdi check test
# clear the 'first' data block
dd if=/dev/zero of=$STORE/0/obj/007c2b2500000001 bs=1M count=4 > /dev/null 2>&1
-$COLLIE vdi check test | sort | uniq
+$DOG vdi check test | sort | uniq
diff --git a/tests/functional/049 b/tests/functional/049
index bcc1025..d466130 100755
--- a/tests/functional/049
+++ b/tests/functional/049
@@ -12,10 +12,10 @@ _wait_for_sheep 3
_cluster_format -c 1
-$COLLIE vdi create test 20M
-_random | $COLLIE vdi write -w test
+$DOG vdi create test 20M
+_random | $DOG vdi write -w test
-$COLLIE cluster shutdown
+$DOG cluster shutdown
_wait_for_sheep_stop
#trigger an object reclaim at startup
diff --git a/tests/functional/050 b/tests/functional/050
index a44fb8a..8a35c59 100755
--- a/tests/functional/050
+++ b/tests/functional/050
@@ -22,14 +22,14 @@ _wait_for_sheep 3
_cluster_format
-$COLLIE vdi create test 100M
-dd if=/dev/zero | $COLLIE vdi write test &
+$DOG vdi create test 100M
+dd if=/dev/zero | $DOG vdi write test &
# simulate IO NIC down of sheep 1
iptables -A INPUT -p tcp --sport 8001 -j DROP
iptables -A INPUT -p tcp --dport 8001 -j DROP
-# wait for collie to finish
+# wait for dog to finish
wait
# Logger flush in 1 second internval. We need assure log is flushed.
sleep 1
@@ -37,6 +37,6 @@ sleep 1
if [ "`grep fallback $STORE/0/sheep.log`" ];then
echo fallback done
fi
-$COLLIE vdi check test
+$DOG vdi check test
status=0
diff --git a/tests/functional/051 b/tests/functional/051
index c2c96c6..b128660 100755
--- a/tests/functional/051
+++ b/tests/functional/051
@@ -9,12 +9,12 @@ for i in 0 1; do
done
_wait_for_sheep 2
_cluster_format
-$COLLIE cluster info | _filter_cluster_info
+$DOG cluster info | _filter_cluster_info
_start_sheep 2
_wait_for_sheep 3
-$COLLIE cluster info | _filter_cluster_info
+$DOG cluster info | _filter_cluster_info
_kill_sheep 2
_wait_for_sheep 2
-$COLLIE cluster info | _filter_cluster_info
+$DOG cluster info | _filter_cluster_info
diff --git a/tests/functional/052 b/tests/functional/052
index 679a698..bff9d52 100755
--- a/tests/functional/052
+++ b/tests/functional/052
@@ -9,10 +9,10 @@ for i in 0 1 2 3; do
done
_wait_for_sheep 4
_cluster_format
-$COLLIE vdi create test 20M -P
-$COLLIE cluster info | _filter_cluster_info
+$DOG vdi create test 20M -P
+$DOG cluster info | _filter_cluster_info
-$COLLIE cluster shutdown
+$DOG cluster shutdown
_wait_for_sheep_stop
for i in 0 1 2 4; do
@@ -20,24 +20,24 @@ for i in 0 1 2 4; do
done
_wait_for_sheep 4
for i in 0 1 2 4; do
- $COLLIE cluster info -p 700$i | _filter_cluster_info
+ $DOG cluster info -p 700$i | _filter_cluster_info
_vdi_list
done
-echo yes | $COLLIE cluster recover force
+echo yes | $DOG cluster recover force
echo ""
_wait_for_sheep_recovery 0
-$COLLIE vdi check test | sort
+$DOG vdi check test | sort
for i in 0 1 2 4; do
- $COLLIE cluster info -p 700$i | _filter_cluster_info
+ $DOG cluster info -p 700$i | _filter_cluster_info
_vdi_list
done
_start_sheep 3
_wait_for_sheep 5
for i in 0 1 2 3 4; do
- $COLLIE cluster info -p 700$i | _filter_cluster_info
+ $DOG cluster info -p 700$i | _filter_cluster_info
_vdi_list
done
diff --git a/tests/functional/053 b/tests/functional/053
index 3874a7e..be2dd36 100755
--- a/tests/functional/053
+++ b/tests/functional/053
@@ -14,9 +14,9 @@ _wait_for_sheep 4
_cluster_format -c 2
for i in 0 1 2 3; do
- $COLLIE cluster info -p 700$i | _filter_cluster_info
+ $DOG cluster info -p 700$i | _filter_cluster_info
done
-$COLLIE cluster shutdown
+$DOG cluster shutdown
_wait_for_sheep_stop
_start_sheep 0 -g
@@ -27,7 +27,7 @@ _start_sheep 2
_start_sheep 3
_wait_for_sheep 4
for i in 0 1 2 3; do
- $COLLIE cluster info -p 700$i | _filter_cluster_info
+ $DOG cluster info -p 700$i | _filter_cluster_info
done
_start_sheep 4
@@ -35,7 +35,7 @@ _wait_for_sheep 5
_start_sheep 5
_wait_for_sheep 6
for i in 0 1 2 3 4 5; do
- $COLLIE cluster info -p 700$i | _filter_cluster_info
+ $DOG cluster info -p 700$i | _filter_cluster_info
done
_kill_sheep 3
@@ -43,5 +43,5 @@ _wait_for_sheep 5
_kill_sheep 4
_wait_for_sheep 4
for i in 0 1 2 5; do
- $COLLIE cluster info -p 700$i | _filter_cluster_info
+ $DOG cluster info -p 700$i | _filter_cluster_info
done
diff --git a/tests/functional/054 b/tests/functional/054
index 5ecbc41..3b28bae 100755
--- a/tests/functional/054
+++ b/tests/functional/054
@@ -17,15 +17,15 @@ done
_wait_for_sheep 3
_cluster_format
-$COLLIE vdi create test 100M -P
-$COLLIE cluster info | _filter_cluster_info
+$DOG vdi create test 100M -P
+$DOG cluster info | _filter_cluster_info
#start recovery
_start_sheep 3
_wait_for_sheep 4
_wait_for_sheep_recovery 0
-$COLLIE cluster info | _filter_cluster_info
+$DOG cluster info | _filter_cluster_info
#test no object in .stale
ls $STORE/*/*/.stale | grep ^- | wc -l
diff --git a/tests/functional/055 b/tests/functional/055
index 0e78e2a..ac54011 100755
--- a/tests/functional/055
+++ b/tests/functional/055
@@ -11,34 +11,34 @@ for i in 0 1 2; do
done
_wait_for_sheep 3
_cluster_format -c 2
-$COLLIE vdi create test 200M -P
+$DOG vdi create test 200M -P
# simulate one disk failure
_safe_remove $STORE/0/d0
-_random | $COLLIE vdi write test
+_random | $DOG vdi write test
_wait_for_sheep_recovery 0
-$COLLIE vdi check test
-$COLLIE cluster info | _filter_cluster_info
+$DOG vdi check test
+$DOG cluster info | _filter_cluster_info
# simulate multiple disk failure
_safe_remove $STORE/1/d0
-_random | $COLLIE vdi write test &
+_random | $DOG vdi write test &
sleep 1
_safe_remove $STORE/1/d1
_wait_for_sheep_recovery 0
wait
-$COLLIE vdi check test
-$COLLIE cluster info | _filter_cluster_info
+$DOG vdi check test
+$DOG cluster info | _filter_cluster_info
# simulate all disks failure
_safe_remove $STORE/1/d2
-_random | $COLLIE vdi write test
-$COLLIE vdi check test
-$COLLIE cluster info | _filter_cluster_info
+_random | $DOG vdi write test
+$DOG vdi check test
+$DOG cluster info | _filter_cluster_info
# simulate simultaneous multiple disks failure
_safe_remove $STORE/2/d0
_safe_remove $STORE/2/d1
-dd if=/dev/zero | $COLLIE vdi write test
-$COLLIE vdi check test
-$COLLIE cluster info | _filter_cluster_info
+dd if=/dev/zero | $DOG vdi write test
+$DOG vdi check test
+$DOG cluster info | _filter_cluster_info
diff --git a/tests/functional/056 b/tests/functional/056
index d2b1ebc..9530a6d 100755
--- a/tests/functional/056
+++ b/tests/functional/056
@@ -11,28 +11,28 @@ for i in 0 1 2; do
done
_wait_for_sheep 3
_cluster_format
-$COLLIE vdi create test 200M -P
+$DOG vdi create test 200M -P
# node event after disk failure
_safe_remove $STORE/0/d0
-_random | $COLLIE vdi write test &
+_random | $DOG vdi write test &
sleep 1
_start_sheep 3
_wait_for_sheep 4
_wait_for_sheep_recovery 0
-wait # collie
-$COLLIE vdi check test
-$COLLIE cluster info | _filter_cluster_info
+wait # dog
+$DOG vdi check test
+$DOG cluster info | _filter_cluster_info
# disk failures after node event
_safe_remove $STORE/1/d0
-dd if=/dev/zero | $COLLIE vdi write test &
+dd if=/dev/zero | $DOG vdi write test &
sleep 1
_kill_sheep 2
_wait_for_sheep 3
_safe_remove $STORE/1/d1
_wait_for_sheep_recovery 0
-wait # collie
-$COLLIE vdi check test
-$COLLIE cluster info | _filter_cluster_info
+wait # dog
+$DOG vdi check test
+$DOG cluster info | _filter_cluster_info
diff --git a/tests/functional/057 b/tests/functional/057
index ab47ffc..d1c95f5 100755
--- a/tests/functional/057
+++ b/tests/functional/057
@@ -15,36 +15,36 @@ for i in 0 1 2; do
done
_wait_for_sheep 3
_cluster_format
-$COLLIE vdi create test 100M -P
+$DOG vdi create test 100M -P
_md_info
# plug during node event
_start_sheep 3
_wait_for_sheep 4
-$COLLIE node md plug $STORE/0/d3,$STORE/0/d4
+$DOG node md plug $STORE/0/d3,$STORE/0/d4
_wait_for_sheep_recovery 0
_md_info
-$COLLIE vdi check test
-$COLLIE cluster info | _filter_cluster_info
+$DOG vdi check test
+$DOG cluster info | _filter_cluster_info
# plug duplicate path
-$COLLIE node md plug $STORE/0/d3
-$COLLIE node recovery
+$DOG node md plug $STORE/0/d3
+$DOG node recovery
_md_info
# unplug
-$COLLIE node md unplug $STORE/0/d0,$STORE/0/d1
+$DOG node md unplug $STORE/0/d0,$STORE/0/d1
_wait_for_sheep_recovery 0
_md_info
-$COLLIE vdi check test
-$COLLIE cluster info | _filter_cluster_info
+$DOG vdi check test
+$DOG cluster info | _filter_cluster_info
# unplug invalid path
-$COLLIE node md unplug $STORE/0/d0
-$COLLIE node recovery
+$DOG node md unplug $STORE/0/d0
+$DOG node recovery
_md_info
-$COLLIE cluster info | _filter_cluster_info
+$DOG cluster info | _filter_cluster_info
# check stale object purging
find $STORE/*/d*/.stale/ -type f | _filter_store
diff --git a/tests/functional/058 b/tests/functional/058
index 53393c0..ea584de 100755
--- a/tests/functional/058
+++ b/tests/functional/058
@@ -8,11 +8,11 @@ for i in 0 1 2; do
done
_wait_for_sheep 3
_cluster_format
-$COLLIE vdi create test 100M
-dd if=/dev/zero | $COLLIE vdi write -w test
+$DOG vdi create test 100M
+dd if=/dev/zero | $DOG vdi write -w test
$QEMU_IO -c "discard 0 100m" sheepdog:test | _filter_qemu_io
-$COLLIE vdi check test
+$DOG vdi check test
for i in `seq 0 24`; do
- $COLLIE vdi object test -i $i;
+ $DOG vdi object test -i $i;
done
_node_info
diff --git a/tests/functional/059 b/tests/functional/059
index 3c133ec..b719a58 100755
--- a/tests/functional/059
+++ b/tests/functional/059
@@ -11,14 +11,14 @@ done
_wait_for_sheep 3
_cluster_format -c 3
-$COLLIE vdi create test 4M
+$DOG vdi create test 4M
_input()
{
for i in `seq 1 10`; do
echo "multiwrite -P $i 0 1k ; 2k 1k ; 4k 1k ; 8k 1k"
sleep 1
- $COLLIE vdi snapshot test -s snap$i
+ $DOG vdi snapshot test -s snap$i
done
echo quit
@@ -27,8 +27,8 @@ _input()
_input | $QEMU_IO sheepdog:test > /dev/null
_vdi_list
-$COLLIE vdi tree | _filter_short_date
+$DOG vdi tree | _filter_short_date
for i in `seq 1 10`; do
- $COLLIE vdi read test -s snap$i | md5sum
+ $DOG vdi read test -s snap$i | md5sum
done
diff --git a/tests/functional/060 b/tests/functional/060
index b5c1384..fb6bc31 100755
--- a/tests/functional/060
+++ b/tests/functional/060
@@ -1,6 +1,6 @@
#!/bin/bash
-# Test reboot sheepdog without collie shutdown
+# Test reboot sheepdog without dog shutdown
. ./common
for i in `seq 0 7`; do
@@ -12,19 +12,19 @@ _wait_for_sheep 8
_cluster_format
for i in `seq 0 3`; do
- $COLLIE vdi create test$i 100M
+ $DOG vdi create test$i 100M
for j in `seq 0 24`; do
- echo "$i $j" | $COLLIE vdi write test$i $(($j * 4 * 1024 ** 2)) 512
+ echo "$i $j" | $DOG vdi write test$i $(($j * 4 * 1024 ** 2)) 512
done &
done
wait
for i in `seq 0 3`; do
- $COLLIE vdi read test$i | md5sum
+ $DOG vdi read test$i | md5sum
done
-_reboot_without_collie_shutdown()
+_reboot_without_dog_shutdown()
{
local i
for i in `seq 0 7`; do
@@ -41,14 +41,14 @@ _reboot_without_collie_shutdown()
}
for i in 0 1 2; do
- _reboot_without_collie_shutdown
+ _reboot_without_dog_shutdown
done
for i in `seq 0 7`; do
- $COLLIE cluster info -p 700$i | _filter_cluster_info > $STORE/cinfo.$i
+ $DOG cluster info -p 700$i | _filter_cluster_info > $STORE/cinfo.$i
_vdi_list -p 700$i
for j in `seq 0 3`; do
- $COLLIE vdi read test$j -p 700$i | md5sum > $STORE/csum.$i.$j &
+ $DOG vdi read test$j -p 700$i | md5sum > $STORE/csum.$i.$j &
done
wait
for j in `seq 0 3`; do
diff --git a/tests/functional/061 b/tests/functional/061
index 26b8daf..5e03ba0 100755
--- a/tests/functional/061
+++ b/tests/functional/061
@@ -12,11 +12,11 @@ _wait_for_sheep 3
_cluster_format -c 1
-$COLLIE vdi create test 40M -P
+$DOG vdi create test 40M -P
_kill_sheep 2
_wait_for_sheep_recovery 0
_start_sheep 2
_wait_for_sheep_recovery 0
-$COLLIE vdi check test
+$DOG vdi check test
diff --git a/tests/functional/062 b/tests/functional/062
index 6bd84ee..5133287 100755
--- a/tests/functional/062
+++ b/tests/functional/062
@@ -1,6 +1,6 @@
#!/bin/bash
-# Test unaligned collie vdi read/write
+# Test unaligned dog vdi read/write
. ./common
@@ -12,21 +12,21 @@ _wait_for_sheep 3
_cluster_format
-$COLLIE vdi create test 1234
+$DOG vdi create test 1234
sleep 1
-$COLLIE vdi list -r test | awk '{$7="MASKED";print $0}'
-
-echo hello | $COLLIE vdi write test 1 6
-$COLLIE vdi read test 1 6
-echo world | $COLLIE vdi write test 1 6
-$COLLIE vdi read test 1 6
-
-echo h*** | $COLLIE vdi write test 510 512
-echo h!!! | $COLLIE vdi write test 510 512
-$COLLIE vdi read test 510 5
-echo ^^ | $COLLIE vdi write test 511 2
-$COLLIE vdi read test 510 5
-echo xxx | $COLLIE vdi write test 1020 4
-$COLLIE vdi read test 1020 4
-$COLLIE vdi read test 510 5
-$COLLIE vdi read test 1 6
+$DOG vdi list -r test | awk '{$7="MASKED";print $0}'
+
+echo hello | $DOG vdi write test 1 6
+$DOG vdi read test 1 6
+echo world | $DOG vdi write test 1 6
+$DOG vdi read test 1 6
+
+echo h*** | $DOG vdi write test 510 512
+echo h!!! | $DOG vdi write test 510 512
+$DOG vdi read test 510 5
+echo ^^ | $DOG vdi write test 511 2
+$DOG vdi read test 510 5
+echo xxx | $DOG vdi write test 1020 4
+$DOG vdi read test 1020 4
+$DOG vdi read test 510 5
+$DOG vdi read test 1 6
diff --git a/tests/functional/063 b/tests/functional/063
index b43f374..8a648c6 100755
--- a/tests/functional/063
+++ b/tests/functional/063
@@ -20,17 +20,17 @@ _start_sheep 3 "-g"
_wait_for_sheep 4
_cluster_format -c 1
-$COLLIE vdi create test 200M -P
+$DOG vdi create test 200M -P
_node_info
-$COLLIE node list
+$DOG node list
-$COLLIE node md plug $STORE/4
+$DOG node md plug $STORE/4
_wait_for_sheep_recovery 0
-$COLLIE cluster reweight
+$DOG cluster reweight
_start_sheep 5
_wait_for_sheep 5
_wait_for_sheep_recovery 0
_node_info
-$COLLIE node list
-$COLLIE cluster info | _filter_cluster_info
+$DOG node list
+$DOG cluster info | _filter_cluster_info
diff --git a/tests/functional/064 b/tests/functional/064
index 77304fe..3a6f168 100755
--- a/tests/functional/064
+++ b/tests/functional/064
@@ -17,25 +17,25 @@ done
_wait_for_sheep 3
_cluster_format -c 2
-$COLLIE vdi create test 100M -P
+$DOG vdi create test 100M -P
_node_info
-$COLLIE node list
+$DOG node list
-$COLLIE node md plug $STORE/3
+$DOG node md plug $STORE/3
_wait_for_sheep_recovery 0
_node_info
-$COLLIE node list
+$DOG node list
-$COLLIE cluster reweight
+$DOG cluster reweight
# restart sheep1 while reweighting
_kill_sheep 2
_wait_for_sheep_recovery 0
_node_info | grep -v ^2 # the content of sheep 2 is non-deterministic
-$COLLIE node list
+$DOG node list
_start_sheep 2
_wait_for_sheep_recovery 0
_node_info
-$COLLIE node list
-$COLLIE cluster info | _filter_cluster_info
+$DOG node list
+$DOG cluster info | _filter_cluster_info
diff --git a/tests/functional/065 b/tests/functional/065
index 388d7e8..e0ee1ae 100755
--- a/tests/functional/065
+++ b/tests/functional/065
@@ -11,16 +11,16 @@ done
_wait_for_sheep 2
_cluster_format -c 2
-$COLLIE vdi create t 1G -P
+$DOG vdi create t 1G -P
# move objects into stale directory
_kill_sheep 0
_start_sheep 0 "-w size=400"
_wait_for_sheep 2
-dd if=/dev/zero | $COLLIE vdi write -w t &
+dd if=/dev/zero | $DOG vdi write -w t &
_wait_for_sheep_recovery 1
wait
-$COLLIE cluster info | _filter_cluster_info
+$DOG cluster info | _filter_cluster_info
diff --git a/tests/functional/066 b/tests/functional/066
index 1a36492..97f0b9f 100755
--- a/tests/functional/066
+++ b/tests/functional/066
@@ -11,13 +11,13 @@ done
_wait_for_sheep 3
_cluster_format -c 2
-$COLLIE vdi create t 300M -P
-$COLLIE vdi create t0 300M -P
-$COLLIE vdi create t1 300M -P
+$DOG vdi create t 300M -P
+$DOG vdi create t0 300M -P
+$DOG vdi create t1 300M -P
-dd if=/dev/zero | $COLLIE vdi write -w t &
+dd if=/dev/zero | $DOG vdi write -w t &
for j in 0 1; do
- dd if=/dev/zero | $COLLIE vdi write -w t$j -p 700$j &
+ dd if=/dev/zero | $DOG vdi write -w t$j -p 700$j &
done
for i in `seq 3 7`; do
@@ -30,5 +30,5 @@ done
wait
for i in 0 1 7; do
- $COLLIE cluster info -p 700$i | _filter_cluster_info
+ $DOG cluster info -p 700$i | _filter_cluster_info
done
diff --git a/tests/functional/067 b/tests/functional/067
index c47d387..8b309ef 100755
--- a/tests/functional/067
+++ b/tests/functional/067
@@ -12,7 +12,7 @@ _wait_for_sheep 3
_cluster_format
-$COLLIE node list
+$DOG node list
# make sure sheep1 and sheep2 quit simutaniously
_kill_sheep 1 &
@@ -33,5 +33,5 @@ sleep 1
echo check whether all nodes have the same cluster info
for i in 1 2; do
- $COLLIE node list -p 700$i
+ $DOG node list -p 700$i
done
diff --git a/tests/functional/068 b/tests/functional/068
index 28afe4e..7d53d63 100755
--- a/tests/functional/068
+++ b/tests/functional/068
@@ -10,7 +10,7 @@ done
_wait_for_sheep 3
-$COLLIE cluster format
+$DOG cluster format
sleep 1
# kill a non-master sheep
@@ -26,10 +26,10 @@ _kill_zk_session 0
sleep 5
for i in 0 1 2; do
- $COLLIE cluster info -p 700$i | _filter_cluster_info
+ $DOG cluster info -p 700$i | _filter_cluster_info
done
-$COLLIE vdi create test 10M
+$DOG vdi create test 10M
for i in 0 1 2; do
_vdi_list -p $((7000+$i))
done
diff --git a/tests/functional/069 b/tests/functional/069
index cf19f50..0e974e2 100755
--- a/tests/functional/069
+++ b/tests/functional/069
@@ -16,7 +16,7 @@ _cluster_format
# kill sheep 0 so that sheep 2 has larger epoch
_kill_sheep 0
-$COLLIE cluster shutdown -p 7001
+$DOG cluster shutdown -p 7001
_wait_for_sheep_stop
# clean up sheep 0 and sheep 1
@@ -32,7 +32,7 @@ _wait_for_sheep 2
# start Sheepdog with 2 nodes
_cluster_format
-$COLLIE cluster shutdown
+$DOG cluster shutdown
_wait_for_sheep_stop
# sheep 2 should fail to join because it was formatted at the different time
@@ -45,5 +45,5 @@ _start_sheep 1
_wait_for_sheep 2
for i in 0 1; do
- $COLLIE cluster info -p 700$i | _filter_cluster_info
+ $DOG cluster info -p 700$i | _filter_cluster_info
done
diff --git a/tests/functional/070 b/tests/functional/070
index 1f7660e..a78f271 100755
--- a/tests/functional/070
+++ b/tests/functional/070
@@ -13,7 +13,7 @@ _wait_for_sheep 3
# start Sheepdog with 3 nodes
_cluster_format
-$COLLIE cluster shutdown -p 7000
+$DOG cluster shutdown -p 7000
_wait_for_sheep_stop
for i in 3 4 5; do
@@ -29,5 +29,5 @@ done
_wait_for_sheep 6
for i in `seq 0 5`; do
- $COLLIE cluster info -p 700$i | _filter_cluster_info
+ $DOG cluster info -p 700$i | _filter_cluster_info
done
diff --git a/tests/functional/071 b/tests/functional/071
index acf8b9f..de935a4 100755
--- a/tests/functional/071
+++ b/tests/functional/071
@@ -12,7 +12,7 @@ _wait_for_sheep 3
_cluster_format
-$COLLIE vdi create test 4M
+$DOG vdi create test 4M
# Create a 28 KB file. The first 12 KB (3 blocks) is filled with zero,
# next 4 KB is filled with one, and the rest is filled with zero.
@@ -25,9 +25,9 @@ for skip in 0 1 2 3; do
for offset in 0 512; do
for length in $((4 * 4096)) $((4 * 4096 - 512)); do
dd if=$DATA_FILE bs=4k skip=$skip count=4 2> /dev/null \
- | $COLLIE vdi write test $offset $length
+ | $DOG vdi write test $offset $length
- $COLLIE vdi read test $offset $length | hd
+ $DOG vdi read test $offset $length | hd
done
done
done
diff --git a/tests/functional/072 b/tests/functional/072
index b10f204..4f7a7c3 100755
--- a/tests/functional/072
+++ b/tests/functional/072
@@ -16,8 +16,8 @@ _cluster_format -c 1
_start_sheep 2
_wait_for_sheep 3
-$COLLIE vdi create test 8M -P
-$COLLIE cluster shutdown
+$DOG vdi create test 8M -P
+$DOG cluster shutdown
mv $STORE/0/obj/007c2b2500000001 $STORE/0/obj/.stale/007c2b2500000001.1
mv $STORE/1/obj/807c2b2500000000 $STORE/1/obj/.stale/807c2b2500000000.1
@@ -33,4 +33,4 @@ for i in 0 1 2; do
_vdi_list -p $((7000+$i))
done
-$COLLIE vdi check test
+$DOG vdi check test
diff --git a/tests/functional/check b/tests/functional/check
index 5addc23..e7b7a17 100755
--- a/tests/functional/check
+++ b/tests/functional/check
@@ -314,7 +314,7 @@ fi
if $valgrind; then
export SHEEP=_valgrind_sheep
- export COLLIE=_valgrind_collie
+ export DOG=_valgrind_dog
fi
# we need common.rc
diff --git a/tests/functional/common.config b/tests/functional/common.config
index db7d757..a946f2e 100644
--- a/tests/functional/common.config
+++ b/tests/functional/common.config
@@ -78,8 +78,8 @@ export STORE=$WD
export SHEEP_PROG=${SHEEP_PROG:-../../sheep/sheep}
export SHEEP=${SHEEP:-$SHEEP_PROG}
export SHEEP_OPTIONS=${SHEEP_OPTIONS:-"-n -y 127.0.0.1 -d"}
-export COLLIE_PROG=${COLLIE_PROG:-../../collie/collie}
-export COLLIE=${COLLIE:-$COLLIE_PROG}
+export DOG_PROG=${DOG_PROG:-../../dog/dog}
+export DOG=${DOG:-$DOG_PROG}
export VALGRIND_OPTIONS=${VALGRIND_OPTIONS:-"-q"}
export MD=${MD:-false}
export QEMU_IO=${QEMU_IO_PROG:-qemu-io}
diff --git a/tests/functional/common.filter b/tests/functional/common.filter
index f1fffc4..2c62ef2 100644
--- a/tests/functional/common.filter
+++ b/tests/functional/common.filter
@@ -145,7 +145,7 @@ _filter_spaces()
sed -e 's/ *$//'
}
-# normalize collie cluster info output
+# normalize dog cluster info output
_filter_cluster_info()
{
_filter_date | _filter_iso_date
diff --git a/tests/functional/common.rc b/tests/functional/common.rc
index 83fb195..2a64b53 100644
--- a/tests/functional/common.rc
+++ b/tests/functional/common.rc
@@ -141,7 +141,7 @@ _die()
_cleanup()
{
local i
- _kill_all_collies
+ _kill_all_dogs
_kill_all_sheeps
_cleanup_devices
@@ -225,7 +225,7 @@ _wait_for_sheep()
_die "should have $1, but have $(_count_sheep_processes) sheep"
fi
- node_list="$($COLLIE node list -p $PORT 2> /dev/null)"
+ node_list="$($DOG node list -p $PORT 2> /dev/null)"
if [ $? != 0 ]; then
# sheep is not ready yet
@@ -270,10 +270,10 @@ _valgrind_sheep()
done
}
-_valgrind_collie()
+_valgrind_dog()
{
local logfile=$(mktemp)
- valgrind --log-file=$logfile --error-exitcode=99 ${VALGRIND_OPTIONS} $COLLIE_PROG $*
+ valgrind --log-file=$logfile --error-exitcode=99 ${VALGRIND_OPTIONS} $DOG_PROG $*
local ret=$?
if [ $ret == 99 ]; then
cat $logfile 1>&2
@@ -311,12 +311,12 @@ _start_sheep()
fi
}
-_kill_all_collies()
+_kill_all_dogs()
{
- pkill -9 -f "$COLLIE_PROG (cluster|vdi|node|debug)"
+ pkill -9 -f "$DOG_PROG (cluster|vdi|node|debug)"
while [ $? == 0 ]; do
- pgrep -f "$COLLIE_PROG (cluster|vdi|node|debug)" > /dev/null
+ pgrep -f "$DOG_PROG (cluster|vdi|node|debug)" > /dev/null
done
}
@@ -342,7 +342,7 @@ _wait_for_sheep_recovery()
{
while true; do
sleep 2
- recovery_info="$($COLLIE node recovery -p $((7000+$1)))"
+ recovery_info="$($DOG node recovery -p $((7000+$1)))"
if [ $? != 0 ]; then
_die "failed to get recovery info"
@@ -459,18 +459,18 @@ _cluster_format()
local args=$*
local port_opt=$(echo $args | grep -oE '\-*p[^ ]* 7...')
- $COLLIE cluster format $args
+ $DOG cluster format $args
if [ $? != 0 ]; then
_die "failed to format cluster"
fi
# wait for all the sheeps to be running
- local ports=$($COLLIE node list -r $port_opt | perl -ne 'print "$1\n" if /:(\d+)/')
+ local ports=$($DOG node list -r $port_opt | perl -ne 'print "$1\n" if /:(\d+)/')
local port
for port in $ports; do
local cnt
for cnt in `seq 10`; do # wait at most 10 seconds
- $COLLIE cluster info -p $port | grep -E running > /dev/null
+ $DOG cluster info -p $port | grep -E running > /dev/null
if [ $? == 0 ]; then
continue 2
fi
@@ -507,7 +507,7 @@ _kill_zk_session()
_vdi_list()
{
local args=$*
- $COLLIE vdi list $args | _filter_short_date
+ $DOG vdi list $args | _filter_short_date
}
# make sure this script returns success
diff --git a/tests/functional/group b/tests/functional/group
index dfa6558..1749e13 100644
--- a/tests/functional/group
+++ b/tests/functional/group
@@ -11,7 +11,7 @@
# cluster: cluster drivers tests: join/leave/etc
# store: basic data integrity
# vdi: qemu I/O, snapshots, volume creation and deletion
-# collie: check collie commands
+# dog: check dog commands
# md: multi-disk tests
#
001 auto quick cluster md
@@ -61,7 +61,7 @@
045 auto quick store md
046 auto quick vdi md
047 auto quick vdi md
-048 auto quick collie
+048 auto quick dog
049 auto quick cache md
050 auto quick cluster md
051 auto quick cluster md
diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 3e6255a..11ddf52 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -1,3 +1,3 @@
MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = mock collie sheep
+SUBDIRS = mock dog sheep
diff --git a/tests/unit/collie/Makefile.am b/tests/unit/dog/Makefile.am
similarity index 62%
rename from tests/unit/collie/Makefile.am
rename to tests/unit/dog/Makefile.am
index 404bc66..6d5978b 100644
--- a/tests/unit/collie/Makefile.am
+++ b/tests/unit/dog/Makefile.am
@@ -5,19 +5,19 @@ TESTS = test_common
check_PROGRAMS = ${TESTS}
INCLUDES = -I$(top_srcdir)/include \
- -I$(top_srcdir)/collie \
- -I$(top_srcdir)/collie/farm \
+ -I$(top_srcdir)/dog \
+ -I$(top_srcdir)/dog/farm \
-I../mock \
@CHECK_CFLAGS@
LIBS = $(top_srcdir)/lib/libsheepdog.a -lpthread \
../mock/libmock.a @CHECK_LIBS@
-test_common_SOURCES = test_common.c mock_collie.c \
- $(top_srcdir)/collie/common.c
+test_common_SOURCES = test_common.c mock_dog.c \
+ $(top_srcdir)/dog/common.c
clean-local:
rm -f ${check_PROGRAMS} *.o
coverage:
- @lcov -d . -c -o collie.info
+ @lcov -d . -c -o dog.info
diff --git a/tests/unit/collie/mock_collie.c b/tests/unit/dog/mock_dog.c
similarity index 95%
rename from tests/unit/collie/mock_collie.c
rename to tests/unit/dog/mock_dog.c
index ff52ed1..6059a0a 100644
--- a/tests/unit/collie/mock_collie.c
+++ b/tests/unit/dog/mock_dog.c
@@ -11,10 +11,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "collie.h"
+#include "dog.h"
#include "mock.h"
-/* collie mock */
+/* dog mock */
uint8_t sdhost[16] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 0, 0, 1 };
int sdport = 7000, sd_vnodes_nr = 100;
bool highlight = true;
diff --git a/tests/unit/collie/test_common.c b/tests/unit/dog/test_common.c
similarity index 98%
rename from tests/unit/collie/test_common.c
rename to tests/unit/dog/test_common.c
index ee3c8ff..6fec940 100644
--- a/tests/unit/collie/test_common.c
+++ b/tests/unit/dog/test_common.c
@@ -13,7 +13,7 @@
#include <check.h>
-#include "collie.h"
+#include "dog.h"
/* test */
START_TEST(test_common)
--
1.7.9.5
More information about the sheepdog
mailing list