Skip to contentSkip to conversation

Make fenced manual override work as fencing

PATCH New Lon Hohberger 1 participant 3 messages Feb 27, 2008 – Feb 29, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Make fenced manual override work as fencing

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

#1 lore raw

PATCH 1/1 Make fenced manual override work as fencing

Quoted 2 lines · Lon Hohberger

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

Er, whoops. Here's the patch.

fence/fenced/agent.c +0 -0
index 65cb30c..0577e8f 100644
@@ -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;

fence/fenced/fd.h +1 -0
index 988a412..0b78d19 100644
@@ -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__  */
fence/fenced/recover.c +1 -0
index 82a3c42..7f8aace 100644
@@ -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);
 		}
#2 lore raw

PATCH 1/1 Make fenced manual override work as fencing

Pushed.

Quoted 30 lines · Lon Hohberger
(quoted diff) +1 -1
-static void update_cman(char *victim, char *method)
+void update_cman(char *victim, char *method)
 {
 	cman_handle_t ch;
 	struct cman_node node;
fence/fenced/fd.h +1 -0
index 988a412..0b78d19 100644
@@ -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__  */
fence/fenced/recover.c +1 -0
index 82a3c42..7f8aace 100644
@@ -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);
 		}
Signature · 1 line
Lon Hohberger - Software Engineer - Red Hat, Inc.