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

honor timeouts in arangob

This commit is contained in:
Jan Steemann 2013-03-12 15:07:26 +01:00
parent 3527a77f18
commit 5a340556dd
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arangosh/Benchmark/BenchmarkThread.h
View File

@ -79,7 +79,9 @@ namespace triagens {
BenchmarkCounter<unsigned long>* operationsCounter,
Endpoint* endpoint,
const string& username,
const string& password)
const string& password,
double requestTimeout,
double connectTimeout)
: Thread("arangob"),
_operation(operation),
_startCondition(condition),
@ -91,6 +93,8 @@ namespace triagens {
_endpoint(endpoint),
_username(username),
_password(password),
_requestTimeout(requestTimeout),
_connectTimeout(connectTimeout),
_client(0),
_connection(0),
_offset(0),
@ -136,7 +140,7 @@ namespace triagens {
virtual void run () {
allowAsynchronousCancelation();
_connection = GeneralClientConnection::factory(_endpoint, 10.0, 10.0, 3);
_connection = GeneralClientConnection::factory(_endpoint, _requestTimeout, _connectTimeout, 3);
if (_connection == 0) {
LOGGER_FATAL_AND_EXIT("out of memory");
}
@ -450,6 +454,18 @@ namespace triagens {
const string _password;
////////////////////////////////////////////////////////////////////////////////
/// @brief the request timeout (in s)
////////////////////////////////////////////////////////////////////////////////
double _requestTimeout;
////////////////////////////////////////////////////////////////////////////////
/// @brief the connection timeout (in s)
////////////////////////////////////////////////////////////////////////////////
double _connectTimeout;
////////////////////////////////////////////////////////////////////////////////
/// @brief underlying client
////////////////////////////////////////////////////////////////////////////////

4
arangosh/Benchmark/arangob.cpp
View File

@ -290,7 +290,9 @@ int main (int argc, char* argv[]) {
&operationsCounter,
endpoint,
BaseClient.username(),
BaseClient.password());
BaseClient.password(),
BaseClient.requestTimeout(),
BaseClient.connectTimeout());
threads.push_back(thread);
thread->setOffset(i * realStep);