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

Enforce stricter transaction limits (#9740) (#9775) 

* Enforce stricter transaction limits (#9740)

* changelog

* make CHANGELOG entry more verbose
This commit is contained in:
Simon 2019-08-21 12:07:17 +02:00 committed by KVS85
parent 663212ba19
commit bd5df4d49e
8 changed files with 221 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG
View File

@ -1,6 +1,15 @@
v3.5.1 (XXXX-XX-XX) v3.5.1 (XXXX-XX-XX)
------------------- -------------------
* Changes the _idle_ timeout of stream transactions to 10 seconds and the total
per DB server size of stream transaction data to 128 MB. The idle timer is
restarted after every operation in a stream transaction, so it is not the
total timeout for the transaction.
These limits were documented in the manual for stream transactions since 3.5.0,
but are enforced only as of 3.5.1. Enforcing the limits is useful to free up
resources from abandoned transactions.
* Consistently honor the return value of all attempts to queue tasks in the * Consistently honor the return value of all attempts to queue tasks in the
internal scheduler. internal scheduler.

3
arangod/ClusterEngine/ClusterTransactionCollection.cpp
View File

@ -35,8 +35,7 @@ ClusterTransactionCollection::ClusterTransactionCollection(TransactionState* trx
TRI_voc_cid_t cid, TRI_voc_cid_t cid,
AccessMode::Type accessType, AccessMode::Type accessType,
int nestingLevel) int nestingLevel)
: TransactionCollection(trx, cid, accessType, nestingLevel), : TransactionCollection(trx, cid, accessType, nestingLevel) {}
_lockType(AccessMode::Type::NONE) {}
ClusterTransactionCollection::~ClusterTransactionCollection() {} ClusterTransactionCollection::~ClusterTransactionCollection() {}

3
arangod/ClusterEngine/ClusterTransactionCollection.h
View File

@ -60,9 +60,6 @@ class ClusterTransactionCollection final : public TransactionCollection {
/// @brief request an unlock for a collection /// @brief request an unlock for a collection
int doUnlock(AccessMode::Type, int nestingLevel) override; int doUnlock(AccessMode::Type, int nestingLevel) override;
private:
AccessMode::Type _lockType; // collection lock type, used for exclusive locks
}; };
} // namespace arangodb } // namespace arangodb

4
arangod/RestHandler/RestTransactionHandler.cpp
View File

@ -166,7 +166,7 @@ void RestTransactionHandler::executeBegin() {
bool parseSuccess = false; bool parseSuccess = false;
VPackSlice body = parseVPackBody(parseSuccess); VPackSlice slice = parseVPackBody(parseSuccess);
if (!parseSuccess) { if (!parseSuccess) {
// error message generated in parseVPackBody // error message generated in parseVPackBody
return; return;
@ -175,7 +175,7 @@ void RestTransactionHandler::executeBegin() {
transaction::Manager* mgr = transaction::ManagerFeature::manager(); transaction::Manager* mgr = transaction::ManagerFeature::manager();
TRI_ASSERT(mgr != nullptr); TRI_ASSERT(mgr != nullptr);
Result res = mgr->createManagedTrx(_vocbase, tid, body); Result res = mgr->createManagedTrx(_vocbase, tid, slice);
if (res.fail()) { if (res.fail()) {
generateError(res); generateError(res);
} else { } else {

226
arangod/Transaction/Manager.cpp
View File

@ -42,19 +42,20 @@
#include <velocypack/Iterator.h> #include <velocypack/Iterator.h>
#include <velocypack/velocypack-aliases.h> #include <velocypack/velocypack-aliases.h>
namespace arangodb { namespace arangodb {
namespace transaction { namespace transaction {
const size_t Manager::maxTransactionSize; // 128 MiB
namespace { namespace {
struct MGMethods final : arangodb::transaction::Methods { struct MGMethods final : arangodb::transaction::Methods {
MGMethods(std::shared_ptr<arangodb::transaction::Context> const& ctx, MGMethods(std::shared_ptr<arangodb::transaction::Context> const& ctx,
arangodb::transaction::Options const& opts) arangodb::transaction::Options const& opts)
: Methods(ctx, opts) { : Methods(ctx, opts) {
TRI_ASSERT(_state->isEmbeddedTransaction()); TRI_ASSERT(_state->isEmbeddedTransaction());
} }
}; };
} } // namespace
// register a list of failed transactions // register a list of failed transactions
void Manager::registerFailedTransactions(std::unordered_set<TRI_voc_tid_t> const& failedTransactions) { void Manager::registerFailedTransactions(std::unordered_set<TRI_voc_tid_t> const& failedTransactions) {
@ -158,11 +159,29 @@ uint64_t Manager::getActiveTransactionCount() {
return _nrRunning.load(std::memory_order_relaxed); return _nrRunning.load(std::memory_order_relaxed);
} }
Manager::ManagedTrx::ManagedTrx(MetaType t, TransactionState* st)
: type(t),
usedTimeSecs(TRI_microtime()),
state(st),
finalStatus(Status::UNDEFINED),
rwlock() {}
bool Manager::ManagedTrx::expired() const {
double now = TRI_microtime();
if (type == Manager::MetaType::Tombstone) {
return (now - usedTimeSecs) > tombstoneTTL;
}
auto role = ServerState::instance()->getRole();
if ((ServerState::isSingleServer(role) || ServerState::isCoordinator(role))) {
return (now - usedTimeSecs) > idleTTL;
}
return (now - usedTimeSecs) > idleTTLDBServer;
}
Manager::ManagedTrx::~ManagedTrx() { Manager::ManagedTrx::~ManagedTrx() {
if (type == MetaType::StandaloneAQL || if (type == MetaType::StandaloneAQL || state == nullptr || state->isEmbeddedTransaction()) {
state == nullptr || return; // not managed by us
state->isEmbeddedTransaction()) {
return;
} }
if (!state->isRunning()) { if (!state->isRunning()) {
delete state; delete state;
@ -171,8 +190,9 @@ Manager::ManagedTrx::~ManagedTrx() {
try { try {
transaction::Options opts; transaction::Options opts;
auto ctx = std::make_shared<transaction::ManagedContext>(2, state, AccessMode::Type::NONE); auto ctx =
MGMethods trx(ctx, opts); // own state now std::make_shared<transaction::ManagedContext>(2, state, AccessMode::Type::NONE);
MGMethods trx(ctx, opts); // own state now
trx.begin(); trx.begin();
TRI_ASSERT(state->nestingLevel() == 1); TRI_ASSERT(state->nestingLevel() == 1);
state->decreaseNesting(); state->decreaseNesting();
@ -196,20 +216,20 @@ void Manager::registerAQLTrx(TransactionState* state) {
TRI_ASSERT(state != nullptr); TRI_ASSERT(state != nullptr);
const size_t bucket = getBucket(state->id()); const size_t bucket = getBucket(state->id());
READ_LOCKER(allTransactionsLocker, _allTransactionsLock); {
WRITE_LOCKER(writeLocker, _transactions[bucket]._lock); READ_LOCKER(allTransactionsLocker, _allTransactionsLock);
WRITE_LOCKER(writeLocker, _transactions[bucket]._lock);
auto& buck = _transactions[bucket]; auto& buck = _transactions[bucket];
auto it = buck._managed.find(state->id()); auto it = buck._managed.find(state->id());
if (it != buck._managed.end()) { if (it != buck._managed.end()) {
THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_TRANSACTION_INTERNAL, THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_TRANSACTION_INTERNAL,
"transaction ID already used"); "transaction ID already used");
}
buck._managed.emplace(std::piecewise_construct, std::forward_as_tuple(state->id()),
std::forward_as_tuple(MetaType::StandaloneAQL, state));
} }
buck._managed.emplace(std::piecewise_construct,
std::forward_as_tuple(state->id()),
std::forward_as_tuple(MetaType::StandaloneAQL, state,
(defaultTTL + TRI_microtime())));
} }
void Manager::unregisterAQLTrx(TRI_voc_tid_t tid) noexcept { void Manager::unregisterAQLTrx(TRI_voc_tid_t tid) noexcept {
@ -220,23 +240,26 @@ void Manager::unregisterAQLTrx(TRI_voc_tid_t tid) noexcept {
auto& buck = _transactions[bucket]; auto& buck = _transactions[bucket];
auto it = buck._managed.find(tid); auto it = buck._managed.find(tid);
if (it == buck._managed.end()) { if (it == buck._managed.end()) {
LOG_TOPIC("92a49", ERR, Logger::TRANSACTIONS) << "a registered transaction was not found"; LOG_TOPIC("92a49", ERR, Logger::TRANSACTIONS)
<< "a registered transaction was not found";
TRI_ASSERT(false); TRI_ASSERT(false);
return; return;
} }
TRI_ASSERT(it->second.type == MetaType::StandaloneAQL); TRI_ASSERT(it->second.type == MetaType::StandaloneAQL);
/// we need to make sure no-one else is still using the TransactionState /// we need to make sure no-one else is still using the TransactionState
if (!it->second.rwlock.writeLock(/*maxAttempts*/256)) { if (!it->second.rwlock.writeLock(/*maxAttempts*/ 256)) {
LOG_TOPIC("9f7d7", ERR, Logger::TRANSACTIONS) << "a transaction is still in use"; LOG_TOPIC("9f7d7", ERR, Logger::TRANSACTIONS)
<< "a transaction is still in use";
TRI_ASSERT(false); TRI_ASSERT(false);
return; return;
} }
buck._managed.erase(it); // unlocking not necessary
buck._managed.erase(it); // unlocking not necessary
} }
Result Manager::createManagedTrx(TRI_vocbase_t& vocbase, Result Manager::createManagedTrx(TRI_vocbase_t& vocbase, TRI_voc_tid_t tid,
TRI_voc_tid_t tid, VPackSlice const trxOpts) { VPackSlice const trxOpts) {
Result res; Result res;
if (_disallowInserts) { if (_disallowInserts) {
return res.reset(TRI_ERROR_SHUTTING_DOWN); return res.reset(TRI_ERROR_SHUTTING_DOWN);
@ -280,18 +303,19 @@ Result Manager::createManagedTrx(TRI_vocbase_t& vocbase,
fillColls(collections.get("write"), writes) && fillColls(collections.get("write"), writes) &&
fillColls(collections.get("exclusive"), exclusives); fillColls(collections.get("exclusive"), exclusives);
if (!isValid) { if (!isValid) {
return res.reset(TRI_ERROR_BAD_PARAMETER, "invalid 'collections' attribute"); return res.reset(TRI_ERROR_BAD_PARAMETER,
"invalid 'collections' attribute");
} }
return createManagedTrx(vocbase, tid, reads, writes, exclusives, options); return createManagedTrx(vocbase, tid, reads, writes, exclusives, std::move(options));
} }
/// @brief create managed transaction /// @brief create managed transaction
Result Manager::createManagedTrx(TRI_vocbase_t& vocbase, TRI_voc_tid_t tid, Result Manager::createManagedTrx(TRI_vocbase_t& vocbase, TRI_voc_tid_t tid,
std::vector<std::string> const& readCollections, std::vector<std::string> const& readCollections,
std::vector<std::string> const& writeCollections, std::vector<std::string> const& writeCollections,
std::vector<std::string> const& exclusiveCollections, std::vector<std::string> const& exclusiveCollections,
transaction::Options const& options) { transaction::Options options) {
Result res; Result res;
if (_disallowInserts.load(std::memory_order_acquire)) { if (_disallowInserts.load(std::memory_order_acquire)) {
return res.reset(TRI_ERROR_SHUTTING_DOWN); return res.reset(TRI_ERROR_SHUTTING_DOWN);
@ -299,16 +323,21 @@ Result Manager::createManagedTrx(TRI_vocbase_t& vocbase, TRI_voc_tid_t tid,
const size_t bucket = getBucket(tid); const size_t bucket = getBucket(tid);
{ // quick check whether ID exists { // quick check whether ID exists
READ_LOCKER(allTransactionsLocker, _allTransactionsLock); READ_LOCKER(allTransactionsLocker, _allTransactionsLock);
WRITE_LOCKER(writeLocker, _transactions[bucket]._lock); WRITE_LOCKER(writeLocker, _transactions[bucket]._lock);
auto& buck = _transactions[bucket]; auto& buck = _transactions[bucket];
auto it = buck._managed.find(tid); auto it = buck._managed.find(tid);
if (it != buck._managed.end()) { if (it != buck._managed.end()) {
return res.reset(TRI_ERROR_TRANSACTION_INTERNAL, "transaction ID already used"); return res.reset(TRI_ERROR_TRANSACTION_INTERNAL,
"transaction ID already used");
} }
} }
// enforce size limit per DBServer
options.maxTransactionSize =
std::min<size_t>(options.maxTransactionSize, Manager::maxTransactionSize);
std::unique_ptr<TransactionState> state; std::unique_ptr<TransactionState> state;
try { try {
// now start our own transaction // now start our own transaction
@ -334,9 +363,10 @@ Result Manager::createManagedTrx(TRI_vocbase_t& vocbase, TRI_voc_tid_t tid,
if (cid == 0) { if (cid == 0) {
// not found // not found
res.reset(TRI_ERROR_ARANGO_DATA_SOURCE_NOT_FOUND, res.reset(TRI_ERROR_ARANGO_DATA_SOURCE_NOT_FOUND,
std::string(TRI_errno_string(TRI_ERROR_ARANGO_DATA_SOURCE_NOT_FOUND)) + ":" + cname); std::string(TRI_errno_string(TRI_ERROR_ARANGO_DATA_SOURCE_NOT_FOUND)) +
":" + cname);
} else { } else {
res.reset(state->addCollection(cid, cname, mode, /*nestingLevel*/0, false)); res.reset(state->addCollection(cid, cname, mode, /*nestingLevel*/ 0, false));
} }
if (res.fail()) { if (res.fail()) {
@ -366,20 +396,19 @@ Result Manager::createManagedTrx(TRI_vocbase_t& vocbase, TRI_voc_tid_t tid,
return res; return res;
} }
{ // add transaction to bucket { // add transaction to bucket
READ_LOCKER(allTransactionsLocker, _allTransactionsLock); READ_LOCKER(allTransactionsLocker, _allTransactionsLock);
WRITE_LOCKER(writeLocker, _transactions[bucket]._lock); WRITE_LOCKER(writeLocker, _transactions[bucket]._lock);
auto it = _transactions[bucket]._managed.find(tid); auto it = _transactions[bucket]._managed.find(tid);
if (it != _transactions[bucket]._managed.end()) { if (it != _transactions[bucket]._managed.end()) {
return res.reset(TRI_ERROR_TRANSACTION_INTERNAL, "transaction ID already used"); return res.reset(TRI_ERROR_TRANSACTION_INTERNAL,
"transaction ID already used");
} }
double expires = defaultTTL + TRI_microtime();
TRI_ASSERT(expires > 0);
TRI_ASSERT(state->id() == tid); TRI_ASSERT(state->id() == tid);
_transactions[bucket]._managed.emplace(std::piecewise_construct, _transactions[bucket]._managed.emplace(std::piecewise_construct,
std::forward_as_tuple(tid), std::forward_as_tuple(tid),
std::forward_as_tuple(MetaType::Managed, state.release(), std::forward_as_tuple(MetaType::Managed,
expires)); state.release()));
} }
LOG_TOPIC("d6806", DEBUG, Logger::TRANSACTIONS) << "created managed trx '" << tid << "'"; LOG_TOPIC("d6806", DEBUG, Logger::TRANSACTIONS) << "created managed trx '" << tid << "'";
@ -408,22 +437,21 @@ std::shared_ptr<transaction::Context> Manager::leaseManagedTrx(TRI_voc_tid_t tid
ManagedTrx& mtrx = it->second; ManagedTrx& mtrx = it->second;
if (mtrx.type == MetaType::Tombstone) { if (mtrx.type == MetaType::Tombstone) {
return nullptr; // already committet this trx return nullptr; // already committed this trx
} }
if (AccessMode::isWriteOrExclusive(mode)) { if (AccessMode::isWriteOrExclusive(mode)) {
if (mtrx.type == MetaType::StandaloneAQL) { if (mtrx.type == MetaType::StandaloneAQL) {
THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_TRANSACTION_DISALLOWED_OPERATION, THROW_ARANGO_EXCEPTION_MESSAGE(
"not allowed to write lock an AQL transaction"); TRI_ERROR_TRANSACTION_DISALLOWED_OPERATION,
"not allowed to write lock an AQL transaction");
} }
if (mtrx.rwlock.tryWriteLock()) { if (mtrx.rwlock.tryWriteLock()) {
mtrx.expires = defaultTTL + TRI_microtime();
state = mtrx.state; state = mtrx.state;
break; break;
} }
} else { } else {
if (mtrx.rwlock.tryReadLock()) { if (mtrx.rwlock.tryReadLock()) {
mtrx.expires = defaultTTL + TRI_microtime();
state = mtrx.state; state = mtrx.state;
break; break;
} }
@ -431,7 +459,7 @@ std::shared_ptr<transaction::Context> Manager::leaseManagedTrx(TRI_voc_tid_t tid
"transaction is already in use"); "transaction is already in use");
} }
writeLocker.unlock(); // failure; writeLocker.unlock(); // failure;
allTransactionsLocker.unlock(); allTransactionsLocker.unlock();
std::this_thread::yield(); std::this_thread::yield();
@ -439,7 +467,7 @@ std::shared_ptr<transaction::Context> Manager::leaseManagedTrx(TRI_voc_tid_t tid
LOG_TOPIC("9e972", DEBUG, Logger::TRANSACTIONS) << "waiting on trx lock " << tid; LOG_TOPIC("9e972", DEBUG, Logger::TRANSACTIONS) << "waiting on trx lock " << tid;
i = 0; i = 0;
if (application_features::ApplicationServer::isStopping()) { if (application_features::ApplicationServer::isStopping()) {
return nullptr; // shutting down return nullptr; // shutting down
} }
} }
} while (true); } while (true);
@ -449,7 +477,7 @@ std::shared_ptr<transaction::Context> Manager::leaseManagedTrx(TRI_voc_tid_t tid
TRI_ASSERT(!AccessMode::isWriteOrExclusive(mode) || level == 1); TRI_ASSERT(!AccessMode::isWriteOrExclusive(mode) || level == 1);
return std::make_shared<ManagedContext>(tid, state, mode); return std::make_shared<ManagedContext>(tid, state, mode);
} }
TRI_ASSERT(false); // should be unreachable TRI_ASSERT(false); // should be unreachable
return nullptr; return nullptr;
} }
@ -460,7 +488,8 @@ void Manager::returnManagedTrx(TRI_voc_tid_t tid, AccessMode::Type mode) noexcep
auto it = _transactions[bucket]._managed.find(tid); auto it = _transactions[bucket]._managed.find(tid);
if (it == _transactions[bucket]._managed.end()) { if (it == _transactions[bucket]._managed.end()) {
LOG_TOPIC("1d5b0", WARN, Logger::TRANSACTIONS) << "managed transaction was not found"; LOG_TOPIC("1d5b0", WARN, Logger::TRANSACTIONS)
<< "managed transaction was not found";
TRI_ASSERT(false); TRI_ASSERT(false);
return; return;
} }
@ -471,13 +500,13 @@ void Manager::returnManagedTrx(TRI_voc_tid_t tid, AccessMode::Type mode) noexcep
TRI_ASSERT(!AccessMode::isWriteOrExclusive(mode) || level == 0); TRI_ASSERT(!AccessMode::isWriteOrExclusive(mode) || level == 0);
// garbageCollection might soft abort used transactions // garbageCollection might soft abort used transactions
const bool isSoftAborted = it->second.expires == 0; const bool isSoftAborted = it->second.usedTimeSecs == 0;
if (!isSoftAborted) { if (!isSoftAborted) {
it->second.expires = defaultTTL + TRI_microtime(); it->second.usedTimeSecs = TRI_microtime();
} }
if (AccessMode::isWriteOrExclusive(mode)) { if (AccessMode::isWriteOrExclusive(mode)) {
it->second.rwlock.unlockWrite(); it->second.rwlock.unlockWrite();
} else if (mode == AccessMode::Type::READ){ } else if (mode == AccessMode::Type::READ) {
it->second.rwlock.unlockRead(); it->second.rwlock.unlockRead();
} else { } else {
TRI_ASSERT(false); TRI_ASSERT(false);
@ -503,7 +532,7 @@ transaction::Status Manager::getManagedTrxStatus(TRI_voc_tid_t tid) const {
if (mtrx.type == MetaType::Tombstone) { if (mtrx.type == MetaType::Tombstone) {
return mtrx.finalStatus; return mtrx.finalStatus;
} else if (mtrx.expires > TRI_microtime() && mtrx.state != nullptr) { } else if (!mtrx.expired() && mtrx.state != nullptr) {
return transaction::Status::RUNNING; return transaction::Status::RUNNING;
} else { } else {
return transaction::Status::ABORTED; return transaction::Status::ABORTED;
@ -518,14 +547,13 @@ Result Manager::abortManagedTrx(TRI_voc_tid_t tid) {
return updateTransaction(tid, transaction::Status::ABORTED, false); return updateTransaction(tid, transaction::Status::ABORTED, false);
} }
Result Manager::updateTransaction(TRI_voc_tid_t tid, Result Manager::updateTransaction(TRI_voc_tid_t tid, transaction::Status status,
transaction::Status status,
bool clearServers) { bool clearServers) {
TRI_ASSERT(status == transaction::Status::COMMITTED || TRI_ASSERT(status == transaction::Status::COMMITTED ||
status == transaction::Status::ABORTED); status == transaction::Status::ABORTED);
LOG_TOPIC("7bd2f", DEBUG, Logger::TRANSACTIONS) << "managed trx '" << tid LOG_TOPIC("7bd2f", DEBUG, Logger::TRANSACTIONS)
<< " updating to '" << status << "'"; << "managed trx '" << tid << " updating to '" << status << "'";
Result res; Result res;
const size_t bucket = getBucket(tid); const size_t bucket = getBucket(tid);
@ -555,9 +583,9 @@ Result Manager::updateTransaction(TRI_voc_tid_t tid,
} else if (mtrx.type == MetaType::Tombstone) { } else if (mtrx.type == MetaType::Tombstone) {
TRI_ASSERT(mtrx.state == nullptr); TRI_ASSERT(mtrx.state == nullptr);
// make sure everyone who asks gets the updated timestamp // make sure everyone who asks gets the updated timestamp
mtrx.expires = TRI_microtime() + tombstoneTTL; mtrx.usedTimeSecs = TRI_microtime();
if (mtrx.finalStatus == status) { if (mtrx.finalStatus == status) {
return res; // all good return res; // all good
} else { } else {
std::string msg("transaction was already "); std::string msg("transaction was already ");
msg.append(statusString(mtrx.finalStatus)); msg.append(statusString(mtrx.finalStatus));
@ -565,8 +593,7 @@ Result Manager::updateTransaction(TRI_voc_tid_t tid,
} }
} }
double now = TRI_microtime(); if (mtrx.expired()) {
if (mtrx.expires < now) {
status = transaction::Status::ABORTED; status = transaction::Status::ABORTED;
wasExpired = true; wasExpired = true;
} }
@ -574,13 +601,13 @@ Result Manager::updateTransaction(TRI_voc_tid_t tid,
state.reset(mtrx.state); state.reset(mtrx.state);
mtrx.state = nullptr; mtrx.state = nullptr;
mtrx.type = MetaType::Tombstone; mtrx.type = MetaType::Tombstone;
mtrx.expires = now + tombstoneTTL; mtrx.usedTimeSecs = TRI_microtime();
mtrx.finalStatus = status; mtrx.finalStatus = status;
// it is sufficient to pretend that the operation already succeeded // it is sufficient to pretend that the operation already succeeded
} }
TRI_ASSERT(state); TRI_ASSERT(state);
if (!state) { // this should never happen if (!state) { // this should never happen
return res.reset(TRI_ERROR_INTERNAL, "managed trx in an invalid state"); return res.reset(TRI_ERROR_INTERNAL, "managed trx in an invalid state");
} }
@ -593,13 +620,14 @@ Result Manager::updateTransaction(TRI_voc_tid_t tid,
it->second.finalStatus = Status::ABORTED; it->second.finalStatus = Status::ABORTED;
} }
}; };
if (!state->isRunning()) { // this also should not happen if (!state->isRunning()) { // this also should not happen
abortTombstone(); abortTombstone();
return res.reset(TRI_ERROR_TRANSACTION_ABORTED, "transaction was not running"); return res.reset(TRI_ERROR_TRANSACTION_ABORTED,
"transaction was not running");
} }
auto ctx = std::make_shared<ManagedContext>(tid, state.get(), AccessMode::Type::NONE); auto ctx = std::make_shared<ManagedContext>(tid, state.get(), AccessMode::Type::NONE);
state.release(); // now owned by ctx state.release(); // now owned by ctx
transaction::Options trxOpts; transaction::Options trxOpts;
MGMethods trx(ctx, trxOpts); MGMethods trx(ctx, trxOpts);
@ -612,7 +640,7 @@ Result Manager::updateTransaction(TRI_voc_tid_t tid,
} }
if (status == transaction::Status::COMMITTED) { if (status == transaction::Status::COMMITTED) {
res = trx.commit(); res = trx.commit();
if (res.fail()) { // set final status to aborted if (res.fail()) { // set final status to aborted
abortTombstone(); abortTombstone();
} }
} else { } else {
@ -627,8 +655,7 @@ Result Manager::updateTransaction(TRI_voc_tid_t tid,
} }
/// @brief calls the callback function for each managed transaction /// @brief calls the callback function for each managed transaction
void Manager::iterateManagedTrx( void Manager::iterateManagedTrx(std::function<void(TRI_voc_tid_t, ManagedTrx const&)> const& callback) const {
std::function<void(TRI_voc_tid_t, ManagedTrx const&)> const& callback) const {
READ_LOCKER(allTransactionsLocker, _allTransactionsLock); READ_LOCKER(allTransactionsLocker, _allTransactionsLock);
// iterate over all active transactions // iterate over all active transactions
@ -655,35 +682,33 @@ bool Manager::garbageCollect(bool abortAll) {
for (size_t bucket = 0; bucket < numBuckets; ++bucket) { for (size_t bucket = 0; bucket < numBuckets; ++bucket) {
WRITE_LOCKER(locker, _transactions[bucket]._lock); WRITE_LOCKER(locker, _transactions[bucket]._lock);
double now = TRI_microtime();
auto it = _transactions[bucket]._managed.begin();
auto it = _transactions[bucket]._managed.begin();
while (it != _transactions[bucket]._managed.end()) { while (it != _transactions[bucket]._managed.end()) {
ManagedTrx& mtrx = it->second; ManagedTrx& mtrx = it->second;
if (mtrx.type == MetaType::Managed) { if (mtrx.type == MetaType::Managed) {
TRI_ASSERT(mtrx.state != nullptr); TRI_ASSERT(mtrx.state != nullptr);
if (abortAll || mtrx.expires < now) { if (abortAll || mtrx.expired()) {
TRY_READ_LOCKER(tryGuard, mtrx.rwlock); // needs lock to access state TRY_READ_LOCKER(tryGuard, mtrx.rwlock); // needs lock to access state
if (tryGuard.isLocked()) { if (tryGuard.isLocked()) {
TRI_ASSERT(mtrx.state->isRunning() && mtrx.state->isTopLevelTransaction()); TRI_ASSERT(mtrx.state->isRunning() && mtrx.state->isTopLevelTransaction());
TRI_ASSERT(it->first == mtrx.state->id()); TRI_ASSERT(it->first == mtrx.state->id());
toAbort.emplace_back(mtrx.state->id()); toAbort.emplace_back(mtrx.state->id());
} else if (abortAll) { // transaction is in } else if (abortAll) { // transaction is in
mtrx.expires = 0; // soft-abort transaction mtrx.usedTimeSecs = 0; // soft-abort transaction
didWork = true; didWork = true;
} }
} }
} else if (mtrx.type == MetaType::StandaloneAQL && mtrx.expires < now) { } else if (mtrx.type == MetaType::StandaloneAQL && mtrx.expired()) {
LOG_TOPIC("7ad3f", INFO, Logger::TRANSACTIONS) LOG_TOPIC("7ad3f", INFO, Logger::TRANSACTIONS)
<< "expired AQL query transaction '" << it->first << "'"; << "expired AQL query transaction '" << it->first << "'";
} else if (mtrx.type == MetaType::Tombstone && mtrx.expires < now) { } else if (mtrx.type == MetaType::Tombstone && mtrx.expired()) {
TRI_ASSERT(mtrx.state == nullptr); TRI_ASSERT(mtrx.state == nullptr);
TRI_ASSERT(mtrx.finalStatus != transaction::Status::UNDEFINED); TRI_ASSERT(mtrx.finalStatus != transaction::Status::UNDEFINED);
it = _transactions[bucket]._managed.erase(it); it = _transactions[bucket]._managed.erase(it);
continue; continue;
} }
@ -693,19 +718,21 @@ bool Manager::garbageCollect(bool abortAll) {
for (TRI_voc_tid_t tid : toAbort) { for (TRI_voc_tid_t tid : toAbort) {
LOG_TOPIC("6fbaf", DEBUG, Logger::TRANSACTIONS) << "garbage collecting " LOG_TOPIC("6fbaf", DEBUG, Logger::TRANSACTIONS) << "garbage collecting "
"transaction: '" << tid << "'"; "transaction: '"
Result res = updateTransaction(tid, Status::ABORTED, /*clearSrvs*/true); << tid << "'";
Result res = updateTransaction(tid, Status::ABORTED, /*clearSrvs*/ true);
if (res.fail()) { if (res.fail()) {
LOG_TOPIC("0a07f", INFO, Logger::TRANSACTIONS) << "error while aborting " LOG_TOPIC("0a07f", INFO, Logger::TRANSACTIONS) << "error while aborting "
"transaction: '" << res.errorMessage() << "'"; "transaction: '"
<< res.errorMessage() << "'";
} }
didWork = true; didWork = true;
} }
if (didWork) { if (didWork) {
LOG_TOPIC("e5b31", INFO, Logger::TRANSACTIONS) << "aborted expired transactions"; LOG_TOPIC("e5b31", INFO, Logger::TRANSACTIONS)
<< "aborted expired transactions";
} }
return didWork; return didWork;
@ -713,7 +740,6 @@ bool Manager::garbageCollect(bool abortAll) {
/// @brief abort all transactions matching /// @brief abort all transactions matching
bool Manager::abortManagedTrx(std::function<bool(TransactionState const&)> cb) { bool Manager::abortManagedTrx(std::function<bool(TransactionState const&)> cb) {
SmallVector<TRI_voc_tid_t, 64>::allocator_type::arena_type arena; SmallVector<TRI_voc_tid_t, 64>::allocator_type::arena_type arena;
SmallVector<TRI_voc_tid_t, 64> toAbort{arena}; SmallVector<TRI_voc_tid_t, 64> toAbort{arena};
@ -723,11 +749,10 @@ bool Manager::abortManagedTrx(std::function<bool(TransactionState const&)> cb) {
auto it = _transactions[bucket]._managed.begin(); auto it = _transactions[bucket]._managed.begin();
while (it != _transactions[bucket]._managed.end()) { while (it != _transactions[bucket]._managed.end()) {
ManagedTrx& mtrx = it->second; ManagedTrx& mtrx = it->second;
if (mtrx.type == MetaType::Managed) { if (mtrx.type == MetaType::Managed) {
TRI_ASSERT(mtrx.state != nullptr); TRI_ASSERT(mtrx.state != nullptr);
TRY_READ_LOCKER(tryGuard, mtrx.rwlock); // needs lock to access state TRY_READ_LOCKER(tryGuard, mtrx.rwlock); // needs lock to access state
if (tryGuard.isLocked() && cb(*mtrx.state)) { if (tryGuard.isLocked() && cb(*mtrx.state)) {
toAbort.emplace_back(it->first); toAbort.emplace_back(it->first);
} }
@ -738,19 +763,18 @@ bool Manager::abortManagedTrx(std::function<bool(TransactionState const&)> cb) {
} }
for (TRI_voc_tid_t tid : toAbort) { for (TRI_voc_tid_t tid : toAbort) {
Result res = updateTransaction(tid, Status::ABORTED, /*clearSrvs*/true); Result res = updateTransaction(tid, Status::ABORTED, /*clearSrvs*/ true);
if (res.fail()) { if (res.fail()) {
LOG_TOPIC("2bf48", INFO, Logger::TRANSACTIONS) << "error aborting " LOG_TOPIC("2bf48", INFO, Logger::TRANSACTIONS) << "error aborting "
"transaction: '" << res.errorMessage() << "'"; "transaction: '"
<< res.errorMessage() << "'";
} }
} }
return !toAbort.empty(); return !toAbort.empty();
} }
void Manager::toVelocyPack(VPackBuilder& builder, void Manager::toVelocyPack(VPackBuilder& builder, std::string const& database,
std::string const& database, std::string const& username, bool fanout) const {
std::string const& username,
bool fanout) const {
TRI_ASSERT(!builder.isClosed()); TRI_ASSERT(!builder.isClosed());
if (fanout) { if (fanout) {
@ -786,7 +810,7 @@ void Manager::toVelocyPack(VPackBuilder& builder,
} }
VPackSlice slice = builder.slice(); VPackSlice slice = builder.slice();
headers->emplace(StaticStrings::Authorization, headers->emplace(StaticStrings::Authorization,
"bearer " + auth->tokenCache().generateJwt(slice)); "bearer " + auth->tokenCache().generateJwt(slice));
} }
} }

32
arangod/Transaction/Manager.h
View File

@ -47,33 +47,36 @@ struct TransactionData {
namespace velocypack { namespace velocypack {
class Builder; class Builder;
class Slice; class Slice;
} } // namespace velocypack
namespace transaction { namespace transaction {
class Context; class Context;
struct Options; struct Options;
/// @bried Tracks TransasctionState instances /// @brief Tracks TransasctionState instances
class Manager final { class Manager final {
static constexpr size_t numBuckets = 16; static constexpr size_t numBuckets = 16;
static constexpr double defaultTTL = 10.0 * 60.0; // 10 minutes static constexpr double idleTTL = 10.0; // 10 seconds
static constexpr double tombstoneTTL = 5.0 * 60.0; // 5 minutes static constexpr double idleTTLDBServer = 3 * 60.0; // 3 minutes
static constexpr double tombstoneTTL = 10.0 * 60.0; // 10 minutes
static constexpr size_t maxTransactionSize = 128 * 1024 * 1024; // 128 MiB
enum class MetaType : uint8_t { enum class MetaType : uint8_t {
Managed = 1, /// global single shard db transaction Managed = 1, /// global single shard db transaction
StandaloneAQL = 2, /// used for a standalone transaction (AQL standalone) StandaloneAQL = 2, /// used for a standalone transaction (AQL standalone)
Tombstone = 3 /// used to ensure we can acknowledge double commits / aborts Tombstone = 3 /// used to ensure we can acknowledge double commits / aborts
}; };
struct ManagedTrx { struct ManagedTrx {
ManagedTrx(MetaType t, TransactionState* st, double ex) ManagedTrx(MetaType t, TransactionState* st);
: type(t), expires(ex), state(st), finalStatus(Status::UNDEFINED),
rwlock() {}
~ManagedTrx(); ~ManagedTrx();
MetaType type; bool expired() const;
double expires; /// expiration timestamp, if 0 it expires immediately
TransactionState* state; /// Transaction, may be nullptr public:
MetaType type; /// managed, AQL or tombstone
double usedTimeSecs; /// last time used
TransactionState* state; /// Transaction, may be nullptr
/// @brief final TRX state that is valid if this is a tombstone /// @brief final TRX state that is valid if this is a tombstone
/// necessary to avoid getting error on a 'diamond' commit or accidantally /// necessary to avoid getting error on a 'diamond' commit or accidantally
/// repeated commit / abort messages /// repeated commit / abort messages
@ -130,7 +133,7 @@ class Manager final {
std::vector<std::string> const& readCollections, std::vector<std::string> const& readCollections,
std::vector<std::string> const& writeCollections, std::vector<std::string> const& writeCollections,
std::vector<std::string> const& exclusiveCollections, std::vector<std::string> const& exclusiveCollections,
transaction::Options const& options); transaction::Options options);
/// @brief lease the transaction, increases nesting /// @brief lease the transaction, increases nesting
std::shared_ptr<transaction::Context> leaseManagedTrx(TRI_voc_tid_t tid, std::shared_ptr<transaction::Context> leaseManagedTrx(TRI_voc_tid_t tid,
@ -163,13 +166,12 @@ class Manager final {
return std::hash<TRI_voc_cid_t>()(tid) % numBuckets; return std::hash<TRI_voc_cid_t>()(tid) % numBuckets;
} }
Result updateTransaction(TRI_voc_tid_t tid, transaction::Status status, Result updateTransaction(TRI_voc_tid_t tid, transaction::Status status, bool clearServers);
bool clearServers);
/// @brief calls the callback function for each managed transaction /// @brief calls the callback function for each managed transaction
void iterateManagedTrx(std::function<void(TRI_voc_tid_t, ManagedTrx const&)> const&) const; void iterateManagedTrx(std::function<void(TRI_voc_tid_t, ManagedTrx const&)> const&) const;
private: /// @brief will be true only for MMFiles
bool const _keepTransactionData; bool const _keepTransactionData;
// a lock protecting ALL buckets in _transactions // a lock protecting ALL buckets in _transactions

2
lib/Futures/Promise.h
View File

@ -115,7 +115,7 @@ class Promise {
arangodb::futures::Future<T> getFuture(); arangodb::futures::Future<T> getFuture();
private: private:
Promise(detail::SharedState<T>* state) : _state(state), _retrieved(false) {} explicit Promise(detail::SharedState<T>* state) : _state(state), _retrieved(false) {}
// convenience method that checks if _state is set // convenience method that checks if _state is set
inline detail::SharedState<T>& getState() { inline detail::SharedState<T>& getState() {

51
tests/js/client/shell/shell-transaction.js
View File

@ -3804,6 +3804,56 @@ function transactionAQLStreamSuite () {
}; };
} }
// //////////////////////////////////////////////////////////////////////////////
// / @brief test suite
// //////////////////////////////////////////////////////////////////////////////
function transactionTTLStreamSuite () {
'use strict';
const cn = 'UnitTestsTransaction';
let c;
return {
// //////////////////////////////////////////////////////////////////////////////
// / @brief set up
// //////////////////////////////////////////////////////////////////////////////
setUp: function () {
db._drop(cn);
c = db._create(cn, {numberOfShards: 2, replicationFactor: 2});
},
// //////////////////////////////////////////////////////////////////////////////
// / @brief tear down
// //////////////////////////////////////////////////////////////////////////////
tearDown: function () {
db._drop(cn);
},
// //////////////////////////////////////////////////////////////////////////////
// / @brief test: abort idle transactions
// //////////////////////////////////////////////////////////////////////////////
testAbortIdleTrx: function () {
let trx = db._createTransaction({
collections: { read: cn }
});
internal.sleep(12);
try {
trx.collection(cn).save({key:'val'});
fail();
} catch (err) {
assertEqual(internal.errors.ERROR_TRANSACTION_NOT_FOUND.code, err.errorNum);
}
}
};
}
// ////////////////////////////////////////////////////////////////////////////// // //////////////////////////////////////////////////////////////////////////////
// / @brief executes the test suites // / @brief executes the test suites
// ////////////////////////////////////////////////////////////////////////////// // //////////////////////////////////////////////////////////////////////////////
@ -3818,5 +3868,6 @@ jsunity.run(transactionCountSuite);
jsunity.run(transactionCrossCollectionSuite); jsunity.run(transactionCrossCollectionSuite);
jsunity.run(transactionTraversalSuite); jsunity.run(transactionTraversalSuite);
jsunity.run(transactionAQLStreamSuite); jsunity.run(transactionAQLStreamSuite);
jsunity.run(transactionTTLStreamSuite);
return jsunity.done(); return jsunity.done();