From b9b79ee11bc12a552097b81f8ba31449eb4bd818 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Wed, 7 Jun 2017 13:33:41 +0200 Subject: [PATCH 1/7] Revert "revert env setting - doesn't work that way." This reverts commit a6b45982fd11810fd6b6cedcbc48a17473e197e4. --- Installation/Ubuntu/snapcraft.yaml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installation/Ubuntu/snapcraft.yaml.in b/Installation/Ubuntu/snapcraft.yaml.in index 4313f3a5d2..bc317957ad 100644 --- a/Installation/Ubuntu/snapcraft.yaml.in +++ b/Installation/Ubuntu/snapcraft.yaml.in @@ -24,7 +24,7 @@ parts: apps: arangod: - command: arangod \ + command: 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 \ From d49f1543054611e083e01a68a14354b53495c53f Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Wed, 7 Jun 2017 14:37:38 +0200 Subject: [PATCH 2/7] fix environment variable for ubuntu snap --- Installation/Ubuntu/snapcraft.yaml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installation/Ubuntu/snapcraft.yaml.in b/Installation/Ubuntu/snapcraft.yaml.in index bc317957ad..719e7a8d63 100644 --- a/Installation/Ubuntu/snapcraft.yaml.in +++ b/Installation/Ubuntu/snapcraft.yaml.in @@ -24,7 +24,7 @@ parts: apps: arangod: - command: GLIBCXX_FORCE_NEW=1 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 \ From 2f2d1bc217dfadf49cfa898baafa034f457cc62a Mon Sep 17 00:00:00 2001 From: Jan Christoph Uhde Date: Wed, 7 Jun 2017 14:45:27 +0200 Subject: [PATCH 3/7] add assert to geo index implementation --- arangod/RocksDBEngine/RocksDBGeoIndexImpl.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arangod/RocksDBEngine/RocksDBGeoIndexImpl.cpp b/arangod/RocksDBEngine/RocksDBGeoIndexImpl.cpp index 0f269300d9..a88cf54232 100644 --- a/arangod/RocksDBEngine/RocksDBGeoIndexImpl.cpp +++ b/arangod/RocksDBEngine/RocksDBGeoIndexImpl.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include "RocksDBEngine/RocksDBGeoIndexImpl.h" #include "RocksDBEngine/RocksDBMethods.h" @@ -1673,11 +1674,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::max(); mid=0x1FFFFFFFFFFFFFll; for(j=0;j::max()); // jj1 -- must have been set gsl[jj1]=0xfffffffffffffffful; } for (i = 0; i < GeoIndexPOTSIZE; i++) { From 38a75309005251af3b92c7752a2bf3427de1e884 Mon Sep 17 00:00:00 2001 From: Max Neunhoeffer Date: Wed, 7 Jun 2017 14:49:10 +0200 Subject: [PATCH 4/7] Temporarily disable huge transaction pack test. --- js/client/tests/agency/agency-test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/client/tests/agency/agency-test.js b/js/client/tests/agency/agency-test.js index 9658e9d7fa..92426964ef 100644 --- a/js/client/tests/agency/agency-test.js +++ b/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}]); - } + }*/ }; } From dbf9e61b2004d4e5e3ef747b40ccf3f7b9f30503 Mon Sep 17 00:00:00 2001 From: Andreas Streichardt Date: Wed, 7 Jun 2017 14:03:53 +0200 Subject: [PATCH 5/7] Add more debug output --- lib/SimpleHttpClient/Communicator.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/SimpleHttpClient/Communicator.cpp b/lib/SimpleHttpClient/Communicator.cpp index e2f1e04aa0..4a49d6fe65 100644 --- a/lib/SimpleHttpClient/Communicator.cpp +++ b/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); From cb5fc03b607724960c82ded25767a13c88051120 Mon Sep 17 00:00:00 2001 From: Andreas Streichardt Date: Wed, 7 Jun 2017 14:49:48 +0200 Subject: [PATCH 6/7] Fix windows build --- lib/Basics/tri-zip.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/Basics/tri-zip.cpp b/lib/Basics/tri-zip.cpp index 4390ed0138..ebce4d47bb 100644 --- a/lib/Basics/tri-zip.cpp +++ b/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); } From c89c9e44c9a787362ab5029f535c318b7f095867 Mon Sep 17 00:00:00 2001 From: Andreas Streichardt Date: Wed, 7 Jun 2017 14:50:00 +0200 Subject: [PATCH 7/7] Fix warnings --- arangod/Agency/Constituent.cpp | 2 +- arangod/Agency/State.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arangod/Agency/Constituent.cpp b/arangod/Agency/Constituent.cpp index b10f7dba65..e835273254 100644 --- a/arangod/Agency/Constituent.cpp +++ b/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(); } diff --git a/arangod/Agency/State.cpp b/arangod/Agency/State.cpp index 98cf9e7287..3709277ae6 100644 --- a/arangod/Agency/State.cpp +++ b/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!"