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

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

[teigland]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	STABLE
Changes by:	teigland at sourceware.org	2006-08-16 14:49:56

Modified files:
	ccs/daemon     : ccsd.c 

Log message:
	(sync from RHEL4 branch)
	don't grab random config from network, require initial cluster.conf file

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

--- cluster/ccs/daemon/ccsd.c	2006/01/11 16:03:10	1.14.2.4.6.2
+++ cluster/ccs/daemon/ccsd.c	2006/08/16 14:49:56	1.14.2.4.6.3
@@ -509,16 +509,28 @@
   if(!stat(config_file_location, &stat_buf)){
     doc = xmlParseFile(config_file_location);
     if(!doc){
-      log_err("\nUnable to parse %s.\n"
-	      "You should either:\n"
-	      " 1. Correct the XML mistakes, or\n"
-	      " 2. (Re)move the file and attempt to grab a "
-	      "valid copy from the network.\n", config_file_location);
+      log_err("\nUnable to parse %s.\n", config_file_location);
       return -1;
     }
     xmlFreeDoc(doc);
   } else {
-    /* no cluster.conf file.  This is fine, just need to get it from the network */
+    /*
+     * no cluster.conf file.
+     * We used to simply return 0 here and let go fetch a random
+     * conf file from the network.  This worked well in environments
+     * that had only one cluster in broadcast range, but it has
+     * caused to much confusion when there is more than one cluster.
+     * Additionally, our docs and manuals tell users to copy the
+     * file to each node anyway.
+     *
+     * In the event that there is a cluster.conf file, ccs will
+     * still ensure that it has the most up-to-date copy of the
+     * file in relation to the other nodes in the quorate cluster.
+     */
+    log_err("%s: file not found.\n"
+	    "Please ensure an initial copy of this file is present on all cluster nodes.\n",
+	    config_file_location);
+    return -1;
   }
 
   return 0;

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

[rohara]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	rohara at sourceware.org	2006-08-30 17:35:41

Modified files:
	ccs/daemon     : ccsd.c 

Log message:
	Remove error handling for missing magma plugins.

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

--- cluster/ccs/daemon/ccsd.c	2006/05/16 10:27:54	1.24
+++ cluster/ccs/daemon/ccsd.c	2006/08/30 17:35:40	1.25
@@ -728,10 +728,6 @@
 	exit(EXIT_SUCCESS);
 
       switch(WEXITSTATUS(status)){
-      case EXIT_MAGMA_PLUGINS:
-	fprintf(stderr, "Failed to connect to cluster manager.\n"
-		"Hint: Magma plugins are not in the right spot.\n");
-	break;
       case EXIT_CLUSTER_FAIL:
 	fprintf(stderr, "Failed to connect to cluster manager.\n");
 	break;

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

[rohara]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	rohara at sourceware.org	2006-08-31 17:49:16

Modified files:
	ccs/daemon     : ccsd.c 

Log message:
	Moved code which signals parent (SIGTERM), which allows the parent process
	to continue and exit. This signal was occuring before ccsd had the sockets
	ready for communication, and as a result the cman init script would sometimes
	fail because the ccsd would daemonize before the socket was ready.
	
	This fix will not signal the parent until ccsd is ready (socket is created
	and ready; before select() loop).

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

--- cluster/ccs/daemon/ccsd.c	2006/08/30 17:35:40	1.25
+++ cluster/ccs/daemon/ccsd.c	2006/08/31 17:49:16	1.26
@@ -181,6 +181,9 @@
   if (sfds[2] >= 0) 
     FD_SET(sfds[2], &rset);
 
+  log_dbg("Sending SIGTERM to parent\n");
+  kill(getppid(), SIGTERM);
+
   while(1){
     unsigned int len = addr_size;
 
@@ -755,7 +758,7 @@
     }
 
     /* Make the parent stop waiting */
-    kill(getppid(), SIGTERM);
+    /* kill(getppid(), SIGTERM); */
   }
 
   signal(SIGINT, &sig_handler);

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	rmccabe at sourceware.org	2007-08-30 21:31:42

Modified files:
	ccs/daemon     : ccsd.c 

Log message:
	listen() is not supported on SOCK_DGRAM

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/ccsd.c.diff?cvsroot=cluster&r1=1.28&r2=1.29

--- cluster/ccs/daemon/ccsd.c	2007/08/22 08:58:36	1.28
+++ cluster/ccs/daemon/ccsd.c	2007/08/30 21:31:41	1.29
@@ -170,8 +170,6 @@
     }
   }
  
-  listen(sfds[1], 5);
-
   /* Set up the unix (local) socket for CCS lib comms */
   sfds[2] = setup_local_socket(SOMAXCONN);