summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2015-08-26 14:55:27 -0500
committerDavid Teigland <teigland@redhat.com>2015-08-27 10:27:24 -0500
commit58713d34dd71873ab97378e96d7ab0b8e9bda8ef (patch)
tree23925c976fdc5f1310d68255af762258ada3518d
parent32e22a00378192f226932258d9c5b55b073b4528 (diff)
downloadlvm2-58713d34dd71873ab97378e96d7ab0b8e9bda8ef.tar.gz
lvmlockd: detect when dlm lvb is invalidated
The lvb content can be lost during dlm recovery, and we need to detect when this happens to revalidate.
-rw-r--r--daemons/lvmlockd/lvmlockd-core.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/daemons/lvmlockd/lvmlockd-core.c b/daemons/lvmlockd/lvmlockd-core.c
index 3d41bd2b4..ac2d224c6 100644
--- a/daemons/lvmlockd/lvmlockd-core.c
+++ b/daemons/lvmlockd/lvmlockd-core.c
@@ -1057,7 +1057,18 @@ static int res_lock(struct lockspace *ls, struct resource *r, struct action *act
/* lm_lock() reads new r_version */
- if ((r_version > r->version) || (!r->version && !r->version_zero_valid)) {
+ if ((r_version != r->version) || (!r->version && !r->version_zero_valid)) {
+
+ /*
+ * r_version only increases, so if it goes down, it means the
+ * dlm lvb became invalid (happens during recovery if the
+ * resource master leaves).
+ */
+ if (r_version < r->version) {
+ log_debug("S %s R %s res_lock lvb invalid r_version %u prev %u",
+ ls->name, r->name, r_version, r->version);
+ }
+
/*
* New r_version of the lock: means that another
* host has changed data protected by this lock