Cluster Project branch, master, updated. gfs-kernel_0_1_22-50-ge8d8a46

[lhh@sourceware.org]

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=e8d8a463f83e1dd323e84b06d34ae7f80ca96b57

The branch, master has been updated
       via  e8d8a463f83e1dd323e84b06d34ae7f80ca96b57 (commit)
       via  597d05bee50ec4100f5a656594140bae6a7b2464 (commit)
      from  01c2c77a02deb7ae01c37d7e68df6cde608ed2a9 (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 e8d8a463f83e1dd323e84b06d34ae7f80ca96b57
Merge: 597d05bee50ec4100f5a656594140bae6a7b2464 01c2c77a02deb7ae01c37d7e68df6cde608ed2a9
Author: Lon Hohberger <lhh@redhat.com>
Date:   Fri Feb 29 14:22:01 2008 -0500

    Merge branch 'master' of ssh://lhh@sources.redhat.com/git/cluster

commit 597d05bee50ec4100f5a656594140bae6a7b2464
Author: Lon Hohberger <lhh@redhat.com>
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 cf32c97..1bb9f12 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 c69e927..990190e 100644
--- a/fence/fenced/fd.h
+++ b/fence/fenced/fd.h
@@ -195,5 +195,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 08ef8ab..ffccd3c 100644
--- a/fence/fenced/recover.c
+++ b/fence/fenced/recover.c
@@ -407,6 +407,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