[Cluster-devel] cluster/ccs/daemon cluster_mgr.c

[Cluster-devel] cluster/ccs/daemon cluster_mgr.c

[teigland]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL50
Changes by:	teigland at sourceware.org	2006-12-14 21:01:34

Modified files:
	ccs/daemon     : cluster_mgr.c 

Log message:
	Switch from CMAN_DISPATCH_ONE loop to CMAN_DISPATCH_ALL to resolve
	delayed cman shutdown callbacks.
	bz 219385

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/cluster_mgr.c.diff?cvsroot=cluster&only_with_tag=RHEL50&r1=1.23&r2=1.23.4.1

--- cluster/ccs/daemon/cluster_mgr.c	2006/10/20 14:18:00	1.23
+++ cluster/ccs/daemon/cluster_mgr.c	2006/12/14 21:01:34	1.23.4.1
@@ -30,9 +30,6 @@
 #include "globals.h"
 #include "libcman.h"
 
-static int cman_flag;
-static int cman_reason;
-
 typedef struct member_list {
   int count;
   int pad;
@@ -331,11 +328,19 @@
 
 static void cman_callback(cman_handle_t handle, void *private, int reason, int arg)
 {
-  cman_flag = 1;
-  cman_reason = reason;
+  switch (reason) {
+    case CMAN_REASON_TRY_SHUTDOWN:
+      cman_replyto_shutdown(handle, 1);
+      break;
+
+    case CMAN_REASON_STATECHANGE:
+      quorate = cman_is_quorate(handle);
+      free_member_list(members);
+      members = get_member_list(handle);
+      break;
 
-  if (reason == CMAN_REASON_TRY_SHUTDOWN) {
-    cman_replyto_shutdown(handle, 1);
+    default:
+      break;
   }
 }
 
@@ -344,17 +349,12 @@
 {
   ENTER("handle_cluster_event");
 
-  if (cman_dispatch(handle, CMAN_DISPATCH_ONE) < 0) {
-    return -1;
+  int rv = 1;
+  while (rv > 0) {
+    rv = cman_dispatch(handle, CMAN_DISPATCH_ALL);
   }
-
-  if (cman_flag) {
-    cman_flag = 0;
-    if (cman_reason == CMAN_REASON_STATECHANGE) {
-      quorate = cman_is_quorate(handle);
-      free_member_list(members);
-      members = get_member_list(handle);
-    }
+  if (rv < 0) {
+    return -1;
   }
 
   EXIT("handle_cluster_event");

[Cluster-devel] cluster/ccs/daemon cluster_mgr.c

[fabbione]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	fabbione at sourceware.org	2007-05-02 12:42:43

Modified files:
	ccs/daemon     : cluster_mgr.c 

Log message:
	pretty self explanatory, this code is not used anywhere. Get rid of it.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/cluster_mgr.c.diff?cvsroot=cluster&r1=1.25&r2=1.26

--- cluster/ccs/daemon/cluster_mgr.c	2007/05/02 12:42:19	1.25
+++ cluster/ccs/daemon/cluster_mgr.c	2007/05/02 12:42:43	1.26
@@ -41,15 +41,11 @@
 static member_list_t *get_member_list(cman_handle_t handle);
 static void free_member_list(member_list_t *list);
 static char *member_id_to_name(member_list_t *list, int node);
-static int member_name_to_id(member_list_t *list, char *name);
 static int member_addr_to_id(member_list_t *list, struct sockaddr *addr);
-static int member_online_node(member_list_t *list, int node);
-static int member_online_name(member_list_t *list, char *name);
 
 static int select_retry(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *xfds,
 			struct timeval *timeout);
 
-static ssize_t write_retry(int fd, void *buf, int count, struct timeval *timeout);
 static ssize_t read_retry(int fd, void *buf, int count, struct timeval *timeout);
 
 static int check_update_doc(xmlDocPtr tmp_doc)
@@ -607,20 +603,6 @@
 }
 
 
-static int member_name_to_id(member_list_t *list, char *name)
-{
-  int i;
-
-  for (i = 0; i < list->count; i++) {
-    if (!strcasecmp(list->nodes[i].cn_name, name)) {
-      return list->nodes[i].cn_nodeid;
-    }
-  }
-
-  return 0;
-}
-
-
 static int member_addr_to_id(member_list_t *list, struct sockaddr *addr)
 {
   int i;
@@ -637,34 +619,6 @@
 }
 
 
-static int member_online_node(member_list_t *list, int node)
-{
-  int i;
-
-  for (i = 0; i < list->count; i++) {
-    if (list->nodes[i].cn_nodeid == node) {
-      return list->nodes[i].cn_member;
-    }
-  }
-
-  return 0;
-}
-
-
-static int member_online_name(member_list_t *list, char *name)
-{
-  int i;
-
-  for (i = 0; i < list->count; i++) {
-    if (!strcasecmp(list->nodes[i].cn_name, name)) {
-      return list->nodes[i].cn_member;
-    }
-  }
-
-  return 0;
-}
-
-
 static int select_retry(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *xfds,
 			struct timeval *timeout)
 {
@@ -681,68 +635,6 @@
 }
 
 
-static ssize_t write_retry(int fd, void *buf, int count, struct timeval *timeout)
-{
-  int n, total = 0, remain = count, rv = 0;
-  fd_set wfds, xfds;
-
-  while (total < count)
-  {
-    /* Create the write FD set of 1... */
-    FD_ZERO(&wfds);
-    FD_SET(fd, &wfds);
-    FD_ZERO(&xfds);
-    FD_SET(fd, &xfds);
-
-    /* wait for the fd to be available for writing */
-    rv = select_retry(fd + 1, NULL, &wfds, &xfds, timeout);
-    if (rv == -1) {
-      return -1;
-    }
-    else if (rv == 0) {
-      errno = ETIMEDOUT;
-      return -1;
-    }
-
-    if (FD_ISSET(fd, &xfds)) {
-      errno = EPIPE;
-      return -1;
-    }
-
-    /* 
-     * Attempt to write to fd
-     */
-    n = write(fd, buf + (off_t) total, remain);
-
-    /*
-     * When we know our fd was select()ed and we receive 0 bytes
-     * when we write, the fd was closed.
-     */
-    if ((n == 0) && (rv == 1)) {
-      errno = EPIPE;
-      return -1;
-    }
-
-    if (n == -1) {
-      if ((errno == EAGAIN) || (errno == EINTR)) {
-	/* 
-	 * Not ready?
-	 */
-	continue;
-      }
-
-      /* Other errors: EIO, EINVAL, etc */
-      return -1;
-    }
-
-    total += n;
-    remain -= n;
-  }
-
-  return total;
-}
-
-
 static ssize_t read_retry(int fd, void *buf, int count, struct timeval *timeout)
 {
   int n, total = 0, remain = count, rv = 0;

[Cluster-devel] cluster/ccs/daemon cluster_mgr.c

[fabbione]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	fabbione at sourceware.org	2007-05-02 12:42:20

Modified files:
	ccs/daemon     : cluster_mgr.c 

Log message:
	When the project switched away from magma, we forgot to enable IPv6 for
	cluster_base_port.
	The patch fix that and add some checks that were marked as TODO in the code.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/cluster_mgr.c.diff?cvsroot=cluster&r1=1.24&r2=1.25

--- cluster/ccs/daemon/cluster_mgr.c	2006/12/14 21:00:10	1.24
+++ cluster/ccs/daemon/cluster_mgr.c	2007/05/02 12:42:19	1.25
@@ -375,35 +375,62 @@
   fd_set rset;
   cman_handle_t handle = NULL;
 
-  struct sockaddr_in sin;
+  struct sockaddr_storage addr;
+  struct sockaddr_in *addr4 = (struct sockaddr_in *)&addr;
+  struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)&addr;
+  int addr_size=0;
 
   ENTER("cluster_communicator");
 
-  if ((ccsd_fd = socket(PF_INET, SOCK_STREAM, 0)) < 0) {
-    log_err("Unable to create socket.\n");
-    exit(EXIT_FAILURE);
+  memset(&addr, 0, sizeof(struct sockaddr_storage));
+
+  if (IPv6) {
+    if ((ccsd_fd = socket(PF_INET6, SOCK_STREAM, 0)) < 0) {
+      if(IPv6 == -1) {
+	log_dbg("Unable to create IPv6 socket:: %s\n", strerror(errno));
+	IPv6=0;
+     }
+    }
   }
 
-  sin.sin_family = AF_INET;
-  sin.sin_port = htons(cluster_base_port);
-  sin.sin_addr.s_addr = htonl(INADDR_ANY);
+  if (!IPv6) {
+    if ((ccsd_fd = socket(PF_INET, SOCK_STREAM, 0)) < 0) {
+      log_err("Unable to create IPv4 socket.\n");
+      exit(EXIT_FAILURE);
+    }
+  }
 
   if (setsockopt(ccsd_fd, SOL_SOCKET, SO_REUSEADDR, (void *)&opt, sizeof(opt)) < 0) {
-    /* Check the errno and exit ? */
+    log_sys_err("Unable to set socket option");
+    exit(EXIT_FAILURE);
+  }
+
+  if(IPv6){
+    addr_size = sizeof(struct sockaddr_in6);
+    addr6->sin6_family = AF_INET6;
+    addr6->sin6_addr = in6addr_any;
+    addr6->sin6_port = htons(cluster_base_port);
+  } else {
+    addr_size = sizeof(struct sockaddr_in);
+    addr4->sin_family = AF_INET;
+    addr4->sin_addr.s_addr = INADDR_ANY;
+    addr4->sin_port = htons(cluster_base_port);
   }
 
   flags = fcntl(ccsd_fd, F_GETFD, 0);
   flags |= FD_CLOEXEC;
   fcntl(ccsd_fd, F_SETFD, flags);
 
-  if (bind(ccsd_fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
+  if (bind(ccsd_fd, (struct sockaddr *)&addr, addr_size) < 0) {
     log_err("Unable to bind to socket.\n");
     close(ccsd_fd);
     exit(EXIT_FAILURE);
   }
 
   if (listen(ccsd_fd, 15) < 0) {
-    /* Check the errno and exit ? */
+    log_err("Unable to listen to socket.\n");
+    close(ccsd_fd);
+    exit(EXIT_FAILURE);
   }
 
 restart:

[Cluster-devel] cluster/ccs/daemon cluster_mgr.c

[teigland]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	teigland at sourceware.org	2006-12-14 21:01:03

Modified files:
	ccs/daemon     : cluster_mgr.c 

Log message:
	Switch from CMAN_DISPATCH_ONE loop to CMAN_DISPATCH_ALL to resolve
	delayed cman shutdown callbacks.
	bz 219385

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/cluster_mgr.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.23&r2=1.23.2.1

--- cluster/ccs/daemon/cluster_mgr.c	2006/10/20 14:18:00	1.23
+++ cluster/ccs/daemon/cluster_mgr.c	2006/12/14 21:01:03	1.23.2.1
@@ -30,9 +30,6 @@
 #include "globals.h"
 #include "libcman.h"
 
-static int cman_flag;
-static int cman_reason;
-
 typedef struct member_list {
   int count;
   int pad;
@@ -331,11 +328,19 @@
 
 static void cman_callback(cman_handle_t handle, void *private, int reason, int arg)
 {
-  cman_flag = 1;
-  cman_reason = reason;
+  switch (reason) {
+    case CMAN_REASON_TRY_SHUTDOWN:
+      cman_replyto_shutdown(handle, 1);
+      break;
+
+    case CMAN_REASON_STATECHANGE:
+      quorate = cman_is_quorate(handle);
+      free_member_list(members);
+      members = get_member_list(handle);
+      break;
 
-  if (reason == CMAN_REASON_TRY_SHUTDOWN) {
-    cman_replyto_shutdown(handle, 1);
+    default:
+      break;
   }
 }
 
@@ -344,17 +349,12 @@
 {
   ENTER("handle_cluster_event");
 
-  if (cman_dispatch(handle, CMAN_DISPATCH_ONE) < 0) {
-    return -1;
+  int rv = 1;
+  while (rv > 0) {
+    rv = cman_dispatch(handle, CMAN_DISPATCH_ALL);
   }
-
-  if (cman_flag) {
-    cman_flag = 0;
-    if (cman_reason == CMAN_REASON_STATECHANGE) {
-      quorate = cman_is_quorate(handle);
-      free_member_list(members);
-      members = get_member_list(handle);
-    }
+  if (rv < 0) {
+    return -1;
   }
 
   EXIT("handle_cluster_event");

[Cluster-devel] cluster/ccs/daemon cluster_mgr.c

[teigland]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	teigland at sourceware.org	2006-12-14 21:00:11

Modified files:
	ccs/daemon     : cluster_mgr.c 

Log message:
	Switch from CMAN_DISPATCH_ONE loop to CMAN_DISPATCH_ALL to resolve
	delayed cman shutdown callbacks.
	bz 219385

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/cluster_mgr.c.diff?cvsroot=cluster&r1=1.23&r2=1.24

--- cluster/ccs/daemon/cluster_mgr.c	2006/10/20 14:18:00	1.23
+++ cluster/ccs/daemon/cluster_mgr.c	2006/12/14 21:00:10	1.24
@@ -30,9 +30,6 @@
 #include "globals.h"
 #include "libcman.h"
 
-static int cman_flag;
-static int cman_reason;
-
 typedef struct member_list {
   int count;
   int pad;
@@ -331,11 +328,19 @@
 
 static void cman_callback(cman_handle_t handle, void *private, int reason, int arg)
 {
-  cman_flag = 1;
-  cman_reason = reason;
+  switch (reason) {
+    case CMAN_REASON_TRY_SHUTDOWN:
+      cman_replyto_shutdown(handle, 1);
+      break;
+
+    case CMAN_REASON_STATECHANGE:
+      quorate = cman_is_quorate(handle);
+      free_member_list(members);
+      members = get_member_list(handle);
+      break;
 
-  if (reason == CMAN_REASON_TRY_SHUTDOWN) {
-    cman_replyto_shutdown(handle, 1);
+    default:
+      break;
   }
 }
 
@@ -344,17 +349,12 @@
 {
   ENTER("handle_cluster_event");
 
-  if (cman_dispatch(handle, CMAN_DISPATCH_ONE) < 0) {
-    return -1;
+  int rv = 1;
+  while (rv > 0) {
+    rv = cman_dispatch(handle, CMAN_DISPATCH_ALL);
   }
-
-  if (cman_flag) {
-    cman_flag = 0;
-    if (cman_reason == CMAN_REASON_STATECHANGE) {
-      quorate = cman_is_quorate(handle);
-      free_member_list(members);
-      members = get_member_list(handle);
-    }
+  if (rv < 0) {
+    return -1;
   }
 
   EXIT("handle_cluster_event");

[Cluster-devel] cluster/ccs/daemon cluster_mgr.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	pcaulfield at sourceware.org	2006-10-17 16:46:53

Modified files:
	ccs/daemon     : cluster_mgr.c 

Log message:
	Get notifications BEFORE getting state otherwise we have a race condition.
	probably fixes bz#210732

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/cluster_mgr.c.diff?cvsroot=cluster&r1=1.21&r2=1.22

--- cluster/ccs/daemon/cluster_mgr.c	2006/05/10 08:19:11	1.21
+++ cluster/ccs/daemon/cluster_mgr.c	2006/10/17 16:46:53	1.22
@@ -431,6 +431,8 @@
     ppid = 0;
   }
 
+  cman_start_notification(handle, cman_callback);
+
   cman_fd = cman_get_fd(handle);
   quorate = cman_is_quorate(handle);
 
@@ -438,7 +440,7 @@
 
   members = get_member_list(handle);
 
-  cman_start_notification(handle, cman_callback);
+
 
   while (1)
   {