Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enforce stricter transaction limits (#9740) #9775

Merged
merged 3 commits into from Aug 21, 2019
Merged

Enforce stricter transaction limits (#9740) #9775

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d3736a
Enforce stricter transaction limits (#9740)
graetzer Aug 20, 2019
d6bf667
changelog
graetzer Aug 20, 2019
6d67e3b
make CHANGELOG entry more verbose
jsteemann Aug 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG
View file
Open in desktop
@@ -1,6 +1,8 @@
v3.5.1 (XXXX-XX-XX)
-------------------

* Changes the idle timeout of stream transactions to 10 seconds

* Consistently honor the return value of all attempts to queue tasks in the
internal scheduler.

Expand Down
3 changes: 1 addition & 2 deletions arangod/ClusterEngine/ClusterTransactionCollection.cpp
View file
Open in desktop
Expand Up @@ -35,8 +35,7 @@ ClusterTransactionCollection::ClusterTransactionCollection(TransactionState* trx
TRI_voc_cid_t cid,
AccessMode::Type accessType,
int nestingLevel)
: TransactionCollection(trx, cid, accessType, nestingLevel),
_lockType(AccessMode::Type::NONE) {}
: TransactionCollection(trx, cid, accessType, nestingLevel) {}

ClusterTransactionCollection::~ClusterTransactionCollection() {}

Expand Down
3 changes: 0 additions & 3 deletions arangod/ClusterEngine/ClusterTransactionCollection.h
View file
Open in desktop
Expand Up @@ -60,9 +60,6 @@ class ClusterTransactionCollection final : public TransactionCollection {

/// @brief request an unlock for a collection
int doUnlock(AccessMode::Type, int nestingLevel) override;

private:
AccessMode::Type _lockType; // collection lock type, used for exclusive locks
};
} // namespace arangodb

Expand Down
4 changes: 2 additions & 2 deletions arangod/RestHandler/RestTransactionHandler.cpp
View file
Open in desktop
Expand Up @@ -166,7 +166,7 @@ void RestTransactionHandler::executeBegin() {


bool parseSuccess = false;
VPackSlice body = parseVPackBody(parseSuccess);
VPackSlice slice = parseVPackBody(parseSuccess);
if (!parseSuccess) {
// error message generated in parseVPackBody
return;
Expand All @@ -175,7 +175,7 @@ void RestTransactionHandler::executeBegin() {
transaction::Manager* mgr = transaction::ManagerFeature::manager();
TRI_ASSERT(mgr != nullptr);

Result res = mgr->createManagedTrx(_vocbase, tid, body);
Result res = mgr->createManagedTrx(_vocbase, tid, slice);
if (res.fail()) {
generateError(res);
} else {
Expand Down