From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 32644 invoked by alias); 29 Feb 2008 19:21:21 -0000 Received: (qmail 32614 invoked by uid 9476); 29 Feb 2008 19:21:21 -0000 Date: Fri, 29 Feb 2008 19:21:00 -0000 Message-ID: <20080229192121.32599.qmail@sourceware.org> From: lhh@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, RHEL5, updated. cmirror_1_1_15-1-gb5135c4 X-Git-Refname: refs/heads/RHEL5 X-Git-Reftype: branch X-Git-Oldrev: 15d12f28f64661dbb6f4f80eae822f2b56e7a5d4 X-Git-Newrev: b5135c44bda382d274e6013ef9cdb6cef969d9bb 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-q1/txt/msg00259.txt.bz2 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=b5135c44bda382d274e6013ef9cdb6cef969d9bb The branch, RHEL5 has been updated via b5135c44bda382d274e6013ef9cdb6cef969d9bb (commit) from 15d12f28f64661dbb6f4f80eae822f2b56e7a5d4 (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 b5135c44bda382d274e6013ef9cdb6cef969d9bb Author: Lon Hohberger Date: Fri Feb 29 14:15:39 2008 -0500 Fix #435189 - fenced override doesn't allow rgmanager to recover because it doesn't tell cman that fencing was completed. ----------------------------------------------------------------------- Summary of changes: fence/fenced/agent.c | 2 +- fence/fenced/fd.h | 1 + fence/fenced/recover.c | 1 + 3 files changed, 3 insertions(+), 1 deletions(-) diff --git a/fence/fenced/agent.c b/fence/fenced/agent.c index 65cb30c..0577e8f 100644 --- a/fence/fenced/agent.c +++ b/fence/fenced/agent.c @@ -279,7 +279,7 @@ static int use_device(int cd, char *victim, char *method, int d, return error; } -static void update_cman(char *victim, char *method) +void update_cman(char *victim, char *method) { cman_handle_t ch; struct cman_node node; diff --git a/fence/fenced/fd.h b/fence/fenced/fd.h index 988a412..0b78d19 100644 --- a/fence/fenced/fd.h +++ b/fence/fenced/fd.h @@ -192,5 +192,6 @@ int update_cluster_members(void); int is_member(char *name); int is_fenced(char *name); fd_node_t *get_new_node(fd_t *fd, int nodeid, char *in_name); +void update_cman(char *victim, char *agent); #endif /* __FD_DOT_H__ */ diff --git a/fence/fenced/recover.c b/fence/fenced/recover.c index 82a3c42..7f8aace 100644 --- a/fence/fenced/recover.c +++ b/fence/fenced/recover.c @@ -406,6 +406,7 @@ static void fence_victims(fd_t *fd, int start_type) syslog(LOG_WARNING, "fence \"%s\" overridden by " "administrator intervention", node->name); + update_cman(node->name, "override"); list_del(&node->list); free(node); } hooks/post-receive -- Cluster Project