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

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

[rohara]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	rohara at sourceware.org	2007-02-14 16:20:24

Modified files:
	ccs/daemon     : cnx_mgr.c 

Log message:
	Ignore EPIPE error when sending response. This can happen is, for example,
	rgmanager makes a request, ccs receives/processes the request, but rgmanager
	dies before ccs can send the response. Also added retry if we catch EINTR
	during write.

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

--- cluster/ccs/daemon/cnx_mgr.c	2006/05/24 08:53:21	1.41
+++ cluster/ccs/daemon/cnx_mgr.c	2007/02/14 16:20:23	1.41.2.1
@@ -1234,10 +1234,14 @@
 
  fail:
   error = write(afd, ch, sizeof(comm_header_t)+ch->comm_payload_size);
-  if(error < 0){
-    log_sys_err("Unable to write package back to sender");
-    return error; 
-    goto fail;
+  if(error < 0) {
+    if (errno == EINTR)
+      goto fail;
+    if (errno == EPIPE) {
+      error = 0;
+    } else {
+      log_sys_err("Unable to write package back to sender");
+    }
   } else if(error < (sizeof(comm_header_t)+ch->comm_payload_size)){
     log_err("Unable to write complete package.\n");
     error = -EBADE;
@@ -1248,7 +1252,6 @@
 
   if(ch){ free(ch); }
   if(payload){ free(payload); }
-  
 
   EXIT("process_request");
   return error;

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

[cfeist]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL46
Changes by:	cfeist at sourceware.org	2008-02-05 22:16:51

Modified files:
	ccs/daemon     : cnx_mgr.c 

Log message:
	Pulled from RHEL4 branch.
	
	BZ 418961
	Fix issue with endian conversion that caused problems for mixed architecture
	nodes on same subnet. Need to correct swap byte ordering of comm_header_t
	structure before copying into buffer and when dereferencing.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/cnx_mgr.c.diff?cvsroot=cluster&only_with_tag=RHEL46&r1=1.24.2.15&r2=1.24.2.15.4.1

--- cluster/ccs/daemon/cnx_mgr.c	2007/03/19 20:03:15	1.24.2.15
+++ cluster/ccs/daemon/cnx_mgr.c	2008/02/05 22:16:50	1.24.2.15.4.1
@@ -1363,18 +1363,19 @@
     ch->comm_flags |= COMM_BROADCAST_FROM_QUORATE;
   }
 
+  swab_header(ch);
   memcpy(buffer, ch, sizeof(comm_header_t));
+  swab_header(ch); /* Swab back to dip into ch for payload_size */
   memcpy(buffer+sizeof(comm_header_t), payload, ch->comm_payload_size);
 
   log_dbg("Sending cluster.conf (version %d)...\n", get_doc_version(master_doc->od_doc));
   sendlen = ch->comm_payload_size + sizeof(comm_header_t);
-  swab_header(ch);
   if(sendto(sfd, buffer, sendlen, 0,
 	    (struct sockaddr *)&addr, (socklen_t)len) < 0){
     log_sys_err("Sendto failed");
     error = -errno;
   }
-  
+
  fail:
   if(buffer) free(buffer);
   if(payload) free(payload);

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

[rohara]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	rohara at sourceware.org	2007-12-11 20:58:00

Modified files:
	ccs/daemon     : cnx_mgr.c 

Log message:
	Fix issue with endian conversion that caused problems for mixed architecture
	nodes on same subnet. Need to correct swap byte ordering of comm_header_t
	structure before copying into buffer and when dereferencing.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/cnx_mgr.c.diff?cvsroot=cluster&r1=1.43&r2=1.44

--- cluster/ccs/daemon/cnx_mgr.c	2007/05/08 14:25:41	1.43
+++ cluster/ccs/daemon/cnx_mgr.c	2007/12/11 20:58:00	1.44
@@ -1365,18 +1365,19 @@
     ch->comm_flags |= COMM_BROADCAST_FROM_QUORATE;
   }
 
+  swab_header(ch);
   memcpy(buffer, ch, sizeof(comm_header_t));
+  swab_header(ch); /* Swab back to dip into ch for payload_size */
   memcpy(buffer+sizeof(comm_header_t), payload, ch->comm_payload_size);
 
   log_dbg("Sending cluster.conf (version %d)...\n", get_doc_version(master_doc->od_doc));
   sendlen = ch->comm_payload_size + sizeof(comm_header_t);
-  swab_header(ch);
   if(sendto(sfd, buffer, sendlen, 0,
 	    (struct sockaddr *)&addr, (socklen_t)len) < 0){
     log_sys_err("Sendto failed");
     error = -errno;
   }
-  
+
  fail:
   if(buffer) free(buffer);
   if(payload) free(payload);

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

[rohara]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	rohara at sourceware.org	2007-12-11 20:57:24

Modified files:
	ccs/daemon     : cnx_mgr.c 

Log message:
	BZ 418741
	Fix issue with endian conversion that caused problems for mixed architecture
	nodes on same subnet. Need to correct swap byte ordering of comm_header_t
	structure before copying into buffer and when dereferencing.

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

--- cluster/ccs/daemon/cnx_mgr.c	2007/05/08 14:26:18	1.41.2.2
+++ cluster/ccs/daemon/cnx_mgr.c	2007/12/11 20:57:24	1.41.2.3
@@ -1365,18 +1365,19 @@
     ch->comm_flags |= COMM_BROADCAST_FROM_QUORATE;
   }
 
+  swab_header(ch);
   memcpy(buffer, ch, sizeof(comm_header_t));
+  swab_header(ch); /* Swab back to dip into ch for payload_size */
   memcpy(buffer+sizeof(comm_header_t), payload, ch->comm_payload_size);
 
   log_dbg("Sending cluster.conf (version %d)...\n", get_doc_version(master_doc->od_doc));
   sendlen = ch->comm_payload_size + sizeof(comm_header_t);
-  swab_header(ch);
   if(sendto(sfd, buffer, sendlen, 0,
 	    (struct sockaddr *)&addr, (socklen_t)len) < 0){
     log_sys_err("Sendto failed");
     error = -errno;
   }
-  
+
  fail:
   if(buffer) free(buffer);
   if(payload) free(payload);

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

[rohara]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	rohara at sourceware.org	2007-12-11 20:56:45

Modified files:
	ccs/daemon     : cnx_mgr.c 

Log message:
	BZ 418961
	Fix issue with endian conversion that caused problems for mixed architecture
	nodes on same subnet. Need to correct swap byte ordering of comm_header_t
	structure before copying into buffer and when dereferencing.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/cnx_mgr.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.24.2.15&r2=1.24.2.16

--- cluster/ccs/daemon/cnx_mgr.c	2007/03/19 20:03:15	1.24.2.15
+++ cluster/ccs/daemon/cnx_mgr.c	2007/12/11 20:56:45	1.24.2.16
@@ -1363,18 +1363,19 @@
     ch->comm_flags |= COMM_BROADCAST_FROM_QUORATE;
   }
 
+  swab_header(ch);
   memcpy(buffer, ch, sizeof(comm_header_t));
+  swab_header(ch); /* Swab back to dip into ch for payload_size */
   memcpy(buffer+sizeof(comm_header_t), payload, ch->comm_payload_size);
 
   log_dbg("Sending cluster.conf (version %d)...\n", get_doc_version(master_doc->od_doc));
   sendlen = ch->comm_payload_size + sizeof(comm_header_t);
-  swab_header(ch);
   if(sendto(sfd, buffer, sendlen, 0,
 	    (struct sockaddr *)&addr, (socklen_t)len) < 0){
     log_sys_err("Sendto failed");
     error = -errno;
   }
-  
+
  fail:
   if(buffer) free(buffer);
   if(payload) free(payload);

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

[lhh]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	lhh at sourceware.org	2007-05-08 14:26:18

Modified files:
	ccs/daemon     : cnx_mgr.c 

Log message:
	Apply patch to fix bugzilla # 232140

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

--- cluster/ccs/daemon/cnx_mgr.c	2007/02/14 16:20:23	1.41.2.1
+++ cluster/ccs/daemon/cnx_mgr.c	2007/05/08 14:26:18	1.41.2.2
@@ -871,33 +871,41 @@
 	      (node->type == 1)? "XML_ELEMENT_NODE":
 	      (node->type == 2)? "XML_ATTRIBUTE_NODE":"");
 
-      if(!node || !node->children ||
-         !node->children->content || !strlen((char *)node->children->content)){
+      if(!node) {
 	log_dbg("No content found.\n");
 	error = -ENODATA;
 	goto fail;
       }
 
-      log_dbg("Query results:: %s\n", node->children->content);
-
       if(((node->type == XML_ATTRIBUTE_NODE) && strstr(query, "@*")) ||
 	 ((node->type == XML_ELEMENT_NODE) && strstr(query, "child::*"))){
 	/* add on the trailing NULL and the '=' separator for a list of attrs
 	   or an element node + CDATA*/
-	size = strlen((char *)node->children->content) +
-	  strlen((char *)node->name)+2;
+ 	if (node->children && node->children->content)
+ 	  size = strlen((char *)node->children->content) +
+		 strlen((char *)node->name)+2;
+ 	else 
+ 	  size = strlen((char *)node->name)+2;
 	nnv= 1;
       } else {
-	size = strlen((char *)node->children->content) + 1;
+ 	if (node->children && node->children->content) {
+ 	  size = strlen((char *)node->children->content)+1;
+	} else {
+          error = -ENODATA;
+ 	  goto fail;
+        }
       }
 
       if(size <= ch->comm_payload_size){  /* do we already have enough space? */
 	log_dbg("No extra space needed.\n");
 	if(nnv){
-	  sprintf(*payload, "%s=%s", node->name,node->children->content);
-	}else {
-	  sprintf(*payload, "%s", node->children->content);
+ 	  sprintf(*payload, "%s=%s", node->name, node->children ?
+ 					 (char *)node->children->content:"");
+	} else {
+ 	  sprintf(*payload, "%s", node->children ? node->children->content :
+ 				  node->name);
 	}
+
       } else {
 	log_dbg("Extra space needed.\n");
 	free(*payload);
@@ -907,11 +915,14 @@
 	  goto fail;
 	}
 	if(nnv){
-	  sprintf(*payload, "%s=%s", node->name, node->children->content);
-	}else {
-	  sprintf(*payload, "%s", node->children->content);
+ 	  sprintf(*payload, "%s=%s", node->name, node->children ?
+ 					 (char *)node->children->content:"");
+	} else {
+ 	  sprintf(*payload, "%s", node->children ? node->children->content :
+ 				  node->name);
 	}
       }
+      log_dbg("Query results:: %s\n", *payload);
       ch->comm_payload_size = size;
     } else {
       log_dbg("No nodes found.\n");
@@ -1081,7 +1092,7 @@
     goto fail;
   }
 
-  if(ch->comm_desc < 0 || ch->comm_desc >= MAX_OPEN_CONNECTIONS){
+  if(ch->comm_desc < 0){
     log_err("Invalid descriptor specified (%d).\n", ch->comm_desc);
     log_err("Someone may be attempting something evil.\n");
     error = -EBADR;

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

[lhh]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	lhh at sourceware.org	2007-05-08 14:25:42

Modified files:
	ccs/daemon     : cnx_mgr.c 

Log message:
	Apply patch to fix bugzilla # 232140

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/cnx_mgr.c.diff?cvsroot=cluster&r1=1.42&r2=1.43

--- cluster/ccs/daemon/cnx_mgr.c	2007/02/14 16:22:17	1.42
+++ cluster/ccs/daemon/cnx_mgr.c	2007/05/08 14:25:41	1.43
@@ -871,33 +871,41 @@
 	      (node->type == 1)? "XML_ELEMENT_NODE":
 	      (node->type == 2)? "XML_ATTRIBUTE_NODE":"");
 
-      if(!node || !node->children ||
-         !node->children->content || !strlen((char *)node->children->content)){
+      if(!node) {
 	log_dbg("No content found.\n");
 	error = -ENODATA;
 	goto fail;
       }
 
-      log_dbg("Query results:: %s\n", node->children->content);
-
       if(((node->type == XML_ATTRIBUTE_NODE) && strstr(query, "@*")) ||
 	 ((node->type == XML_ELEMENT_NODE) && strstr(query, "child::*"))){
 	/* add on the trailing NULL and the '=' separator for a list of attrs
 	   or an element node + CDATA*/
-	size = strlen((char *)node->children->content) +
-	  strlen((char *)node->name)+2;
+ 	if (node->children && node->children->content)
+ 	  size = strlen((char *)node->children->content) +
+		 strlen((char *)node->name)+2;
+ 	else 
+ 	  size = strlen((char *)node->name)+2;
 	nnv= 1;
       } else {
-	size = strlen((char *)node->children->content) + 1;
+ 	if (node->children && node->children->content) {
+ 	  size = strlen((char *)node->children->content)+1;
+	} else {
+          error = -ENODATA;
+ 	  goto fail;
+        }
       }
 
       if(size <= ch->comm_payload_size){  /* do we already have enough space? */
 	log_dbg("No extra space needed.\n");
 	if(nnv){
-	  sprintf(*payload, "%s=%s", node->name,node->children->content);
-	}else {
-	  sprintf(*payload, "%s", node->children->content);
+ 	  sprintf(*payload, "%s=%s", node->name, node->children ?
+ 					 (char *)node->children->content:"");
+	} else {
+ 	  sprintf(*payload, "%s", node->children ? node->children->content :
+ 				  node->name);
 	}
+
       } else {
 	log_dbg("Extra space needed.\n");
 	free(*payload);
@@ -907,11 +915,14 @@
 	  goto fail;
 	}
 	if(nnv){
-	  sprintf(*payload, "%s=%s", node->name, node->children->content);
-	}else {
-	  sprintf(*payload, "%s", node->children->content);
+ 	  sprintf(*payload, "%s=%s", node->name, node->children ?
+ 					 (char *)node->children->content:"");
+	} else {
+ 	  sprintf(*payload, "%s", node->children ? node->children->content :
+ 				  node->name);
 	}
       }
+      log_dbg("Query results:: %s\n", *payload);
       ch->comm_payload_size = size;
     } else {
       log_dbg("No nodes found.\n");
@@ -1081,7 +1092,7 @@
     goto fail;
   }
 
-  if(ch->comm_desc < 0 || ch->comm_desc >= MAX_OPEN_CONNECTIONS){
+  if(ch->comm_desc < 0){
     log_err("Invalid descriptor specified (%d).\n", ch->comm_desc);
     log_err("Someone may be attempting something evil.\n");
     error = -EBADR;

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

[lhh]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	lhh at sourceware.org	2007-03-19 20:03:16

Modified files:
	ccs/daemon     : cnx_mgr.c 

Log message:
	Fix #232139

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/cnx_mgr.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.24.2.14&r2=1.24.2.15

--- cluster/ccs/daemon/cnx_mgr.c	2007/02/13 20:54:56	1.24.2.14
+++ cluster/ccs/daemon/cnx_mgr.c	2007/03/19 20:03:15	1.24.2.15
@@ -870,32 +870,40 @@
 	      (node->type == 1)? "XML_ELEMENT_NODE":
 	      (node->type == 2)? "XML_ATTRIBUTE_NODE":"");
 
-      if(!node || !node->children ||
-         !node->children->content || !strlen(node->children->content)){
+      if(!node) {
 	log_dbg("No content found.\n");
 	error = -ENODATA;
 	goto fail;
       }
 
-      log_dbg("Query results:: %s\n", node->children->content);
-
       if(((node->type == XML_ATTRIBUTE_NODE) && strstr(query, "@*")) ||
 	 ((node->type == XML_ELEMENT_NODE) && strstr(query, "child::*"))){
 	/* add on the trailing NULL and the '=' separator for a list of attrs
 	   or an element node + CDATA*/
-	size = strlen(node->children->content)+strlen(node->name)+2;
+	if (node->children && node->children->content)
+	  size = strlen(node->children->content)+strlen(node->name)+2;
+	else 
+	  size = strlen(node->name)+2;
 	nnv= 1;
       } else {
-	size = strlen(node->children->content)+1;
+	if (node->children && node->children->content) {
+	  size = strlen(node->children->content)+1;
+	} else {
+          error = -ENODATA;
+	  goto fail;
+        }
       }
 
       if(size <= ch->comm_payload_size){  /* do we already have enough space? */
 	log_dbg("No extra space needed.\n");
 	if(nnv){
-	  sprintf(*payload, "%s=%s", node->name,node->children->content);
-	}else {
-	  sprintf(*payload, "%s", node->children->content);
+	  sprintf(*payload, "%s=%s", node->name, node->children ?
+					 (char *)node->children->content:"");
+	} else {
+	  sprintf(*payload, "%s", node->children ? node->children->content :
+				  node->name);
 	}
+
       } else {
 	log_dbg("Extra space needed.\n");
 	free(*payload);
@@ -905,11 +913,14 @@
 	  goto fail;
 	}
 	if(nnv){
-	  sprintf(*payload, "%s=%s", node->name, node->children->content);
-	}else {
-	  sprintf(*payload, "%s", node->children->content);
+	  sprintf(*payload, "%s=%s", node->name, node->children ?
+					 (char *)node->children->content:"");
+	} else {
+	  sprintf(*payload, "%s", node->children ? node->children->content :
+				  node->name);
 	}
       }
+      log_dbg("Query results:: %s\n", *payload);
       ch->comm_payload_size = size;
     } else {
       log_dbg("No nodes found.\n");
@@ -1079,7 +1090,7 @@
     goto fail;
   }
 
-  if(ch->comm_desc < 0 || ch->comm_desc >= MAX_OPEN_CONNECTIONS){
+  if(ch->comm_desc < 0){
     log_err("Invalid descriptor specified (%d).\n", ch->comm_desc);
     log_err("Someone may be attempting something evil.\n");
     error = -EBADR;

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

[rohara]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	STABLE
Changes by:	rohara at sourceware.org	2007-02-14 16:23:47

Modified files:
	ccs/daemon     : cnx_mgr.c 

Log message:
	Ignore EPIPE error when sending response. This can happen is, for example,
	rgmanager makes a request, ccs receives/processes the request, but rgmanager
	dies before ccs can send the response. Also added retry if we catch EINTR
	during write.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/cnx_mgr.c.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.24.2.6.4.3.2.4&r2=1.24.2.6.4.3.2.5

--- cluster/ccs/daemon/cnx_mgr.c	2006/06/15 21:39:31	1.24.2.6.4.3.2.4
+++ cluster/ccs/daemon/cnx_mgr.c	2007/02/14 16:23:47	1.24.2.6.4.3.2.5
@@ -1233,9 +1233,13 @@
  fail:
   error = write(afd, ch, sizeof(comm_header_t)+ch->comm_payload_size);
   if(error < 0){
-    if (errno == EINTR)
+  if (errno == EINTR)
       goto fail;
-    log_sys_err("Unable to write package back to sender");
+    if (errno == EPIPE) {
+      error = 0;
+    } else {
+      log_sys_err("Unable to write package back to sender");
+    }
   } else if(error < (sizeof(comm_header_t)+ch->comm_payload_size)){
     log_err("Unable to write complete package.\n");
     error = -EBADE;
@@ -1246,7 +1250,6 @@
 
   if(ch){ free(ch); }
   if(payload){ free(payload); }
-  
 
   EXIT("process_request");
   return error;

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

[rohara]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	rohara at sourceware.org	2007-02-14 16:22:17

Modified files:
	ccs/daemon     : cnx_mgr.c 

Log message:
	Ignore EPIPE error when sending response. This can happen is, for example,
	rgmanager makes a request, ccs receives/processes the request, but rgmanager
	dies before ccs can send the response. Also added retry if we catch EINTR
	during write.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/cnx_mgr.c.diff?cvsroot=cluster&r1=1.41&r2=1.42

--- cluster/ccs/daemon/cnx_mgr.c	2006/05/24 08:53:21	1.41
+++ cluster/ccs/daemon/cnx_mgr.c	2007/02/14 16:22:17	1.42
@@ -1235,9 +1235,13 @@
  fail:
   error = write(afd, ch, sizeof(comm_header_t)+ch->comm_payload_size);
   if(error < 0){
-    log_sys_err("Unable to write package back to sender");
-    return error; 
-    goto fail;
+    if (errno == EINTR)
+      goto fail;
+    if (errno == EPIPE) {
+      error = 0;
+    } else {
+      log_sys_err("Unable to write package back to sender");
+    }
   } else if(error < (sizeof(comm_header_t)+ch->comm_payload_size)){
     log_err("Unable to write complete package.\n");
     error = -EBADE;
@@ -1248,7 +1252,6 @@
 
   if(ch){ free(ch); }
   if(payload){ free(payload); }
-  
 
   EXIT("process_request");
   return error;

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

[rohara]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	rohara at sourceware.org	2007-02-13 20:54:56

Modified files:
	ccs/daemon     : cnx_mgr.c 

Log message:
	Ignore EPIPE error when sending response. This can happen is, for example,
	rgmanager makes a request, ccs receives/processes the request, but rgmanager
	dies before ccs can send the response.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/cnx_mgr.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.24.2.13&r2=1.24.2.14

--- cluster/ccs/daemon/cnx_mgr.c	2006/06/15 21:39:06	1.24.2.13
+++ cluster/ccs/daemon/cnx_mgr.c	2007/02/13 20:54:56	1.24.2.14
@@ -1232,10 +1232,14 @@
 
  fail:
   error = write(afd, ch, sizeof(comm_header_t)+ch->comm_payload_size);
-  if(error < 0){
+  if(error < 0) {
     if (errno == EINTR)
       goto fail;
-    log_sys_err("Unable to write package back to sender");
+    if (errno == EPIPE) {
+      error = 0;
+    } else {
+      log_sys_err("Unable to write package back to sender");
+    }
   } else if(error < (sizeof(comm_header_t)+ch->comm_payload_size)){
     log_err("Unable to write complete package.\n");
     error = -EBADE;
@@ -1246,7 +1250,6 @@
 
   if(ch){ free(ch); }
   if(payload){ free(payload); }
-  
 
   EXIT("process_request");
   return error;

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

[lhh]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	STABLE
Changes by:	lhh at sourceware.org	2006-06-15 21:39:31

Modified files:
	ccs/daemon     : cnx_mgr.c 

Log message:
	Fix inifinite loop causing hangs in other daemons (#194361)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/cnx_mgr.c.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.24.2.6.4.3.2.3&r2=1.24.2.6.4.3.2.4

--- cluster/ccs/daemon/cnx_mgr.c	2006/01/12 18:10:58	1.24.2.6.4.3.2.3
+++ cluster/ccs/daemon/cnx_mgr.c	2006/06/15 21:39:31	1.24.2.6.4.3.2.4
@@ -1233,8 +1233,9 @@
  fail:
   error = write(afd, ch, sizeof(comm_header_t)+ch->comm_payload_size);
   if(error < 0){
+    if (errno == EINTR)
+      goto fail;
     log_sys_err("Unable to write package back to sender");
-    goto fail;
   } else if(error < (sizeof(comm_header_t)+ch->comm_payload_size)){
     log_err("Unable to write complete package.\n");
     error = -EBADE;

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

[lhh]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	lhh at sourceware.org	2006-06-15 21:39:06

Modified files:
	ccs/daemon     : cnx_mgr.c 

Log message:
	Fix inifinite loop causing hangs in other daemons (#194361)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/cnx_mgr.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.24.2.12&r2=1.24.2.13

--- cluster/ccs/daemon/cnx_mgr.c	2006/01/12 18:11:26	1.24.2.12
+++ cluster/ccs/daemon/cnx_mgr.c	2006/06/15 21:39:06	1.24.2.13
@@ -1233,8 +1233,9 @@
  fail:
   error = write(afd, ch, sizeof(comm_header_t)+ch->comm_payload_size);
   if(error < 0){
+    if (errno == EINTR)
+      goto fail;
     log_sys_err("Unable to write package back to sender");
-    goto fail;
   } else if(error < (sizeof(comm_header_t)+ch->comm_payload_size)){
     log_err("Unable to write complete package.\n");
     error = -EBADE;