summaryrefslogtreecommitdiff
path: root/daemons
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2016-01-14 16:12:46 -0600
committerDavid Teigland <teigland@redhat.com>2016-02-22 09:36:35 -0600
commit161ae36363f5fa1b1469fd3a42c096c878002b31 (patch)
treedc0eb4eb86edb8bcf9dc30a60989ec46372fc67d /daemons
parented5e5c38b5ac4b7c8cb7e809d9d35c72f087e29e (diff)
downloadlvm2-161ae36363f5fa1b1469fd3a42c096c878002b31.tar.gz
test: add make check_lvmlockd_test
Which runs lvmlockd in --test mode, without any lock manager. Also make some adjustments to the check_lvmlockd variations using the lock managds.
Diffstat (limited to 'daemons')
-rw-r--r--daemons/lvmlockd/lvmlockd-core.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/daemons/lvmlockd/lvmlockd-core.c b/daemons/lvmlockd/lvmlockd-core.c
index 292d19cc4..76a7650b1 100644
--- a/daemons/lvmlockd/lvmlockd-core.c
+++ b/daemons/lvmlockd/lvmlockd-core.c
@@ -3365,6 +3365,11 @@ static void *worker_thread_main(void *arg_in)
int run_sanlock = lm_is_running_sanlock();
int run_dlm = lm_is_running_dlm();
+ if (daemon_test) {
+ run_sanlock = gl_use_sanlock;
+ run_dlm = gl_use_dlm;
+ }
+
if (run_sanlock && run_dlm)
act->result = -EXFULL;
else if (!run_sanlock && !run_dlm)