Gitweb: http://git.fedorahosted.org/git/?p=dlm.git;a=commitdiff;h=f65f3f67b0f87f5239... Commit: f65f3f67b0f87f52398ff1100aaede36e254abda Parent: a9c0eb5fb07f25e36a8750abaa2678fd0344ae35 Author: David Teigland teigland@redhat.com AuthorDate: Thu Jan 31 16:45:41 2013 -0600 Committer: David Teigland teigland@redhat.com CommitterDate: Thu Jan 31 16:45:41 2013 -0600
dlm_controld: retry fencing work while waiting for ringid
An update to the cluster ringid won't necessarily cause the fencing work to be scheduled, so force to it be polled/retried.
Signed-off-by: David Teigland teigland@redhat.com --- dlm_controld/daemon_cpg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlm_controld/daemon_cpg.c b/dlm_controld/daemon_cpg.c index b6532a3..af9b91d 100644 --- a/dlm_controld/daemon_cpg.c +++ b/dlm_controld/daemon_cpg.c @@ -742,17 +742,17 @@ static void daemon_fence_work(void) /* We've seen a nodedown confchg callback, but not the corresponding ringid callback. */ log_retry(retry_fencing, "fence work wait for cpg ringid"); + retry = 1; goto out; }
if (cluster_ringid_seq != daemon_ringid.seq) { /* wait for ringids to be in sync */ log_retry(retry_fencing, "fence work wait for cluster ringid"); + retry = 1; goto out; }
- /* retry = 1; */ - if (opt(enable_quorum_fencing_ind) && !cluster_quorate) { /* wait for quorum before doing any fencing, but if there is none, send_fence_clear below can unblock new nodes */
cluster-commits@lists.fedorahosted.org