lib/wsrep-lib
1
0
Fork 0
mirror of https://github.com/codership/wsrep-lib.git synced 2025-07-25 21:41:56 +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

2
include/wsrep/client_state.hpp
View File

@ -790,12 +790,10 @@ namespace wsrep
* passed to begin_nbo_phase_one(). * passed to begin_nbo_phase_one().
* *
* @param keys Key array. * @param keys Key array.
* @param has_error True if client thread has errored.
* @param wait_until Time point to wait until for entering TOI for * @param wait_until Time point to wait until for entering TOI for
* phase two. * phase two.
*/ */
int begin_nbo_phase_two(const wsrep::key_array& keys, int begin_nbo_phase_two(const wsrep::key_array& keys,
bool has_error,
std::chrono::time_point<wsrep::clock> std::chrono::time_point<wsrep::clock>
wait_until = wait_until =
std::chrono::time_point<wsrep::clock>()); std::chrono::time_point<wsrep::clock>());

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

4
test/nbo_test.cpp
View File

@ -50,7 +50,7 @@ BOOST_FIXTURE_TEST_CASE(test_local_nbo,
BOOST_REQUIRE(cc.toi_mode() == wsrep::client_state::m_undefined); BOOST_REQUIRE(cc.toi_mode() == wsrep::client_state::m_undefined);
// Second phase replicates the NBO end event and grabs TOI // Second phase replicates the NBO end event and grabs TOI
// again for finalizing the NBO. // again for finalizing the NBO.
BOOST_REQUIRE(cc.begin_nbo_phase_two(keys, false) == 0); BOOST_REQUIRE(cc.begin_nbo_phase_two(keys) == 0);
BOOST_REQUIRE(cc.mode() == wsrep::client_state::m_nbo); BOOST_REQUIRE(cc.mode() == wsrep::client_state::m_nbo);
BOOST_REQUIRE(cc.in_toi()); BOOST_REQUIRE(cc.in_toi());
BOOST_REQUIRE(cc.toi_mode() == wsrep::client_state::m_local); BOOST_REQUIRE(cc.toi_mode() == wsrep::client_state::m_local);
@ -126,7 +126,7 @@ BOOST_FIXTURE_TEST_CASE(test_applying_nbo,
key.append_key_part("k2", 2); key.append_key_part("k2", 2);
wsrep::key_array keys{key}; wsrep::key_array keys{key};
// Starting phase two should put nbo_cs in toi mode. // Starting phase two should put nbo_cs in toi mode.
BOOST_REQUIRE(nbo_cs->begin_nbo_phase_two(keys, false) == 0); BOOST_REQUIRE(nbo_cs->begin_nbo_phase_two(keys) == 0);
BOOST_REQUIRE(nbo_cs->mode() == wsrep::client_state::m_nbo); BOOST_REQUIRE(nbo_cs->mode() == wsrep::client_state::m_nbo);
BOOST_REQUIRE(nbo_cs->in_toi()); BOOST_REQUIRE(nbo_cs->in_toi());
BOOST_REQUIRE(nbo_cs->toi_mode() == wsrep::client_state::m_local); BOOST_REQUIRE(nbo_cs->toi_mode() == wsrep::client_state::m_local);