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

[teigland at sourceware.org]

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;