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

remove has_error arg from begin_nbo_phase_two

Browse Source
This commit is contained in:
Leandro Pacheco
2019-09-17 16:52:29 -03:00
committed by Teemu Ollakka
parent b64fbe8fbc
commit 043ff7a7e9
3 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/client_state.cpp
View File

@ -615,7 +615,6 @@ int wsrep::client_state::enter_nbo_mode(const wsrep::ws_meta& ws_meta)
int wsrep::client_state::begin_nbo_phase_two(
const wsrep::key_array& keys,
bool has_error,
std::chrono::time_point<wsrep::clock> wait_until)
{
debug_log_state("begin_nbo_phase_two: enter");
@ -647,12 +646,7 @@ int wsrep::client_state::begin_nbo_phase_two(
toi_mode_ = m_local;
break;
case wsrep::provider::error_provider_failed:
// If the thread has already errored on the DBMS side, we
// don't override the error so the original one can be reported.
if (!has_error)
{
override_error(e_interrupted_error, status);
}
override_error(e_interrupted_error, status);
ret= 1;
break;
default: