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

After applying call, BF abort fixes

Browse Source 
* Added after applying call for high priority threads in order to
  avoid client mode complexity in after_statement() call and
  make high prio transaction cleanup possible
* Mask connection failed error with deadlock error if provider
  returns connection failed and the transaction was BF aborted
This commit is contained in:
Teemu Ollakka
2018-07-04 14:28:54 +03:00
parent 4d59ade77b
commit a7f8728c12
3 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wsrep/client_state.hpp
View File

@ -246,6 +246,15 @@ namespace wsrep
enum after_statement_result after_statement();
/** @} */
/**
* Perform cleanup after applying a transaction.
*/
void after_applying()
{
assert(mode_ == m_high_priority);
transaction_.after_applying();
}
/** @name Replication interface */
/** @{ */
/**

7
include/wsrep/transaction.hpp
View File

@ -113,8 +113,14 @@ namespace wsrep
int after_statement();
void after_applying();
bool bf_abort(wsrep::unique_lock<wsrep::mutex>& lock,
wsrep::seqno bf_seqno);
bool bf_aborted() const
{
return (bf_abort_client_state_ != 0);
}
int flags() const
{
@ -145,6 +151,7 @@ namespace wsrep
enum state state_;
std::vector<enum state> state_hist_;
enum state bf_abort_state_;
enum wsrep::provider::status bf_abort_provider_status_;
int bf_abort_client_state_;
wsrep::ws_handle ws_handle_;
wsrep::ws_meta ws_meta_;

30
src/transaction.cpp
View File

@ -31,6 +31,7 @@ wsrep::transaction::transaction(
, state_(s_executing)
, state_hist_()
, bf_abort_state_(s_executing)
, bf_abort_provider_status_()
, bf_abort_client_state_()
, ws_handle_()
, ws_meta_()
@ -588,6 +589,13 @@ int wsrep::transaction::after_statement()
return ret;
}
void wsrep::transaction::after_applying()
{
wsrep::unique_lock<wsrep::mutex> lock(client_state_.mutex_);
assert(state_ == s_committed || state_ == s_aborted);
cleanup();
}
bool wsrep::transaction::bf_abort(
wsrep::unique_lock<wsrep::mutex>& lock WSREP_UNUSED,
wsrep::seqno bf_seqno)
@ -920,9 +928,20 @@ int wsrep::transaction::certify_commit(
client_state_.override_error(wsrep::e_error_during_commit);
break;
case wsrep::provider::error_connection_failed:
case wsrep::provider::error_provider_failed:
// Galera provider may return CONN_FAIL if the trx is
// BF aborted O_o
// BF aborted O_o. If we see here that the trx was BF aborted,
// return deadlock error instead of error during commit
// to reduce number of error state combinations elsewhere.
if (state() == s_must_abort)
{
client_state_.override_error(wsrep::e_deadlock_error);
}
else
{
client_state_.override_error(wsrep::e_error_during_commit);
}
break;
case wsrep::provider::error_provider_failed:
if (state() != s_must_abort)
{
state(lock, s_must_abort);
@ -983,6 +1002,9 @@ void wsrep::transaction::cleanup()
{
client_state_.update_last_written_gtid(ws_meta_.gtid());
}
bf_abort_state_ = s_executing;
bf_abort_provider_status_ = wsrep::provider::success;
bf_abort_client_state_ = 0;
ws_meta_ = wsrep::ws_meta();
certified_ = false;
pa_unsafe_ = false;
@ -999,7 +1021,7 @@ void wsrep::transaction::debug_log_state(
<< "," << int64_t(id_.get())
<< "," << ws_meta_.seqno().get()
<< "," << wsrep::to_string(state_)
<< ","
<< wsrep::to_string(client_state_.current_error())
<< "," << wsrep::to_string(bf_abort_state_)
<< "," << wsrep::to_string(client_state_.current_error())
<< ")");
}