lib/wsrep-lib
1
0
Fork 0
mirror of https://github.com/codership/wsrep-lib.git synced 2025-07-28 20:02:00 +03:00
Code Activity

Call before/after prepare from before_commit() when 1PC

Browse Source 
before_prepare() call prepares removal SR fragments from stable
storage and the logic should be duplicated in before_commit()
otherwise.
This commit is contained in:
Teemu Ollakka
2018-06-13 13:04:33 +03:00
parent a7adcb01ba
commit f07885e204
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/transaction_context.cpp
View File

@ -115,11 +115,11 @@ int wsrep::transaction_context::after_row()
return 0;
}
int wsrep::transaction_context::before_prepare()
int wsrep::transaction_context::before_prepare(
wsrep::unique_lock<wsrep::mutex>& lock)
{
assert(lock.owns_lock());
int ret(0);
wsrep::unique_lock<wsrep::mutex> lock(client_context_.mutex());
debug_log_state("before_prepare_enter");
assert(state() == s_executing || state() == s_must_abort);
@ -168,10 +168,11 @@ int wsrep::transaction_context::before_prepare()
return ret;
}
int wsrep::transaction_context::after_prepare()
int wsrep::transaction_context::after_prepare(
wsrep::unique_lock<wsrep::mutex>& lock)
{
assert(lock.owns_lock());
int ret(1);
wsrep::unique_lock<wsrep::mutex> lock(client_context_.mutex());
debug_log_state("after_prepare_enter");
assert(state() == s_preparing || state() == s_must_abort);
if (state() == s_must_abort)
@ -185,7 +186,7 @@ int wsrep::transaction_context::after_prepare()
{
case wsrep::client_context::m_replicating:
ret = certify_commit(lock);
assert((ret == 0 || state() == s_committing) ||
assert((ret == 0 && state() == s_committing) ||
(state() == s_must_abort ||
state() == s_must_replay ||
state() == s_cert_failed));
@ -226,12 +227,10 @@ int wsrep::transaction_context::before_commit()
}
break;
case wsrep::client_context::m_replicating:
// Commit is one phase - before/after prepare was not called
if (state() == s_executing)
{
ret = certify_commit(lock);
assert((ret == 0 || state() == s_committing)
ret = before_prepare(lock) || after_prepare(lock);
assert((ret == 0 && state() == s_committing)
||
(state() == s_must_abort ||
state() == s_must_replay ||
@ -278,7 +277,6 @@ int wsrep::transaction_context::before_commit()
assert(0);
break;
}
}
break;
case wsrep::client_context::m_applier: