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

Fixes to SR rollback:

Browse Source 
* Enable codepath to BF abort high priority SR applier
* Pass ws_handle, ws_meta to high priority service rollback
  call to allow total ordering of rollback process
This commit is contained in:
Teemu Ollakka
2018-07-12 18:00:52 +03:00
parent 3f4e5dea3b
commit 22d7a31d81
7 changed files with 55 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server_state.cpp
View File

@ -95,7 +95,9 @@ static int rollback_fragment(wsrep::server_state& server_state,
{
wsrep::high_priority_switch ws(
high_priority_service, *streaming_applier);
streaming_applier->rollback();
// Streaming applier rolls back out of order. Fragment
// removal grabs commit order below.
streaming_applier->rollback(wsrep::ws_handle(), wsrep::ws_meta());
streaming_applier->after_apply();
}
server_state.stop_streaming_applier(
@ -132,7 +134,7 @@ static int apply_write_set(wsrep::server_state& server_state,
high_priority_service.commit(ws_handle, ws_meta);
if (ret)
{
high_priority_service.rollback();
high_priority_service.rollback(ws_handle, ws_meta);
}
high_priority_service.after_apply();
}

29
src/transaction.cpp
View File

@ -561,8 +561,12 @@ int wsrep::transaction::before_rollback()
}
break;
case wsrep::client_state::m_high_priority:
assert(state_ == s_executing);
state(lock, s_aborting);
// Rollback by rollback write set or BF abort
assert(state_ == s_executing || state_ == s_aborting);
if (state_ != s_aborting)
{
state(lock, s_aborting);
}
break;
default:
assert(0);
@ -809,9 +813,13 @@ bool wsrep::transaction::bf_abort(
if (ret)
{
bf_abort_client_state_ = client_state_.state();
if (client_state_.state() == wsrep::client_state::s_idle &&
client_state_.server_state().rollback_mode() ==
wsrep::server_state::rm_sync)
if ((client_state_.state() == wsrep::client_state::s_idle &&
client_state_.server_state().rollback_mode() ==
wsrep::server_state::rm_sync) // locally processing idle
||
// high priority streaming
(client_state_.mode() == wsrep::client_state::m_high_priority &&
is_streaming()))
{
// We need to change the state to aborting under the
// lock protection to avoid a race between client thread,
@ -821,7 +829,6 @@ bool wsrep::transaction::bf_abort(
state(lock, wsrep::transaction::s_aborting);
if (client_state_.mode() == wsrep::client_state::m_high_priority)
{
assert(is_streaming());
client_state_.server_state().stop_streaming_applier(
server_id_, id_);
}
@ -878,6 +885,10 @@ void wsrep::transaction::state(
if (allowed[state_][next_state])
{
state_hist_.push_back(state_);
if (state_hist_.size() == 12)
{
state_hist_.erase(state_hist_.begin());
}
state_ = next_state;
}
else
@ -1006,8 +1017,13 @@ int wsrep::transaction::certify_fragment(
}
client_state_.override_error(wsrep::e_deadlock_error);
}
else if (state_ == s_must_abort)
{
client_state_.override_error(wsrep::e_deadlock_error);
}
else
{
assert(state_ == s_certifying);
state(lock, s_executing);
flags(flags() & ~wsrep::provider::flag::start_transaction);
}
@ -1221,6 +1237,7 @@ void wsrep::transaction::streaming_rollback()
sa->adopt_transaction(*this);
streaming_context_.cleanup();
streaming_context_.rolled_back(id_);
client_service_.debug_sync("wsrep_before_SR_rollback");
enum wsrep::provider::status ret;
if ((ret = provider().rollback(id_)))
{