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

* Renamed client service rollback() to bf_rollback() to better

Browse Source 
describe its purpose.
* Raise deadlock error for BF aborted transaction in after_statement()
  call if the error is not set yet.
This commit is contained in:
Teemu Ollakka
2018-07-06 15:42:03 +03:00
parent 5ef2c956a9
commit e876418ed3
8 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/client_state.cpp
View File

@ -35,7 +35,7 @@ void wsrep::client_state::close()
lock.unlock();
if (transaction_.active())
{
client_service_.rollback();
client_service_.bf_rollback();
}
debug_log_state("close: leave");
}
@ -90,7 +90,7 @@ int wsrep::client_state::before_command()
wsrep::server_state::rm_async);
override_error(wsrep::e_deadlock_error);
lock.unlock();
client_service_.rollback();
client_service_.bf_rollback();
(void)transaction_.after_statement();
lock.lock();
assert(transaction_.state() ==
@ -128,7 +128,7 @@ void wsrep::client_state::after_command_before_result()
{
override_error(wsrep::e_deadlock_error);
lock.unlock();
client_service_.rollback();
client_service_.bf_rollback();
(void)transaction_.after_statement();
lock.lock();
assert(transaction_.state() == wsrep::transaction::s_aborted);
@ -148,7 +148,7 @@ void wsrep::client_state::after_command_after_result()
transaction_.state() == wsrep::transaction::s_must_abort)
{
lock.unlock();
client_service_.rollback();
client_service_.bf_rollback();
lock.lock();
assert(transaction_.state() == wsrep::transaction::s_aborted);
override_error(wsrep::e_deadlock_error);
@ -203,7 +203,7 @@ wsrep::client_state::after_statement()
(void)transaction_.after_statement();
if (current_error() == wsrep::e_deadlock_error)
{
if (mode_ == m_replicating && client_service_.is_autocommit())
if (mode_ == m_replicating)
{
debug_log_state("after_statement: may_retry");
return asr_may_retry;

12
src/transaction.cpp
View File

@ -49,6 +49,7 @@ wsrep::transaction::~transaction()
int wsrep::transaction::start_transaction(
const wsrep::transaction_id& id)
{
debug_log_state("start_transaction enter");
assert(active() == false);
id_ = id;
state_ = s_executing;
@ -59,10 +60,13 @@ int wsrep::transaction::start_transaction(
{
case wsrep::client_state::m_local:
case wsrep::client_state::m_high_priority:
debug_log_state("start_transaction success");
return 0;
case wsrep::client_state::m_replicating:
debug_log_state("start_transaction success");
return provider().start_transaction(ws_handle_);
default:
debug_log_state("start_transaction error");
assert(0);
return 1;
}
@ -518,7 +522,7 @@ int wsrep::transaction::after_statement()
case s_cert_failed:
client_state_.override_error(wsrep::e_deadlock_error);
lock.unlock();
ret = client_service_.rollback();
ret = client_service_.bf_rollback();
lock.lock();
if (state() != s_must_replay)
{
@ -554,6 +558,10 @@ int wsrep::transaction::after_statement()
break;
}
case s_aborted:
if (bf_aborted() && client_state_.current_error() == wsrep::e_success)
{
client_state_.override_error(wsrep::e_deadlock_error);
}
break;
default:
assert(0);
@ -799,7 +807,7 @@ int wsrep::transaction::certify_fragment(
sr_lock.lock();
sr_transaction.state(sr_lock, s_must_abort);
sr_lock.unlock();
sr_client_state.client_service().rollback();
sr_client_state.client_service().bf_rollback();
ret = 1;
break;
}