Gitweb:
http://git.fedorahosted.org/git/?p=dlm.git;a=commitdiff;h=5bdbe083ed23abc...
Commit: 5bdbe083ed23abc955309ea23fd6f008852b05b8
Parent: 41f4121768ab4948898945007f49168acfac6c9f
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Jun 25 11:04:49 2013 -0500
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Tue Jun 25 11:04:49 2013 -0500
dlm_controld: daemon_fence_work should wait for confchg
If daemon_last_join_monotime has not yet been initialized
by the first confchg, then daemon_fence_work() should
wait for that to happen.
Signed-off-by: David Teigland <teigland(a)redhat.com>
---
dlm_controld/daemon_cpg.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/dlm_controld/daemon_cpg.c b/dlm_controld/daemon_cpg.c
index 8c4cff2..0758560 100644
--- a/dlm_controld/daemon_cpg.c
+++ b/dlm_controld/daemon_cpg.c
@@ -865,6 +865,11 @@ static void daemon_fence_work(void)
if (!opt(enable_startup_fencing_ind))
continue;
+ if (!daemon_last_join_monotime) {
+ log_debug("fence startup %d wait for confchg", node->nodeid);
+ continue;
+ }
+
if (monotime() - daemon_last_join_monotime < opt(post_join_delay_ind)) {
log_debug("fence startup %d delay %d from %llu",
node->nodeid, opt(post_join_delay_ind),