HPCC-30638 Delete the aeron code from the source tree

Not ever going to be used

Signed-off-by: Richard Chapman <[email protected]>

.gitmodules

@@ -10,9 +10,6 @@
 [submodule "esp/services/ws_sql/libantlr3c"]
 	path = esp/services/ws_sql/libantlr3c
 	url = https://github.com/hpcc-systems/libantlr3c.git
-[submodule "system/aeron"]
-	path = system/aeron
-	url = https://github.com/hpcc-systems/aeron.git
 [submodule "vcpkg"]
 	path = vcpkg
 	url = https://github.com/hpcc-systems/vcpkg.git

cmake_modules/commonSetup.cmake

@@ -136,11 +136,6 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
   endif()
 
   # The following options need to be set after the project() command
-  if (WIN32)
-      option(USE_AERON "Include the Aeron message protocol" OFF)
-  else()
-      option(USE_AERON "Include the Aeron message protocol" ON)
-  endif()
   if (APPLE OR WIN32)
     option(USE_NUMA "Configure use of numa" OFF)
   else()
@@ -748,10 +743,6 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
         SET(CPPUNIT_LIBRARIES "")
       ENDIF(USE_CPPUNIT)
 
-      IF (USE_AERON)
-         add_definitions (-D_USE_AERON)
-      ENDIF(USE_AERON)
-
       IF (CONTAINERIZED)
          add_definitions (-D_CONTAINERIZED)
       ENDIF(CONTAINERIZED)

initfiles/componentfiles/configschema/xsd/roxie.xsd

@@ -338,9 +338,6 @@
                     <xs:attribute name="udpStatsReportInterval" type="xs:nonNegativeInteger"
                                   hpcc:displayName="UDP transport layer stats reporting interval" hpcc:presetValue="60000"
                                   hpcc:tooltip="UDP transport layer send queue size"/>
-                    <xs:attribute name="useAeron" type="xs:boolean" hpcc:displayName="Use Aeron"
-                                  hpcc:presetValue="false"
-                                  hpcc:tooltip="Use Aeron for slave->server communication"/>
                 </xs:attributeGroup>
 
                 <xs:attributeGroup name="cache" hpcc:groupByName="Cache">

roxie/ccd/ccd.hpp

@@ -313,7 +313,6 @@ extern bool debugPermitted;
 extern bool useRemoteResources;
 extern bool checkFileDate;
 extern bool lazyOpen;
-extern bool useAeron;
 extern bool ignoreOrphans;
 extern bool doIbytiDelay;
 extern bool copyResources;

roxie/ccd/ccdmain.cpp

@@ -127,7 +127,6 @@ bool checkFileDate;
 bool lazyOpen;
 bool localAgent = false;
 bool encryptInTransit;
-bool useAeron;
 bool ignoreOrphans;
 bool doIbytiDelay = true; 
 bool copyResources;
@@ -1008,7 +1007,6 @@ int CCD_API roxie_main(int argc, const char *argv[], const char * defaultYaml)
             envInstallNASHooks(nas);
         }
 #endif
-        useAeron = topology->getPropBool("@useAeron", false);
         doIbytiDelay = topology->getPropBool("@doIbytiDelay", true);
         minIbytiDelay = topology->getPropInt("@minIbytiDelay", 2);
         initIbytiDelay = topology->getPropInt("@initIbytiDelay", 50);
@@ -1095,7 +1093,7 @@ int CCD_API roxie_main(int argc, const char *argv[], const char * defaultYaml)
         udpFlowSocketsSize = topology->getPropInt("@udpFlowSocketsSize", udpFlowSocketsSize);
         udpLocalWriteSocketSize = topology->getPropInt("@udpLocalWriteSocketSize", udpLocalWriteSocketSize);
 #if !defined(_CONTAINERIZED) && !defined(SUBCHANNELS_IN_HEADER)
-        roxieMulticastEnabled = topology->getPropBool("@roxieMulticastEnabled", true) && !useAeron;   // enable use of multicast for sending requests to agents
+        roxieMulticastEnabled = topology->getPropBool("@roxieMulticastEnabled", true);   // enable use of multicast for sending requests to agents
 #endif
 
         udpResendLostPackets = topology->getPropBool("@udpResendLostPackets", true);
@@ -1337,9 +1335,6 @@ int CCD_API roxie_main(int argc, const char *argv[], const char * defaultYaml)
 #else
         topology->addPropBool("@linuxOS", true);
 #endif
-        if (useAeron)
-            setAeronProperties(topology);
-
 #ifdef _CONTAINERIZED
         allQuerySetNames.append(roxieName);
 #else
@@ -1693,8 +1688,6 @@ int CCD_API roxie_main(int argc, const char *argv[], const char * defaultYaml)
 #ifndef _CONTAINERIZED
     perfMonHook.clear();
 #endif
-    stopAeronDriver();
-
     leakChecker = strdup("Make sure leak checking is working");
     roxiemem::releaseRoxieHeap();
     UseSysLogForOperatorMessages(false);

roxie/ccd/ccdqueue.cpp

@@ -2916,7 +2916,7 @@ class RoxieSocketQueueManager : public RoxieReceiverBase
     }
 };
 
-class RoxieUdpSocketQueueManager : public RoxieSocketQueueManager
+class RoxieUdpSocketQueueManager : public RoxieSocketQueueManager // MORE COMBINE
 {
 public:
     RoxieUdpSocketQueueManager(unsigned _numWorkers, bool encryptionInTransit) : RoxieSocketQueueManager(_numWorkers)
@@ -2947,25 +2947,6 @@ class RoxieUdpSocketQueueManager : public RoxieSocketQueueManager
 
 };
 
-class RoxieAeronSocketQueueManager : public RoxieSocketQueueManager
-{
-public:
-    RoxieAeronSocketQueueManager(unsigned _numWorkers, bool encryptionInTransit) : RoxieSocketQueueManager(_numWorkers)
-    {
-        unsigned dataPort = topology->getPropInt("@dataPort", CCD_DATA_PORT);
-        SocketEndpoint ep(dataPort, myNode.getIpAddress());
-        receiveManager.setown(createAeronReceiveManager(ep, encryptionInTransit));
-        assertex(!myNode.getIpAddress().isNull());
-        sendManager.setown(createAeronSendManager(dataPort, fastLaneQueue ? 3 : 2, myNode.getIpAddress(), encryptionInTransit));
-    }
-
-    virtual void abortPendingData(const SocketEndpoint &ep) override
-    {
-    }
-
-};
-
-
 #ifdef _MSC_VER
 #pragma warning( pop )
 #endif
@@ -3768,8 +3749,6 @@ extern IRoxieOutputQueueManager *createOutputQueueManager(unsigned numWorkers, b
 {
     if (localAgent)
         return new RoxieLocalQueueManager(numWorkers);
-    else if (useAeron)
-        return new RoxieAeronSocketQueueManager(numWorkers, encrypted);
     else
         return new RoxieUdpSocketQueueManager(numWorkers, encrypted);
 

roxie/roxie/roxie.hpp

@@ -88,14 +88,6 @@
 #define ROXIE_LAYOUT_MISMATCH       ROXIE_ERROR_START+66
 #define ROXIE_TLS_ERROR             ROXIE_ERROR_START+67
 
-// Aeron layer errors
-
-#define ROXIE_AERON_ERROR           ROXIE_ERROR_START+70
-#define ROXIE_PUBLICATION_CLOSED    ROXIE_ERROR_START+71
-#define ROXIE_PUBLICATION_NOT_CONNECTED  ROXIE_ERROR_START+72
-
-
-
 
 // MORE: move back to ccd.hpp when no longer public (used by roxieconfig)
 #define ROXIE_SLA_LOGIC