public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
From: David Teigland <teigland@fedoraproject.org> To: cluster-cvs-relay@redhat.com Subject: dlm: master - dlm_controld: fix skipping lock spaces Date: Mon, 10 Aug 2009 22:44:00 -0000 [thread overview] Message-ID: <20090810224354.C0F071201F1@lists.fedorahosted.org> (raw) Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=8a6e8d42451575cb3e9570987e8e25ed2d870b89 Commit: 8a6e8d42451575cb3e9570987e8e25ed2d870b89 Parent: b99cddf769890627cf36bc3745d1b72da434f5e3 Author: Lars Marowsky-Bree <lmb@suse.de> AuthorDate: Mon Aug 10 21:44:44 2009 +0200 Committer: David Teigland <teigland@redhat.com> CommitterDate: Mon Aug 10 17:33:59 2009 -0500 dlm_controld: fix skipping lock spaces With several lock spaces, there was a chance that poll_fencing, poll_quorum, or poll_fs were reset after the earlier lock spaces had been iterated over by process_lockspace_changes(). This would cause the earlier lock spaces to not be recovered, since process_lockspace_changes() would not be called again from the main loop. This fixes bugzilla.novell.com #528425. Signed-off-by: Lars Marowsky-Bree <lmb@suse.de> Signed-off-by: David Teigland <teigland@redhat.com> --- group/dlm_controld/cpg.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/group/dlm_controld/cpg.c b/group/dlm_controld/cpg.c index 9e26028..1704986 100644 --- a/group/dlm_controld/cpg.c +++ b/group/dlm_controld/cpg.c @@ -651,26 +651,23 @@ static int wait_conditions_done(struct lockspace *ls) just the latest change */ if (!check_fencing_done(ls)) { - poll_fencing = 1; + poll_fencing++; return 0; } - poll_fencing = 0; /* even though fencing also waits for quorum, checking fencing isn't sufficient because we don't want to start new lockspaces in an inquorate cluster */ if (!check_quorum_done(ls)) { - poll_quorum = 1; + poll_quorum++; return 0; } - poll_quorum = 0; if (!check_fs_done(ls)) { - poll_fs = 1; + poll_fs++; return 0; } - poll_fs = 0; return 1; } @@ -1166,6 +1163,9 @@ void process_lockspace_changes(void) { struct lockspace *ls, *safe; + poll_fencing = 0; + poll_quorum = 0; + poll_fs = 0; list_for_each_entry_safe(ls, safe, &lockspaces, list) { if (!list_empty(&ls->changes)) apply_changes(ls);
reply other threads:[~2009-08-10 22:44 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20090810224354.C0F071201F1@lists.fedorahosted.org \ --to=teigland@fedoraproject.org \ --cc=cluster-cvs-relay@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).