From mboxrd@z Thu Jan 1 00:00:00 1970 From: teigland@sourceware.org Date: 14 Jul 2008 19:47:32 -0000 Subject: [Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.05-73-g12e98c1 Message-ID: <20080714194732.27614.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Cluster Project". http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=12e98c1895efea3c486bfe7aeaf57aca334fc05f The branch, master has been updated via 12e98c1895efea3c486bfe7aeaf57aca334fc05f (commit) from 4c433f6c23e217ec2865faa95af1869eb4428b27 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 12e98c1895efea3c486bfe7aeaf57aca334fc05f Author: David Teigland Date: Mon Jul 14 14:40:13 2008 -0500 dlm_controld: set id before recovery The lockspace id needs to be set in the kernel before starting recovery in the kernel, which depends on a valid id. Signed-off-by: David Teigland ----------------------------------------------------------------------- Summary of changes: group/dlm_controld/cpg.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/group/dlm_controld/cpg.c b/group/dlm_controld/cpg.c index 8d01d64..4ea31f3 100644 --- a/group/dlm_controld/cpg.c +++ b/group/dlm_controld/cpg.c @@ -533,6 +533,10 @@ static void start_kernel(struct lockspace *ls) log_group(ls, "start_kernel %u member_count %d", cg->seq, cg->member_count); + /* needs to happen before setting control which starts recovery */ + if (ls->joining) + set_sysfs_id(ls->name, ls->global_id); + format_member_ids(ls); format_renew_ids(ls); set_configfs_members(ls->name, member_count, member_ids, @@ -541,7 +545,6 @@ static void start_kernel(struct lockspace *ls) ls->kernel_stopped = 0; if (ls->joining) { - set_sysfs_id(ls->name, ls->global_id); set_sysfs_event_done(ls->name, 0); ls->joining = 0; } hooks/post-receive -- Cluster Project