Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

Installation/Ubuntu/snapcraft.yaml.in

@@ -24,7 +24,7 @@ parts:
 
 apps:
   arangod:
-    command: arangod  \
+    command: env GLIBCXX_FORCE_NEW=1 arangod  \
       --configuration=none \
       --server.endpoint=tcp://0.0.0.0:@SNAP_PORT@ \
       --javascript.startup-directory=${SNAP}/@CMAKE_INSTALL_DATAROOTDIR_ARANGO@/js \

arangod/Agency/Constituent.cpp

@@ -144,7 +144,7 @@ void Constituent::termNoLock(term_t t) {
         result = trx.insert("election", body.slice(), options);
       } catch (std::exception const& e) {
         LOG_TOPIC(FATAL, Logger::AGENCY)
-          << "Failed to persist RAFT election ballot. Bailing out."
+          << "Failed to persist RAFT election ballot: " << e.what() << ". Bailing out."
           << __FILE__ << ":" << __LINE__;
         FATAL_ERROR_EXIT();
       }

arangod/Agency/State.cpp

@@ -204,7 +204,7 @@ index_t State::logNonBlocking(
 
   try {
     _log.push_back(log_t(idx, term, buf, clientId));  // log to RAM or die
-  } catch (std::bad_alloc const& e) {                 
+  } catch (std::bad_alloc const&) {
     if (leading) {
       LOG_TOPIC(FATAL, Logger::AGENCY)
         << "RAFT leader fails to allocate volatile log entries!"

arangod/RocksDBEngine/RocksDBGeoIndexImpl.cpp

@@ -27,6 +27,7 @@
 #include <cmath>
 #include <cstddef>
 #include <iostream>
+#include <limits>
 
 #include "RocksDBEngine/RocksDBGeoIndexImpl.h"
 #include "RocksDBEngine/RocksDBMethods.h"
@@ -1670,11 +1671,11 @@ int GeoIndex_insert(GeoIdx* gi, GeoCoordinate* c) {
       gsl[j] = GeoMkHilbert(&Xslot);
     }
     for (i = 0; i < (GeoIndexPOTSIZE / 2); i++) {
-      int jj1=100;
+      int jj1=std::numeric_limits<int>::max();
       mid=0x1FFFFFFFFFFFFFll;
       for(j=0;j<GeoIndexPOTSIZE;j++)
       {
-        
+        // some value has to be less than mid or we will end up in the assert
         if(gsl[j]==0xfffffffffffffffful) continue;
         if(gsl[j]<mid)
         {
@@ -1682,6 +1683,7 @@ int GeoIndex_insert(GeoIdx* gi, GeoCoordinate* c) {
           mid=gsl[j];
         }
       }
+      TRI_ASSERT(jj1 != std::numeric_limits<int>::max()); // jj1 -- must have been set
       gsl[jj1]=0xfffffffffffffffful;
     }
     for (i = 0; i < GeoIndexPOTSIZE; i++) {

js/client/tests/agency/agency-test.js

@@ -941,7 +941,7 @@ function agencyTestSuite () {
       require("console").warn("Provoking second log compaction for now with", 
         count3, "keys, from log entry", cur + count + count2, "on.");
       doCountTransactions(count3, count + count2);
-    },
+    }/*,
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief Huge transaction package
@@ -954,7 +954,7 @@ function agencyTestSuite () {
       }
       writeAndCheck(huge);
       assertEqual(readAndCheck([["a"]]), [{"a":20000}]);
-    }
+    }*/
 
   };
 }

lib/Basics/tri-zip.cpp

@@ -387,6 +387,7 @@ int TRI_Adler32(char const* filename, uint32_t& checksum) {
   struct TRI_STAT statbuf;
   int res = TRI_FSTAT(fd, &statbuf);
   if (res < 0) {
+    TRI_ERRORBUF;
     TRI_SYSTEM_ERROR();
     return TRI_set_errno(TRI_ERROR_SYS_ERROR);
   }

lib/SimpleHttpClient/Communicator.cpp

@@ -175,6 +175,7 @@ Ticket Communicator::addRequest(Destination destination,
         NewRequest{destination, std::move(request), callbacks, options, id});
   }
 
+  LOG_TOPIC(TRACE, Logger::COMMUNICATION) << "request to " << destination.url() << " has been put onto queue";
   // mop: just send \0 terminated empty string to wake up worker thread
 #ifdef _WIN32
   ssize_t numBytes = send(_socks[1], "", 1, 0);