Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Simon Grätzer 2017-03-20 12:41:32 +01:00
parent 7bc01b46e0 c51f27c201
commit 1ab8c44330
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -27,6 +27,9 @@ devel
that many number of V8 contexts to be created at startup and kept around even that many number of V8 contexts to be created at startup and kept around even
when unused. 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 * improved diagnostic messages written to logfiles by supervisor process
* fixed issue #2367 * fixed issue #2367

4
arangod/V8Server/V8DealerFeature.cpp
View File

@ -566,7 +566,7 @@ V8Context* V8DealerFeature::enterContext(TRI_vocbase_t* vocbase,
TimedAction exitWhenNoContext([](double waitTime) { TimedAction exitWhenNoContext([](double waitTime) {
LOG_TOPIC(WARN, arangodb::Logger::V8) << "giving up waiting for unused V8 context after " << Logger::FIXED(waitTime) << " s"; LOG_TOPIC(WARN, arangodb::Logger::V8) << "giving up waiting for unused V8 context after " << Logger::FIXED(waitTime) << " s";
}, 60); }, 120);
V8Context* context = nullptr; V8Context* context = nullptr;
@ -693,7 +693,7 @@ V8Context* V8DealerFeature::enterContext(TRI_vocbase_t* vocbase,
JobGuard jobGuard(SchedulerFeature::SCHEDULER); JobGuard jobGuard(SchedulerFeature::SCHEDULER);
jobGuard.block(); jobGuard.block();
guard.wait(); guard.wait(100000);
} }
if (exitWhenNoContext.tick()) { if (exitWhenNoContext.tick()) {

2
cmake/ArangoDBInstall.cmake
View File

@ -173,7 +173,7 @@ if (UNIX)
else () else ()
configure_file ( configure_file (
${ARANGODB_SOURCE_DIR}/Installation/logrotate.d/arangod.sysv ${ARANGODB_SOURCE_DIR}/Installation/logrotate.d/arangod.sysv
${PROJECT_BINARY_DIR}${SYSTEMD_UNIT_DIR}/arangod.systemd ${PROJECT_BINARY_DIR}/arangod.sysv
NEWLINE_STYLE UNIX) NEWLINE_STYLE UNIX)
endif() endif()
endif() endif()

4
cmake/packages/deb.cmake
View File

@ -76,10 +76,10 @@ install(
# deploy the logrotate config: # deploy the logrotate config:
install( 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 PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/logrotate.d DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/logrotate.d
RENAME arangodb3 RENAME ${SERVICE_NAME}
COMPONENT debian-extras COMPONENT debian-extras
) )

4
cmake/packages/rpm.cmake
View File

@ -38,9 +38,9 @@ install(
if (NOT SYSTEMD_FOUND) if (NOT SYSTEMD_FOUND)
# deploy the logrotate config: # deploy the logrotate config:
install( 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 PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
DESTINATION ${SYSTEMD_UNIT_DIR}/ DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/logrotate.d
RENAME ${SERVICE_NAME}) RENAME ${SERVICE_NAME})
else() else()
message("SYSTEMD_FOUND ${SYSTEMD_FOUND}") message("SYSTEMD_FOUND ${SYSTEMD_FOUND}")