From 73f4f04f8e46ecf8267ad6682d97120a3a890a83 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Mon, 30 Jan 2017 16:56:55 +0100 Subject: [PATCH 1/2] fix binary name --- arangod/dbg.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arangod/dbg.cmake b/arangod/dbg.cmake index 548ae6ac7e..d81497f0b0 100644 --- a/arangod/dbg.cmake +++ b/arangod/dbg.cmake @@ -5,7 +5,7 @@ set(STRIP_DIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_X}/strip") execute_process(COMMAND mkdir -p ${STRIP_DIR}) -set(FILE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_X}/${BIN_ARANGOBENCH}${CMAKE_EXECUTABLE_SUFFIX}) +set(FILE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_X}/${BIN_ARANGOD}${CMAKE_EXECUTABLE_SUFFIX}) set(STRIP_FILE ${STRIP_DIR}/${BIN_ARANGOD}${CMAKE_EXECUTABLE_SUFFIX}) if (NOT MSVC AND CMAKE_STRIP) execute_process(COMMAND "rm" -f ${STRIP_FILE}) From 2db0212e4f34e3840101bcef37c80c7bdebc8914 Mon Sep 17 00:00:00 2001 From: Kaveh Vahedipour Date: Mon, 30 Jan 2017 17:02:27 +0100 Subject: [PATCH 2/2] supervision tests fail under load --- js/client/modules/@arangodb/testing.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/client/modules/@arangodb/testing.js b/js/client/modules/@arangodb/testing.js index 6af73d1b06..2d87d7c4e1 100644 --- a/js/client/modules/@arangodb/testing.js +++ b/js/client/modules/@arangodb/testing.js @@ -1490,8 +1490,8 @@ function startInstanceAgency (instanceInfo, protocol, options, addArgs, rootDir) usedPorts.push(port); instanceArgs['server.endpoint'] = protocol + '://127.0.0.1:' + port; instanceArgs['agency.my-address'] = protocol + '://127.0.0.1:' + port; - instanceArgs['agency.supervision-grace-period'] = '5.0'; - instanceArgs['agency.supervision-frequency'] = '0.05'; + instanceArgs['agency.supervision-grace-period'] = '10.0'; + instanceArgs['agency.supervision-frequency'] = '1.0'; if (i === N - 1) { let l = [];