From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 3349 invoked by alias); 14 Aug 2008 21:05:00 -0000 Received: (qmail 3341 invoked by alias); 14 Aug 2008 21:04:59 -0000 X-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on hosted1.fedoraproject.org X-Spam-Level: Subject: master - gfs_controld: fix fs_notify during recovery To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 44861eae0e3530360c6e848aa5d86f482ede70e5 X-Git-Newrev: 60132fc9c185be95a6cc480bd535412995a167a2 From: David Teigland Message-Id: <20080814210409.782C212002B@lists.fedorahosted.org> Date: Fri, 15 Aug 2008 06:02:00 -0000 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2008-q3/txt/msg00270.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=60132fc9c185be95a6cc480bd535412995a167a2 Commit: 60132fc9c185be95a6cc480bd535412995a167a2 Parent: 44861eae0e3530360c6e848aa5d86f482ede70e5 Author: David Teigland AuthorDate: Thu Aug 14 15:53:21 2008 -0500 Committer: David Teigland CommitterDate: Thu Aug 14 15:53:21 2008 -0500 gfs_controld: fix fs_notify during recovery Wasn't processing mountgroup again after an initial failed fs_notify, so no retry was happening. Also, the process_mountgroup check was wrongly skipping the apply_changes phase sometimes at the very start because there was no change struct yet, which would cause a segfault. Signed-off-by: David Teigland --- group/gfs_controld/cpg-new.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/group/gfs_controld/cpg-new.c b/group/gfs_controld/cpg-new.c index d72d907..28445c1 100644 --- a/group/gfs_controld/cpg-new.c +++ b/group/gfs_controld/cpg-new.c @@ -622,6 +622,8 @@ void process_dlmcontrol(int ci) } poll_dlm = 0; + + process_mountgroup(mg); } static int check_dlm_notify_done(struct mountgroup *mg) @@ -657,8 +659,8 @@ static int check_dlm_notify_done(struct mountgroup *mg) dlmc_fs_notified() again in a bit */ if (node->dlm_notify_callback && node->dlm_notify_result) { - log_group(mg, "check_dlm_notify will retry nodeid %d", - node->nodeid); + log_group(mg, "check_dlm_notify result %d will retry nodeid %d", + node->dlm_notify_result, node->nodeid); node->dlm_notify_callback = 0; poll_dlm = 1; return 0; @@ -2065,7 +2067,7 @@ static void process_mountgroup(struct mountgroup *mg) if (!list_empty(&mg->changes)) apply_changes(mg); - if (list_empty(&mg->changes)) + if (mg->started_change && list_empty(&mg->changes)) recover_and_start(mg); }