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

Deal with init before SST case.

Browse Source
This commit is contained in:
Teemu Ollakka
2018-06-29 17:02:35 +03:00
parent 0851970c53
commit c35f59cb5b
6 changed files with 139 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/server_state.cpp
View File

@ -443,17 +443,24 @@ void wsrep::server_state::initialized()
wsrep::unique_lock<wsrep::mutex> lock(mutex_);
wsrep::log_info() << "Server initialized";
init_initialized_ = true;
state(lock, s_initialized);
if (sst_gtid_.is_undefined() == false &&
server_service_.sst_before_init())
if (server_service_.sst_before_init())
{
lock.unlock();
if (provider().sst_received(sst_gtid_, 0))
state(lock, s_initialized);
if (sst_gtid_.is_undefined() == false)
{
throw wsrep::runtime_error("SST received failed");
lock.unlock();
if (provider().sst_received(sst_gtid_, 0))
{
throw wsrep::runtime_error("SST received failed");
}
lock.lock();
sst_gtid_ = wsrep::gtid::undefined();
}
lock.lock();
sst_gtid_ = wsrep::gtid::undefined();
}
else
{
state(lock, s_initializing);
state(lock, s_initialized);
}
}
@ -545,14 +552,27 @@ void wsrep::server_state::on_view(const wsrep::view& view)
// all states leading to joined to notify possible state
// waiters in other threads.
//
if (state_ == s_connected)
if (server_service_.sst_before_init())
{
state(lock, s_joiner);
state(lock, s_initializing);
if (state_ == s_connected)
{
state(lock, s_joiner);
state(lock, s_initializing);
}
}
else
{
if (state_ == s_connected)
{
state(lock, s_joiner);
}
}
if (init_initialized_ == false)
{
lock.unlock();
server_service_.debug_sync("on_view_wait_initialized");
lock.lock();
wait_until_state(lock, s_initialized);
}
assert(init_initialized_);
@ -563,12 +583,26 @@ void wsrep::server_state::on_view(const wsrep::view& view)
bootstrap_ = false;
}
if (state_ == s_initialized)
if (server_service_.sst_before_init())
{
state(lock, s_joined);
if (init_synced_)
if (state_ == s_initialized)
{
state(lock, s_synced);
state(lock, s_joined);
if (init_synced_)
{
state(lock, s_synced);
}
}
}
else
{
if (state_ == s_joiner)
{
state(lock, s_joined);
if (init_synced_)
{
state(lock, s_synced);
}
}
}
}