Merge pull request #1826 from richardkchapman/syncCluster

gh-1595 Remove unused configuration option syncCluster

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>

initfiles/componentfiles/configxml/roxie.xsd.in

@@ -427,13 +427,6 @@
         </xs:appinfo>
       </xs:annotation>
     </xs:attribute>
-    <xs:attribute name="checkState" type="xs:boolean" use="optional" default="false">
-      <xs:annotation>
-        <xs:appinfo>
-          <tooltip>Check to make sure all roxie nodes have the same "version" of the state file - works with syncCluster to actually determine if nodes will get modified</tooltip>
-        </xs:appinfo>
-      </xs:annotation>
-    </xs:attribute>
     <xs:attribute name="copyResources" type="xs:boolean" use="optional" default="true">
       <xs:annotation>
         <xs:appinfo>
@@ -729,13 +722,6 @@
         </xs:appinfo>
       </xs:annotation>
     </xs:attribute>
-    <xs:attribute name="syncCluster" type="xs:boolean" use="optional" default="false">
-      <xs:annotation>
-        <xs:appinfo>
-          <tooltip>Modify node(s) to ensure all roxie nodes have the same "version" of the state file</tooltip>
-        </xs:appinfo>
-      </xs:annotation>
-    </xs:attribute>
     <xs:attribute name="totalMemoryLimit" type="xs:nonNegativeInteger" use="optional" default="1073741824">
       <xs:annotation>
         <xs:appinfo>

initfiles/etc/DIR_NAME/environment.xml.in

@@ -936,7 +936,6 @@
                 checkFileDate="true"
                 checkingHeap="0"
                 checkPrimaries="true"
-                checkState="false"
                 checkVersion="true"
                 clusterWidth="1"
                 copyResources="false"
@@ -1037,7 +1036,6 @@
                 SSHtimeout="0"
                 SSHusername="hpcc"
                 statsExpiryTime="3600"
-                syncCluster="false"
                 systemMonitorInterval="60000"
                 totalMemoryLimit="1073741824"
                 traceLevel="1"

roxie/ccd/ccd.hpp

@@ -415,7 +415,6 @@ extern unsigned statsExpiryTime;
 extern time_t startupTime;
 extern unsigned miscDebugTraceLevel;
 extern bool fieldTranslationEnabled;
-extern bool syncCluster;  // should we sync an out of sync cluster (always send a trap)
 
 extern unsigned defaultParallelJoinPreload;
 extern unsigned defaultConcatPreload;

roxie/ccd/ccdmain.cpp

@@ -81,7 +81,6 @@ unsigned restarts = 0;
 bool heapSort = false;
 bool insertionSort = false;
 bool fieldTranslationEnabled = false;
-bool syncCluster = false;  // should we sync an out of sync cluster (always send a trap)
 bool useTreeCopy = true;
 bool mergeSlaveStatistics = true;
 XmlReaderOptions defaultXmlReadFlags = xr_ignoreWhiteSpace;
@@ -725,7 +724,6 @@ int STARTQUERY_API start_query(int argc, const char *argv[])
         useTreeCopy = topology->getPropBool("@useTreeCopy", true);
         mergeSlaveStatistics = topology->getPropBool("@mergeSlaveStatistics", true);
 
-        syncCluster = topology->getPropBool("@syncCluster", false);  // should we sync an out of sync cluster (always send a trap)
         enableKeyDiff = topology->getPropBool("@enableKeyDiff", true);
         enableForceKeyDiffCopy = topology->getPropBool("@enableForceKeyDiffCopy", false);
 

roxie/ccd/ccdserver.cpp

@@ -30401,14 +30401,9 @@ private:
             {
                 unlockChildren();
                 if (!got)
-                {
-                    if (!syncCluster)
-                        throw MakeStringException(ROXIE_CLUSTER_SYNC_ERROR, "lock failed - cluster may be out of sync");
-                    else
-                        throw MakeStringException(ROXIE_LOCK_ERROR, "lock failed");
-                }
-                if (traceLevel && !syncCluster)
-                    DBGLOG("Lock succeded but revision updated - go around again");
+                    throw MakeStringException(ROXIE_LOCK_ERROR, "lock failed");
+                if (traceLevel)
+                    DBGLOG("Lock succeeded but revision updated - go around again");
             }
             else
                 return got-1;

roxie/ccd/ccdstate.cpp

@@ -2130,11 +2130,6 @@ private:
                 else
                     badFormat();
             }
-            else if (stricmp(queryName, "control:syncCluster") == 0)
-            {
-                syncCluster = control->getPropBool("@val", false);  // should we sync an out of sync cluster (always send a trap)
-                topology->setPropBool("@syncCluster", syncCluster);
-            }
             else if (stricmp(queryName, "control:systemMonitor")==0)
             {
                 unsigned interval = control->getPropInt("@interval", 60000);

roxie/roxie/roxie.hpp

@@ -79,7 +79,7 @@
 #define ROXIE_CALLBACK_ERROR        ROXIE_ERROR_START+54
 #define ROXIE_UDP_ERROR             ROXIE_ERROR_START+55
 #define ROXIE_LIBRARY_ERROR         ROXIE_ERROR_START+56
-#define ROXIE_CLUSTER_SYNC_ERROR    ROXIE_ERROR_START+57  // needed when syncCluster is set to false
+#define ROXIE_CLUSTER_SYNC_ERROR    ROXIE_ERROR_START+57  // No longer used
 #define ROXIE_DEBUG_ERROR           ROXIE_ERROR_START+58
 #define ROXIE_CHANNEL_SUSPENDED     ROXIE_ERROR_START+59
 #define ROXIE_UNKNOWN_SERVER        ROXIE_ERROR_START+60