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

Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel

This commit is contained in:
Max Neunhoeffer 2015-12-07 16:01:57 +01:00
parent 637a234660 17c479fe25
commit 1396015f11
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
UnitTests/HttpInterface/arangodb.rb
View File

@ -67,8 +67,9 @@ class ArangoDB
# expect json as output/response format # expect json as output/response format
format :json format :json
# set timeout to 120 seconds # set timeout to 300 seconds - so we will see timeouts in the cluster with ther
default_timeout 120 # respective error messages from the coordinator.
default_timeout 300
# do not verify SSL # do not verify SSL
default_options[:verify] = false default_options[:verify] = false

4
arangod/VocBase/transaction.cpp
View File

@ -398,14 +398,14 @@ static int LockCollection (TRI_transaction_collection_t* trxCollection,
nestingLevel, nestingLevel,
"read-locking collection %llu", "read-locking collection %llu",
(unsigned long long) trxCollection->_cid); (unsigned long long) trxCollection->_cid);
res = document->beginReadTimed(trx->_timeout, TRI_TRANSACTION_DEFAULT_SLEEP_DURATION); res = document->beginReadTimed(trx->_timeout, TRI_TRANSACTION_DEFAULT_SLEEP_DURATION * 3);
} }
else { else {
LOG_TRX(trx, LOG_TRX(trx,
nestingLevel, nestingLevel,
"write-locking collection %llu", "write-locking collection %llu",
(unsigned long long) trxCollection->_cid); (unsigned long long) trxCollection->_cid);
res = document->beginWriteTimed(trx->_timeout, TRI_TRANSACTION_DEFAULT_SLEEP_DURATION * 50); res = document->beginWriteTimed(trx->_timeout, TRI_TRANSACTION_DEFAULT_SLEEP_DURATION * 3);
} }
if (res == TRI_ERROR_NO_ERROR) { if (res == TRI_ERROR_NO_ERROR) {

6
js/server/modules/org/arangodb/aql.js
View File

@ -4619,6 +4619,12 @@ function AQL_TEST_MODIFY (test, what) {
delete what.f; delete what.f;
what.g = "foo"; what.g = "foo";
} }
else if (test === 'DEADLOCK') {
var err = new ArangoError();
err.errorNum = INTERNAL.errors.ERROR_DEADLOCK.code;
err.errorMessage = INTERNAL.errors.ERROR_DEADLOCK.message;
throw err;
}
return what; return what;
} }