[Cluster-devel] [PATCH] Make fenced manual override work as fencing

[Cluster-devel] [PATCH] Make fenced manual override work as fencing

[Lon Hohberger]

This patch corrects a bug in fenced which prevents manual
override from being reported to CMAN

[Cluster-devel] [PATCH] Make fenced manual override work as fencing

[Lon Hohberger]

On Wed, 2008-02-27 at 17:15 -0500, Lon Hohberger wrote:
> This patch corrects a bug in fenced which prevents manual
> override from being reported to CMAN

Er, whoops.  Here's the patch.

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);
 		}

[Cluster-devel] [PATCH] Make fenced manual override work as fencing

[Lon Hohberger]

Pushed.

On Wed, Feb 27, 2008 at 05:16:46PM -0500, Lon Hohberger wrote:
> -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);
>  		}
> 
> 

-- 
Lon Hohberger - Software Engineer - Red Hat, Inc.