Add "fake" cluster locking (local locking performed in clvmd) for testing.
PATCH 1/2 Add "fake" cluster locking (local locking performed in clvmd) for testing.
This patch introduces simple "cluster" locking, which basically simulates only one node to allow clvmd running even withou any cluster infrastucture.
The puprose of this patch is to provide very simple testin environment for cluster locking.
Basically the locking is performed from long-running clvmd process.
--- configure.in | 1 + daemons/clvmd/Makefile.in | 4 + daemons/clvmd/clvmd-comms.h | 7 ++ daemons/clvmd/clvmd-fake.c | 191 +++++++++++++++++++++++++++++++++++++++++++ daemons/clvmd/clvmd.c | 16 ++++- 5 files changed, 218 insertions(+), 1 deletions(-) create mode 100644 daemons/clvmd/clvmd-fake.c
configure.in +1 -0
@@ -342,6 +342,7 @@ AC_ARG_WITH(clvmd, * cman,corosync,openais (or selection of them) * all (autodetect) * none (disable build) + * fake (debugging only) [TYPE=none] ], [ CLVMD="$withval" ], [ CLVMD="none" ])
daemons/clvmd/Makefile.in +4 -0
@@ -71,6 +71,10 @@ ifneq (,$(findstring corosync,, "@CLVMD@,")) DEFS += -DUSE_COROSYNC endif +ifneq (,$(findstring fake,, "@CLVMD@,")) + SOURCES += clvmd-fake.c + DEFS += -DUSE_FAKE +endif TARGETS = \ clvmd
daemons/clvmd/clvmd-comms.h +7 -0
@@ -110,5 +110,12 @@ struct cluster_ops *init_openais_cluster(void);struct cluster_ops *init_corosync_cluster (void );#endif +#ifdef USE_FAKE +# define FAKE_CSID_LEN (sizeof(int)) +# define MAX_CLUSTER_MEMBER_NAME_LEN 64 +# define FAKE_MAX_CLUSTER_MESSAGE 65535 +# define MAX_CSID_LEN sizeof(int) +struct cluster_ops *init_fake_cluster (void ); +#endif #endif
daemons/clvmd/clvmd-fake.c new file +191 -0
191 lines not on this page · raw message
daemons/clvmd/clvmd.c +15 -1
@@ -110,7 +110,7 @@ static int child_pipe[2];#define DFAIL_TIMEOUT 5#define SUCCESS 0 -typedef enum {IF_AUTO ,IF_CMAN ,IF_GULM ,IF_OPENAIS ,IF_COROSYNC }if_type_t ; +typedef enum {IF_AUTO ,IF_CMAN ,IF_GULM ,IF_OPENAIS ,IF_COROSYNC ,IF_FAKE }if_type_t ;typedef void *(lvm_pthread_fn_t )(void *);
@@ -180,6 +180,9 @@ static void usage(char *prog, FILE *file)#ifdef USE_GULM fprintf (file,"gulm " );#endif +#ifdef USE_FAKE +fprintf (file,"fake " ); +#endif fprintf (file,"\n" ); }
@@ -434,6 +437,15 @@ int main(int argc, char *argv[]) syslog(LOG_NOTICE, "Cluster LVM daemon started - connected to OpenAIS"); }#endif +#ifdef USE_FAKE +if (!clops) +if ((cluster_iface ==IF_AUTO || cluster_iface ==IF_FAKE ) && (clops =init_fake_cluster ())) { + max_csid_len =FAKE_CSID_LEN ; + max_cluster_message =FAKE_MAX_CLUSTER_MESSAGE ; + max_cluster_member_name_len =MAX_CLUSTER_MEMBER_NAME_LEN ; +syslog (LOG_NOTICE ,"Cluster LVM daemon started - connected to FakeCluster" ); + } +#endif if (!clops) {DEBUGLOG ("Can't initialise cluster interface\n" );
@@ -2063,6 +2075,8 @@ static if_type_t parse_cluster_interface(char *ifname) iface =IF_OPENAIS ;if (!strcmp (ifname,"corosync" )) iface =IF_COROSYNC ; +if (!strcmp (ifname,"fake" )) + iface =IF_FAKE ;return iface; }
Signature · 1 line
1.7.0
PATCH 1/2 Add "fake" cluster locking (local locking performed in clvmd) for testing.
Quoted 1 line · Milan Broz
This patch introduces simple "cluster" locking, which basically
(beware: still not finished, it is more like cluster aware no-locking, but useful for some testing for now.)
Milan
PATCH 2/2 Add cluster-check to provide basic cluster locking (using fake cluster).
In reply to Milan BrozEvery test starts of instance of clvmd, and must properly kill it afterwards. (This requires to not skip test with simple "exit 200".)
For using "make cluster-check" target the source must be compiled using configure --with-clvmd=fake --with-cluster=internal ...
--- Makefile.in | 5 ++++ test/Makefile.in | 2 + test/lvm-utils.sh | 3 ++ test/t-fsadm.sh | 2 +- test/t-mirror-basic.sh | 2 +- test/t-mirror-lvconvert-usage.sh | 2 +- test/t-mirror-lvconvert.sh | 2 +- test/t-mirror-names.sh | 2 +- test/t-mirror-vgreduce-removemissing.sh | 2 +- test/t-pool-labels.sh | 2 +- test/t-pvcreate-operation-md.sh | 14 +++++----- test/t-pvmove-basic.sh | 2 +- test/t-snapshot-merge.sh | 4 +- test/t-topology-support.sh | 4 +- test/test-utils.sh | 38 ++++++++++++++++++++++++++++-- 15 files changed, 64 insertions(+), 22 deletions(-)
Makefile.in +5 -0
@@ -86,8 +86,13 @@ all: cscope.out endif check: all + $(MAKE) -C test clean $(MAKE) -C test all +cluster-check: all + $(MAKE) -C test clean + $(MAKE) -C test all LVM_TEST_LOCKING=3 + ifneq ("@LCOV@", "") .PHONY: lcov-reset lcov lcov-dated
test/Makefile.in +2 -0
@@ -61,6 +61,7 @@ init.sh: $(srcdir)/Makefile.in $(srcdir)/test-utils.sh .bin-dir-stamp bin/not bi echo 'abs_builddir=$(abs_builddir)' >> $@-t echo 'export PATH' >> $@-t echo 'export DM_UDEV_SYNCHRONISATION=$(dm_udev_synchronisation)' >> $@-t + echo 'export LVM_TEST_LOCKING=$(LVM_TEST_LOCKING)' >> $@-t chmod a-w $@-t mv $@-t $@ if test "$(srcdir)" != "."; then cp $(srcdir)/test-utils.sh \
@@ -77,6 +78,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ln -s ../lvm-wrapper bin/$$i; \ done ln -s "$(abs_top_builddir)/tools/dmsetup" bin/dmsetup + ln -s "$(abs_top_builddir)/daemons/clvmd/clvmd" bin/clvmd touch $@ lvm-wrapper: Makefile
test/lvm-utils.sh +3 -0
@@ -12,6 +12,7 @@ # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA export LVM_SUPPRESS_FD_WARNINGS=1 +test -n "$LVM_TEST_LOCKING" || export LVM_TEST_LOCKING=1 ME=$(basename "$0") warn() { echo >&2 "$ME: $@"; }
@@ -223,6 +224,8 @@ init_root_dir_() } global { library_dir = "$G_root_/lib" + locking_type = $LVM_TEST_LOCKING + fallback_to_local_locking = 0 } activation { udev_sync = 1
test/t-fsadm.sh +1 -1
@@ -11,7 +11,7 @@ . ./test-utils.sh -exit 200 +skip_test # doesn't work right now aux prepare_pvs 2 aux pvcreate --metadatacopies 0 $dev1
test/t-mirror-basic.sh +1 -1
@@ -14,7 +14,7 @@ test_description="ensure that basic operations on mirrored LV works" . ./test-utils.sh -dmsetup_has_dm_devdir_support_ || exit 200 +dmsetup_has_dm_devdir_support_ || skip_test # --------------------------------------------------------------------- # Utilities
test/t-mirror-lvconvert-usage.sh +1 -1
@@ -10,7 +10,7 @@ . ./test-utils.sh -dmsetup_has_dm_devdir_support_ || exit 200 +dmsetup_has_dm_devdir_support_ || skip_test aux prepare_vg 5
test/t-mirror-lvconvert.sh +1 -1
@@ -11,7 +11,7 @@ . ./test-utils.sh -dmsetup_has_dm_devdir_support_ || exit 200 +dmsetup_has_dm_devdir_support_ || skip_test mimages_are_redundant_ () {
test/t-mirror-names.sh +1 -1
@@ -14,7 +14,7 @@ test_description="check namings of mirrored LV" . ./test-utils.sh -dmsetup_has_dm_devdir_support_ || exit 200 +dmsetup_has_dm_devdir_support_ || skip_test # --------------------------------------------------------------------- # Utilities
test/t-mirror-vgreduce-removemissing.sh +1 -1
@@ -13,7 +13,7 @@ test_description="ensure that 'vgreduce --removemissing' works on mirrored LV" . ./test-utils.sh -dmsetup_has_dm_devdir_support_ || exit 200 +dmsetup_has_dm_devdir_support_ || skip_test lv_is_on_ () {
test/t-pool-labels.sh +1 -1
@@ -20,7 +20,7 @@ create_pool_label_() env printf "\x04\x01\x03\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x0$1\x68\x01\x16\x70\x00\x00\x00\x00\x00\x06\x5f\xd0" | dd of=$2 bs=273 seek=1 conv=notrunc } -env printf "" || exit 200 # skip if printf is not available +env printf "" || skip_test # skip if printf is not available aux prepare_devs 2
test/t-pvcreate-operation-md.sh +7 -7
@@ -9,14 +9,14 @@ # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # skip this test if mdadm or sfdisk (or others) aren't available -which mdadm || exit 200 -which sfdisk || exit 200 -which perl || exit 200 -which awk || exit 200 -which cut || exit 200 +which mdadm || skip_test +which sfdisk || skip_test +which perl || skip_test +which awk || skip_test +which cut || skip_test test -f /proc/mdstat && grep -q raid0 /proc/mdstat || \ -modprobe raid0 || exit 200 +modprobe raid0 || skip_test . ./test-utils.sh
@@ -45,7 +45,7 @@ cleanup_md() { } # create 2 disk MD raid0 array (stripe_width=128K) -[ -b "$mddev" ] && exit 200 +[ -b "$mddev" ] && skip_test mdadm --create $mddev --auto=md --level 0 --raid-devices=2 --chunk 64 $dev1 $dev2 trap 'aux cleanup_md' EXIT # cleanup this MD device at the end of the test
test/t-pvmove-basic.sh +1 -1
@@ -14,7 +14,7 @@ test_description="ensure that pvmove works with basic options" . ./test-utils.sh -dmsetup_has_dm_devdir_support_ || exit 200 +dmsetup_has_dm_devdir_support_ || skip_test # --------------------------------------------------------------------- # Utilities
test/t-snapshot-merge.sh +2 -2
@@ -10,7 +10,7 @@ # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA set -xv -which mkfs.ext3 || exit 200 +which mkfs.ext3 || skip_test . ./test-utils.sh
@@ -48,7 +48,7 @@ aux prepare_vg 1 100 setup_merge $vg $lv1 # now that snapshot LV is created: test if snapshot-merge target is available -$(dmsetup targets | grep -q snapshot-merge) || exit 200 +$(dmsetup targets | grep -q snapshot-merge) || skip_test lvs -a lvconvert --merge $vg/$(snap_lv_name_ $lv1)
test/t-topology-support.sh +2 -2
@@ -8,12 +8,12 @@ # along with this program; if not, write to the Free Software Foundation, # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -which mkfs.ext3 || exit 200 +which mkfs.ext3 || skip_test # Get linux minor version linux_minor=$(echo `uname -r` | cut -d'.' -f3 | cut -d'-' -f1) -test $linux_minor -ge 31 || exit 200 +test $linux_minor -ge 31 || skip_test . ./test-utils.sh
test/test-utils.sh +35 -3
@@ -17,6 +17,25 @@ aux() { #"$@" } +prepare_clvmd() { + if test "$LVM_TEST_LOCKING" -ne 3 ; then + return 0 + fi + + if pgrep clvmd ; then + return 1 + fi + + clvmd -Ifake -d 1 >clvmd.log 2>&1 & +} + +stop_clvmd() { + if test "$LVM_TEST_LOCKING" -eq 3 ; then + pkill -9 clvmd + sleep 1 + fi +} + STACKTRACE() { trap - ERR; i=0;
@@ -65,14 +84,22 @@ teardown() { test -n "$LOOPFILE" && rm -f $LOOPFILE fi unset devs # devs is set in prepare_devs() + return 0 } teardown_() { + stop_clvmd teardown cleanup_ # user-overridable cleanup testlib_cleanup_ # call test-lib cleanup routine, too } +skip_test() { + trap - exit + teardown_ + exit 200 +} + make_ioerror() { echo 0 10000000 error | dmsetup create ioerror ln -s $G_dev_/mapper/ioerror $G_dev_/ioerror
@@ -83,9 +110,6 @@ prepare_loop() { test -n "$size" || size=32 test -n "$LOOP" && return 0 - trap 'aux teardown_' EXIT # don't forget to clean up - trap 'set +vex; STACKTRACE; set -vex' ERR - #trap - ERR LOOPFILE="$PWD/test.img" dd if=/dev/zero of="$LOOPFILE" bs=$((1024*1024)) count=1 seek=$(($size-1))
@@ -294,6 +318,8 @@ prepare_lvmconf() { abort_on_internal_errors = 1 library_dir = "$G_root_/lib" locking_dir = "$G_root_/var/lock/lvm" + locking_type = $LVM_TEST_LOCKING + fallback_to_local_locking = 0 } activation { udev_sync = 1
@@ -304,4 +330,10 @@ EOF set -vexE -o pipefail aux prepare_lvmconf +aux prepare_clvmd || { + echo "Cannot use fake cluster locking with real clvmd running." + exit 200 +} +trap 'aux teardown_' EXIT # don't forget to clean up +trap 'set +vex; STACKTRACE; set -vex' ERR
Signature · 1 line
1.7.0
PATCH 1/2 Add "fake" cluster locking (local locking performed in clvmd) for testing.
In reply to Milan BrozQuoted 36 lines · Milan Broz
This patch introduces simple "cluster" locking, which basically simulates only one node to allow clvmd running even withou any cluster infrastucture.
The puprose of this patch is to provide very simple testin environment for cluster locking.
Basically the locking is performed from long-running clvmd process.Signed-off-by Milan Broz<[email protected]>--- configure.in | 1 + daemons/clvmd/Makefile.in | 4 + daemons/clvmd/clvmd-comms.h | 7 ++ daemons/clvmd/clvmd-fake.c | 191 +++++++++++++++++++++++++++++++++++++++++++ daemons/clvmd/clvmd.c | 16 ++++- 5 files changed, 218 insertions(+), 1 deletions(-)create mode 100644
daemons/clvmd/clvmd-fake.cdaemons/clvmd/clvmd-fake.c new file +16
-0+static int init_comms () +{ +struct sockaddr_un addr; + + listen_fd =socket (AF_UNIX ,SOCK_DGRAM ,0 ); + +if (listen_fd<0 ) +return -1 ; + +memset (&addr,0 ,sizeof (addr)); + addr.sun_family =AF_UNIX ; +strcpy (addr.sun_path,SOCKET_PATH ); + +unlink (SOCKET_PATH ); +if (bind (listen_fd, (struct sockaddr *)&addr,sizeof (addr))<0 ) { +DEBUGLOG ("Can't bind to port: %s\n" ,strerror (errno));
daemons/clvmd/clvmd-fake.c line 65
Quoted 10 lines
daemons/clvmd/clvmd-fake.c new file +10
-0+close (listen_fd); +return -1 ; + } + +listen (listen_fd,5 ); + +/* Set Close-on-exec */ +fcntl (listen_fd,F_SETFD ,1 ); + +return 0 ;
If you only need a a dummy FD then you might as well use /dev/null rather than opening a real socket.
daemons/clvmd/clvmd.c int main(int argc, char *argv[]) · line 448
Quoted 10 lines
daemons/clvmd/clvmd.c +9
-0+#ifdef USE_FAKE +if (!clops) +if ((cluster_iface ==IF_AUTO || cluster_iface ==IF_FAKE )&& (clops =init_fake_cluster ())) { + max_csid_len =FAKE_CSID_LEN ; + max_cluster_message =FAKE_MAX_CLUSTER_MESSAGE ; + max_cluster_member_name_len =MAX_CLUSTER_MEMBER_NAME_LEN ; +syslog (LOG_NOTICE ,"Cluster LVM daemon started - connected to FakeCluster" ); + } +#endif
Please don't add it to the auto-detect list, that will only cause confusion. Only enable fake if it's specified on the command-line.
Chrissie