lib/wsrep-lib
1
0
Fork 0
mirror of https://github.com/codership/wsrep-lib.git synced 2025-07-31 18:24:25 +03:00
Code Activity

Allow replaying - preparing transition to get rid of extra state

Browse Source 
checks in prepare calls.
This commit is contained in:
Teemu Ollakka
2018-06-13 16:00:09 +03:00
parent 4c1ea388f8
commit 94b4d3a7db
1 changed files with 8 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/transaction_context.cpp
View File

@ -142,10 +142,7 @@ int wsrep::transaction_context::before_prepare(
return 1; return 1;
} }
if (state() != s_replaying) state(lock, s_preparing);
{
state(lock, s_preparing);
}
switch (client_context_.mode()) switch (client_context_.mode())
{ {
@ -182,7 +179,7 @@ int wsrep::transaction_context::before_prepare(
break; break;
} }
assert(state() == s_preparing || state() == s_replaying); assert(state() == s_preparing);
debug_log_state("before_prepare_leave"); debug_log_state("before_prepare_leave");
return ret; return ret;
} }
@ -193,8 +190,7 @@ int wsrep::transaction_context::after_prepare(
assert(lock.owns_lock()); assert(lock.owns_lock());
int ret(1); int ret(1);
debug_log_state("after_prepare_enter"); debug_log_state("after_prepare_enter");
assert(state() == s_preparing || state() == s_must_abort || assert(state() == s_preparing || state() == s_must_abort);
state() == s_replaying);
if (state() == s_must_abort) if (state() == s_must_abort)
{ {
assert(client_context_.mode() == wsrep::client_context::m_replicating); assert(client_context_.mode() == wsrep::client_context::m_replicating);
@ -213,11 +209,8 @@ int wsrep::transaction_context::after_prepare(
break; break;
case wsrep::client_context::m_local: case wsrep::client_context::m_local:
case wsrep::client_context::m_applier: case wsrep::client_context::m_applier:
if (state() != s_replaying) state(lock, s_certifying);
{ state(lock, s_committing);
state(lock, s_certifying);
state(lock, s_committing);
}
ret = 0; ret = 0;
break; break;
default: default:
@ -239,7 +232,8 @@ int wsrep::transaction_context::before_commit()
state() == s_committing || state() == s_committing ||
state() == s_must_abort || state() == s_must_abort ||
state() == s_replaying); state() == s_replaying);
assert(state() != s_committing || certified()); assert((state() != s_committing && state() != s_replaying) ||
certified());
switch (client_context_.mode()) switch (client_context_.mode())
{ {
@ -320,19 +314,6 @@ int wsrep::transaction_context::before_commit()
{ {
state(lock, s_must_abort); state(lock, s_must_abort);
} }
else
{
if (state() == s_executing)
{
// 1pc
state(lock, s_certifying);
state(lock, s_committing);
}
else if (state() == s_replaying)
{
state(lock, s_committing);
}
}
break; break;
default: default:
assert(0); assert(0);
@ -647,7 +628,7 @@ void wsrep::transaction_context::state(
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, /* ab */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, /* ab */
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, /* ad */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, /* ad */
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, /* mr */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, /* mr */
{ 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0} /* re */ { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0} /* re */
}; };
if (allowed[state_][next_state]) if (allowed[state_][next_state])
{ {