From dac84c91ccffc19db29df0c1c725dcf231ac4c40 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <willi@arangodb.com>
Date: Mon, 20 Mar 2017 12:17:24 +0100
Subject: [PATCH 1/3] fix installation of logrotate file

---
 cmake/ArangoDBInstall.cmake | 2 +-
 cmake/packages/deb.cmake    | 4 ++--
 cmake/packages/rpm.cmake    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmake/ArangoDBInstall.cmake b/cmake/ArangoDBInstall.cmake
index dacb9dba9a..423fa1ba23 100644
--- a/cmake/ArangoDBInstall.cmake
+++ b/cmake/ArangoDBInstall.cmake
@@ -173,7 +173,7 @@ if (UNIX)
   else ()
     configure_file (
       ${ARANGODB_SOURCE_DIR}/Installation/logrotate.d/arangod.sysv
-      ${PROJECT_BINARY_DIR}${SYSTEMD_UNIT_DIR}/arangod.systemd
+      ${PROJECT_BINARY_DIR}/arangod.sysv
       NEWLINE_STYLE UNIX)
   endif()
 endif()
diff --git a/cmake/packages/deb.cmake b/cmake/packages/deb.cmake
index ceadf3238c..06fcdc6268 100644
--- a/cmake/packages/deb.cmake
+++ b/cmake/packages/deb.cmake
@@ -76,10 +76,10 @@ install(
 
 # deploy the logrotate config:
 install(
-  FILES ${PROJECT_SOURCE_DIR}/Installation/logrotate.d/arangod.sysv
+  FILES ${PROJECT_BINARY_DIR}/arangod.sysv
   PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
   DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/logrotate.d
-  RENAME arangodb3
+  RENAME ${SERVICE_NAME}
   COMPONENT debian-extras
   )
 
diff --git a/cmake/packages/rpm.cmake b/cmake/packages/rpm.cmake
index 0c4419b00c..da4ef17d73 100644
--- a/cmake/packages/rpm.cmake
+++ b/cmake/packages/rpm.cmake
@@ -38,9 +38,9 @@ install(
 if (NOT SYSTEMD_FOUND)
   # deploy the logrotate config:
   install(
-    FILES ${PROJECT_BINARY_DIR}${SYSTEMD_UNIT_DIR}/arangod.systemd
+    FILES ${PROJECT_BINARY_DIR}/arangod.sysv
     PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
-    DESTINATION ${SYSTEMD_UNIT_DIR}/
+    DESTINATION etc/logrotate.d/
     RENAME ${SERVICE_NAME})
 else()
   message("SYSTEMD_FOUND ${SYSTEMD_FOUND}")

From 06ab11004a20a9b6f7113b0be722c2a65ccf8ecd Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <willi@arangodb.com>
Date: Mon, 20 Mar 2017 12:26:43 +0100
Subject: [PATCH 2/3] fix install directory

---
 cmake/packages/rpm.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/packages/rpm.cmake b/cmake/packages/rpm.cmake
index da4ef17d73..941df5e442 100644
--- a/cmake/packages/rpm.cmake
+++ b/cmake/packages/rpm.cmake
@@ -40,7 +40,7 @@ if (NOT SYSTEMD_FOUND)
   install(
     FILES ${PROJECT_BINARY_DIR}/arangod.sysv
     PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
-    DESTINATION etc/logrotate.d/
+    DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/logrotate.d
     RENAME ${SERVICE_NAME})
 else()
   message("SYSTEMD_FOUND ${SYSTEMD_FOUND}")

From c51f27c2016afab7e78ba5673490adbbd89f78ed Mon Sep 17 00:00:00 2001
From: jsteemann <jan@arangodb.com>
Date: Mon, 20 Mar 2017 12:38:04 +0100
Subject: [PATCH 3/3] make waiting for free V8 contexts abort after 90 seconds

---
 CHANGELOG                            | 3 +++
 arangod/V8Server/V8DealerFeature.cpp | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 4179a52da6..9ba5d3cd1d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -27,6 +27,9 @@ devel
   that many number of V8 contexts to be created at startup and kept around even
   when unused.
 
+  Waiting for an unused V8 context will now also abort if no V8 context can be 
+  acquired/created after 90 seconds.
+
 * improved diagnostic messages written to logfiles by supervisor process
 
 * fixed issue #2367
diff --git a/arangod/V8Server/V8DealerFeature.cpp b/arangod/V8Server/V8DealerFeature.cpp
index 4eacb95a9d..e213f73aab 100644
--- a/arangod/V8Server/V8DealerFeature.cpp
+++ b/arangod/V8Server/V8DealerFeature.cpp
@@ -566,7 +566,7 @@ V8Context* V8DealerFeature::enterContext(TRI_vocbase_t* vocbase,
 
   TimedAction exitWhenNoContext([](double waitTime) {
     LOG_TOPIC(WARN, arangodb::Logger::V8) << "giving up waiting for unused V8 context after " << Logger::FIXED(waitTime) << " s";
-  }, 60);
+  }, 120);
 
 
   V8Context* context = nullptr;
@@ -693,7 +693,7 @@ V8Context* V8DealerFeature::enterContext(TRI_vocbase_t* vocbase,
         JobGuard jobGuard(SchedulerFeature::SCHEDULER);
         jobGuard.block();
         
-        guard.wait();
+        guard.wait(100000);
       }
 
       if (exitWhenNoContext.tick()) {