[Cluster-devel] cluster/gnbd/client gnbd_monitor.c

[Cluster-devel] cluster/gnbd/client gnbd_monitor.c

[bmarzins]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	STABLE
Changes by:	bmarzins at sourceware.org	2006-06-26 22:18:01

Modified files:
	gnbd/client    : gnbd_monitor.c 

Log message:
	Fix gnbd_monitor so that it will correctly restart multiple devices per
	server.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/client/gnbd_monitor.c.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.6.2.1.6.2&r2=1.6.2.1.6.3

--- cluster/gnbd/client/gnbd_monitor.c	2006/04/10 16:07:28	1.6.2.1.6.2
+++ cluster/gnbd/client/gnbd_monitor.c	2006/06/26 22:18:01	1.6.2.1.6.3
@@ -366,7 +366,6 @@
     dev = list_entry(item, monitor_t, list);
     if (check_for_node(nodes, dev->server)){
       fail_device(dev);
-      break;
     }
   }
 }
@@ -476,14 +475,13 @@
 
 cluster_member_t *get_failover_server(monitor_t *dev)
 {
-  char host[256];
   cluster_member_t *server;
   list_t *item;
   monitor_t *other_dev;
 
   server = check_for_node(cluster_members, dev->server);
   if (server == NULL){
-    log_err("server %s is not a cluster member, cannot fence.\n", host);
+    log_err("server %s is not a cluster member, cannot fence.\n", dev->server);
     return NULL;
   }
   list_foreach(item, &monitor_list){

[Cluster-devel] cluster/gnbd/client gnbd_monitor.c

[bmarzins]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	bmarzins at sourceware.org	2006-06-26 23:45:28

Modified files:
	gnbd/client    : gnbd_monitor.c 

Log message:
	fixed gnbd_monitor bug with recovering multiple imports per server.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/client/gnbd_monitor.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.6.2.3&r2=1.6.2.4

--- cluster/gnbd/client/gnbd_monitor.c	2006/03/28 05:30:47	1.6.2.3
+++ cluster/gnbd/client/gnbd_monitor.c	2006/06/26 23:45:28	1.6.2.4
@@ -366,7 +366,6 @@
     dev = list_entry(item, monitor_t, list);
     if (check_for_node(nodes, dev->server)){
       fail_device(dev);
-      break;
     }
   }
 }
@@ -476,14 +475,13 @@
 
 cluster_member_t *get_failover_server(monitor_t *dev)
 {
-  char host[256];
   cluster_member_t *server;
   list_t *item;
   monitor_t *other_dev;
 
   server = check_for_node(cluster_members, dev->server);
   if (server == NULL){
-    log_err("server %s is not a cluster member, cannot fence.\n", host);
+    log_err("server %s is not a cluster member, cannot fence.\n", dev->server);
     return NULL;
   }
   list_foreach(item, &monitor_list){

[Cluster-devel] cluster/gnbd/client gnbd_monitor.c

[bmarzins]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4U4
Changes by:	bmarzins at sourceware.org	2006-06-26 23:47:25

Modified files:
	gnbd/client    : gnbd_monitor.c 

Log message:
	fix gnbd_monitor bug dealing with multiple imports per server

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/client/gnbd_monitor.c.diff?cvsroot=cluster&only_with_tag=RHEL4U4&r1=1.6.2.3&r2=1.6.2.3.2.1

--- cluster/gnbd/client/gnbd_monitor.c	2006/03/28 05:30:47	1.6.2.3
+++ cluster/gnbd/client/gnbd_monitor.c	2006/06/26 23:47:24	1.6.2.3.2.1
@@ -366,7 +366,6 @@
     dev = list_entry(item, monitor_t, list);
     if (check_for_node(nodes, dev->server)){
       fail_device(dev);
-      break;
     }
   }
 }
@@ -476,14 +475,13 @@
 
 cluster_member_t *get_failover_server(monitor_t *dev)
 {
-  char host[256];
   cluster_member_t *server;
   list_t *item;
   monitor_t *other_dev;
 
   server = check_for_node(cluster_members, dev->server);
   if (server == NULL){
-    log_err("server %s is not a cluster member, cannot fence.\n", host);
+    log_err("server %s is not a cluster member, cannot fence.\n", dev->server);
     return NULL;
   }
   list_foreach(item, &monitor_list){