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

codership/wsrep-lib#34 Handle sync-disconnected-sync for init first

Browse Source 
Handle init first case where state is cycled from synced to
disconnected and back synced without SST.
This commit is contained in:
Teemu Ollakka
2018-12-14 17:31:18 +02:00
parent ae0109f9b3
commit 1776537765
2 changed files with 56 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server_state.cpp
View File

@ -691,7 +691,7 @@ void wsrep::server_state::on_primary_view(
state(lock, s_initializing); state(lock, s_initializing);
if (init_initialized_) if (init_initialized_)
{ {
// If storage engines have already been initialized, // If server side has already been initialized,
// skip directly to s_joined. // skip directly to s_joined.
state(lock, s_initialized); state(lock, s_initialized);
state(lock, s_joined); state(lock, s_joined);
@ -710,6 +710,12 @@ void wsrep::server_state::on_primary_view(
{ {
state(lock, s_joiner); state(lock, s_joiner);
} }
if (init_initialized_)
{
// If server side has already been initialized,
// skip directly to s_joined.
state(lock, s_joined);
}
} }
if (init_initialized_ == false) if (init_initialized_ == false)

53
test/server_context_test.cpp
View File

@ -122,6 +122,20 @@ namespace
{ {
server_service.sst_before_init_ = false; server_service.sst_before_init_ = false;
} }
// Helper method to bootstrap the server with bootstrap view
void bootstrap()
{
ss.initialized();
BOOST_REQUIRE(ss.state() == wsrep::server_state::s_initialized);
BOOST_REQUIRE(ss.connect("cluster", "local", "0", false) == 0);
ss.on_connect(bootstrap_view);
BOOST_REQUIRE(ss.state() == wsrep::server_state::s_connected);
ss.on_view(bootstrap_view, &hps);
BOOST_REQUIRE(ss.state() == wsrep::server_state::s_joined);
ss.on_sync();
BOOST_REQUIRE(ss.state() == wsrep::server_state::s_synced);
}
}; };
} }
@ -290,12 +304,43 @@ BOOST_FIXTURE_TEST_CASE(
BOOST_FIXTURE_TEST_CASE(server_state_init_first_boostrap, BOOST_FIXTURE_TEST_CASE(server_state_init_first_boostrap,
init_first_server_fixture) init_first_server_fixture)
{ {
ss.initialized(); bootstrap();
BOOST_REQUIRE(ss.state() == wsrep::server_state::s_initialized); BOOST_REQUIRE(ss.state() == wsrep::server_state::s_synced);
}
// Cycle from synced state to disconnected and back to synced. Server
// storage engines remain initialized.
BOOST_FIXTURE_TEST_CASE(
server_state_init_first_synced_disconnected_synced_no_sst,
init_first_server_fixture)
{
bootstrap();
ss.disconnect();
BOOST_REQUIRE(ss.state() == wsrep::server_state::s_disconnecting);
final_view();
BOOST_REQUIRE(ss.state() == wsrep::server_state::s_disconnected);
// Connect back as a sole member in the cluster
BOOST_REQUIRE(ss.connect("cluster", "local", "0", false) == 0); BOOST_REQUIRE(ss.connect("cluster", "local", "0", false) == 0);
ss.on_connect(bootstrap_view); // @todo: s_connecting state would be good to have
BOOST_REQUIRE(ss.state() == wsrep::server_state::s_disconnected);
// Server state must keep the initialized state
BOOST_REQUIRE(ss.is_initialized() == true);
std::vector<wsrep::view::member> members;
members.push_back(wsrep::view::member(wsrep::id("s1"), "name", ""));
wsrep::view view(wsrep::gtid(cluster_id, wsrep::seqno(1)),
wsrep::seqno(2),
wsrep::view::primary,
0, // capabilities
0, // own index
1, // protocol version
members);
ss.on_connect(view);
BOOST_REQUIRE(ss.state() == wsrep::server_state::s_connected); BOOST_REQUIRE(ss.state() == wsrep::server_state::s_connected);
ss.on_view(bootstrap_view, &hps); // As storage engines have been initialized, there should not be
// any reason to wait for initialization. State should jump directly
// to s_joined after handling the view.
ss.on_view(view, &hps);
BOOST_REQUIRE(ss.state() == wsrep::server_state::s_joined); BOOST_REQUIRE(ss.state() == wsrep::server_state::s_joined);
ss.on_sync(); ss.on_sync();
BOOST_REQUIRE(ss.state() == wsrep::server_state::s_synced); BOOST_REQUIRE(ss.state() == wsrep::server_state::s_synced);