8000 fix locking of write transactions on DB servers by jsteemann · Pull Request #14450 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

fix locking of write transactions on DB servers #14450

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

Merged
merged 16 commits into from
Jul 9, 2021
Merged

fix locking of write transactions on DB servers #14450

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
79fa048
fix locking of write transactions on DB servers
jsteemann Jul 2, 2021
d18c0b4
Merge branch 'devel' of github.com:arangodb/arangodb into bug-fix/fix…
jsteemann Jul 2, 2021
e8f71b1
added CHANGELOG entry
jsteemann Jul 2, 2021
be9683b
fix compilation of gtests
jsteemann Jul 2, 2021
1fb0a62
try to fix non-maintainer compilation
jsteemann Jul 5, 2021
bd1f4aa
cleanup
jsteemann Jul 6, 2021
bc8438e
Merge branch 'devel' of github.com:arangodb/arangodb into bug-fix/fix…
jsteemann Jul 6, 2021
fbf4d8e
fixes
jsteemann Jul 7, 2021
18b605f
Merge branch 'devel' of github.com:arangodb/arangodb into bug-fix/fix…
jsteemann Jul 7, 2021
5eb4f70
add test
jsteemann Jul 7, 2021
37012fe
Merge branch 'devel' of github.com:arangodb/arangodb into bug-fix/fix…
jsteemann Jul 8, 2021
1058d7b
fix and extend chaos test, fix query setup
jsteemann Jul 8, 2021
db7170e
simply trx manager garbage collection code
jsteemann Jul 8, 2021
64e16cb
linti lint
jsteemann Jul 8, 2021
9efc21b
michaelized
jsteemann Jul 8, 2021
ef790f6
add debug log message
jsteemann Jul 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add test
  • Loading branch information
@jsteemann
jsteemann committed Jul 7, 2021
commit 5eb4f702b2e5f89caa5bc027f7363d518995119e
2 changes: 1 addition & 1 deletion arangod/Transaction/Manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -893,7 +893,7 @@ transaction::Status Manager::getManagedTrxStatus(TransactionId tid,
Result Manager::statusChangeWithTimeout(TransactionId tid, std::string const& database,
transaction::Status status) {
double startTime = 0.0;
constexpr double maxWaitTime = 2.0;
constexpr double maxWaitTime = 3.0;
Result res;
while (true) {
res = updateTransaction(tid, status, false, database);
Expand Down
4 changes: 2 additions & 2 deletions arangod/Transaction/Manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ class Manager final {
Result beginTransaction(transaction::Hints hints, std::shared_ptr<TransactionState>& state);

/// @brief lease the transaction, increases nesting
std::shared_ptr<transaction::Context> leaseManagedTrx(TransactionId tid, AccessMode::Type mode, bool isSideUser = false);
void returnManagedTrx(TransactionId, bool isSideUser = false) noexcept;
std::shared_ptr<transaction::Context> leaseManagedTrx(TransactionId tid, AccessMode::Type mode, bool isSideUser);
void returnManagedTrx(TransactionId, bool isSideUser) noexcept;

/// @brief get the meta transasction state
transaction::Status getManagedTrxStatus(TransactionId, std::string const& database) const;
Expand Down
58 changes: 46 additions & 12 deletions tests/Transaction/Manager-test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ TEST_F(TransactionManagerTest, simple_transaction_and_abort) {

auto doc = arangodb::velocypack::Parser::fromJson("{ \"_key\": \"1\"}");
{
auto ctx = mgr->leaseManagedTrx(tid, AccessMode::Type::WRITE);
auto ctx = mgr->leaseManagedTrx(tid, AccessMode::Type::WRITE, false);
ASSERT_NE(ctx.get(), nullptr);

SingleCollectionTransaction trx(ctx, "testCollection", AccessMode::Type::WRITE);
Expand All @@ -169,7 +169,7 @@ TEST_F(TransactionManagerTest, simple_transaction_and_abort) {
ASSERT_EQ(mgr->getManagedTrxStatus(tid, vocbase.name()), transaction::Status::RUNNING);

{ // lease again
auto ctx = mgr->leaseManagedTrx(tid, AccessMode::Type::WRITE);
auto ctx = mgr->leaseManagedTrx(tid, AccessMode::Type::WRITE, false);
ASSERT_NE(ctx.get(), nullptr);

SingleCollectionTransaction trx(ctx, "testCollection", AccessMode::Type::READ);
Expand Down Expand Up @@ -205,7 +205,7 @@ TEST_F(TransactionManagerTest, simple_transaction_and_commit) {
ASSERT_TRUE(res.ok());

{
auto ctx = mgr->leaseManagedTrx(tid, AccessMode::Type::WRITE);
auto ctx = mgr->leaseManagedTrx(tid, AccessMode::Type::WRITE, false);
ASSERT_NE(ctx.get(), nullptr);

SingleCollectionTransaction trx(ctx, "testCollection", AccessMode::Type::WRITE);
Expand Down Expand Up @@ -249,7 +249,7 @@ TEST_F(TransactionManagerTest, simple_transaction_and_commit_is_follower) {
ASSERT_TRUE(res.ok());

{
auto ctx = mgr->leaseManagedTrx(tid, AccessMode::Type::WRITE);
auto ctx = mgr->leaseManagedTrx(tid, AccessMode::Type::WRITE, false);
ASSERT_NE(ctx.get(), nullptr);

SingleCollectionTransaction trx(ctx, "testCollection", AccessMode::Type::WRITE);
Expand Down Expand Up @@ -288,7 +288,7 @@ TEST_F(TransactionManagerTest, simple_transaction_and_commit_while_in_use) {
ASSERT_TRUE(res.ok());

{
auto ctx = mgr->leaseManagedTrx(tid, AccessMode::Type::WRITE);
auto ctx = mgr->leaseManagedTrx(tid, AccessMode::Type::WRITE, false);
ASSERT_NE(ctx.get(), nullptr);

SingleCollectionTransaction trx(ctx, "testCollection", AccessMode::Type::WRITE);
Expand Down Expand Up @@ -330,19 +330,19 @@ TEST_F(TransactionManagerTest, leading_multiple_readonly_transactions) {
transaction::Options opts;
bool responsible;

auto ctx = mgr->leaseManagedTrx(tid, AccessMode::Type::READ);
auto ctx = mgr->leaseManagedTrx(tid, AccessMode::Type::READ, false);
ASSERT_NE(ctx.get(), nullptr);
auto state1 = ctx->acquireState(opts, responsible);
ASSERT_NE(state1.get(), nullptr);
ASSERT_TRUE(!responsible);

auto ctx2 = mgr->leaseManagedTrx(tid, AccessMode::Type::READ);
auto ctx2 = mgr->leaseManagedTrx(tid, AccessMode::Type::READ, false);
ASSERT_NE(ctx2.get(), nullptr);
auto state2 = ctx2->acquireState(opts, responsible);
EXPECT_EQ(state1.get(), state2.get());
ASSERT_TRUE(!responsible);

auto ctx3 = mgr->leaseManagedTrx(tid, AccessMode::Type::READ);
auto ctx3 = mgr->leaseManagedTrx(tid, AccessMode::Type::READ, false);
ASSERT_NE(ctx3.get(), nullptr);
auto state3 = ctx3->acquireState(opts, responsible);
EXPECT_EQ(state3.get(), state2.get());
Expand All @@ -369,12 +369,46 @@ TEST_F(TransactionManagerTest, lock_conflict) {
transaction::Options opts;
bool responsible;

auto ctx = mgr->leaseManagedTrx(tid, AccessMode::Type::WRITE);
auto ctx = mgr->leaseManagedTrx(tid, AccessMode::Type::WRITE, false);
ASSERT_NE(ctx.get(), nullptr);
auto state1 = ctx->acquireState(opts, responsible);
ASSERT_NE(state1.get(), nullptr);
ASSERT_TRUE(!responsible);
ASSERT_ANY_THROW(mgr->leaseManagedTrx(tid, AccessMode::Type::READ));
ASSERT_ANY_THROW(mgr->leaseManagedTrx(tid, AccessMode::Type::READ, false));
}
ASSERT_TRUE(mgr->abortManagedTrx(tid, vocbase.name()).ok());
ASSERT_EQ(mgr->getManagedTrxStatus(tid, vocbase.name()), transaction::Status::ABORTED);
}

TEST_F(TransactionManagerTest, lock_conflict_side_user) {
std::shared_ptr<LogicalCollection> coll;
{
auto json =
VPackParser::fromJson("{ \"name\": \"testCollection\", \"id\": 42 }");
coll = vocbase.createCollection(json->slice());
}
ASSERT_NE(coll, nullptr);

auto json = arangodb::velocypack::Parser::fromJson(
"{ \"collections\":{\"write\": [\"42\"]}}");
Result res = mgr->ensureManagedTrx(vocbase, tid, json->slice(), false);
ASSERT_TRUE(res.ok());
{
transaction::Options opts;
bool responsible;

auto ctx = mgr->leaseManagedTrx(tid, AccessMode::Type::WRITE, false);
ASSERT_NE(ctx.get(), nullptr);
auto state1 = ctx->acquireState(opts, responsible);
ASSERT_NE(state1.get(), nullptr);
ASSERT_TRUE(!responsible);
ASSERT_ANY_THROW(mgr->leaseManagedTrx(tid, AccessMode::Type::READ, false));

auto ctxSide = mgr->leaseManagedTrx(tid, AccessMode::Type::READ, true);
ASSERT_NE(ctxSide.get(), nullptr);
auto state2 = ctxSide->acquireState(opts, responsible);
ASSERT_NE(state2.get(), nullptr);
ASSERT_TRUE(!responsible);
}
ASSERT_TRUE(mgr->abortManagedTrx(tid, vocbase.name()).ok());
ASSERT_EQ(mgr->getManagedTrxStatus(tid, vocbase.name()), transaction::Status::ABORTED);
Expand All @@ -397,7 +431,7 @@ TEST_F(TransactionManagerTest, garbage_collection_shutdown) {
transaction::Options opts;
bool responsible;

auto ctx = mgr->leaseManagedTrx(tid, AccessMode::Type::WRITE);
auto ctx = mgr->leaseManagedTrx(tid, AccessMode::Type::WRITE, false);
ASSERT_NE(ctx.get(), nullptr);
auto state1 = ctx->acquireState(opts, responsible);
ASSERT_NE(state1.get(), nullptr);
Expand Down Expand Up @@ -456,7 +490,7 @@ TEST_F(TransactionManagerTest, abort_transactions_with_matcher) {
ASSERT_TRUE(res.ok());

{
auto ctx = mgr->leaseManagedTrx(tid, AccessMode::Type::WRITE);
auto ctx = mgr->leaseManagedTrx(tid, AccessMode::Type::WRITE, false);
ASSERT_NE(ctx.get(), nullptr);

SingleCollectionTransaction trx(ctx, "testCollection", AccessMode::Type::WRITE);
Expand Down
0