lib/wsrep-lib
1
0
Fork 0
mirror of https://github.com/codership/wsrep-lib.git synced 2025-07-03 16:22:35 +03:00
Code Activity

handle nbo apply eror

Browse Source 
also, remove outdated comment
This commit is contained in:
Leandro Pacheco
2019-08-30 09:43:45 -03:00
committed by Teemu Ollakka
parent 5298d2340e
commit 594e34052d
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server_state.cpp
View File

@ -465,9 +465,9 @@ static int apply_toi(wsrep::provider& provider,
{
provider.commit_order_enter(ws_handle, ws_meta);
wsrep::mutable_buffer err;
int ret(high_priority_service.apply_nbo_begin(ws_meta, data, err));
provider.commit_order_leave(ws_handle, ws_meta, err);
return ret;
int const apply_err(high_priority_service.apply_nbo_begin(ws_meta, data, err));
int const vote_err(provider.commit_order_leave(ws_handle, ws_meta, err));
return resolve_return_error(err.size() > 0, vote_err, apply_err);
}
else if (wsrep::commits_transaction(ws_meta.flags()))
{

1
test/nbo_test.cpp
View File

@ -116,7 +116,6 @@ BOOST_FIXTURE_TEST_CASE(test_applying_nbo,
nbo_begin.size())) == 0);
wsrep::mock_client* nbo_cs(hps.nbo_cs());
BOOST_REQUIRE(nbo_cs);
// TODO(leandro): should applying side really be m_local here?
BOOST_REQUIRE(nbo_cs->toi_mode() == wsrep::client_state::m_undefined);
BOOST_REQUIRE(nbo_cs->mode() == wsrep::client_state::m_nbo);