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

* Fixes to SST time server state management

Browse Source 
* Logging tweaks
* Boolean to tune behavior on exception
This commit is contained in:
Teemu Ollakka
2018-06-22 13:03:12 +03:00
parent 8f0e112c47
commit 1f6a6db1e9
12 changed files with 187 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/CMakeLists.txt
View File

@ -4,6 +4,7 @@
add_library(wsrep-lib
client_state.cpp
exception.cpp
gtid.cpp
id.cpp
logger.cpp

7
src/exception.cpp Normal file
View File

@ -0,0 +1,7 @@
//
// Copyright (C) 2018 Codership Oy <info@codership.com>
//
#include "wsrep/exception.hpp"
bool wsrep::abort_on_exception(false);

76
src/server_state.cpp
View File

@ -55,13 +55,50 @@ wsrep::server_state::~server_state()
delete provider_;
}
std::string wsrep::server_state::prepare_for_sst()
{
wsrep::unique_lock<wsrep::mutex> lock(mutex_);
state(lock, s_joiner);
return server_service_.sst_request();
}
int wsrep::server_state::start_sst(const std::string& sst_request,
const wsrep::gtid& gtid,
bool bypass)
{
wsrep::unique_lock<wsrep::mutex> lock(mutex_);
state(lock, s_donor);
int ret(0);
lock.unlock();
if (server_service_.start_sst(sst_request, gtid, bypass))
{
lock.lock();
wsrep::log_warning() << "SST start failed";
state(lock, s_synced);
ret = 1;
}
return ret;
}
void wsrep::server_state::sst_sent(const wsrep::gtid& gtid, int error)
{
provider_->sst_sent(gtid, error);
if (provider_->sst_sent(gtid, error))
{
server_service_.log_message(wsrep::log::warning,
"SST sent returned an error");
}
wsrep::unique_lock<wsrep::mutex> lock(mutex_);
state(lock, s_joined);
}
void wsrep::server_state::sst_received(const wsrep::gtid& gtid, int error)
{
provider_->sst_received(gtid, error);
if (provider_->sst_received(gtid, error))
{
throw wsrep::runtime_error("SST received failed");
}
wsrep::unique_lock<wsrep::mutex> lock(mutex_);
state(lock, s_joined);
}
void wsrep::server_state::wait_until_state(
@ -114,14 +151,14 @@ wsrep::server_state::causal_read(int timeout) const
void wsrep::server_state::on_connect()
{
wsrep::log() << "Server " << name_ << " connected to cluster";
wsrep::log_info() << "Server " << name_ << " connected to cluster";
wsrep::unique_lock<wsrep::mutex> lock(mutex_);
state(lock, s_connected);
}
void wsrep::server_state::on_view(const wsrep::view& view)
{
wsrep::log() << "================================================\nView:\n"
wsrep::log_info() << "================================================\nView:\n"
<< "id: " << view.state_id() << "\n"
<< "status: " << view.status() << "\n"
<< "own_index: " << view.own_index() << "\n"
@ -131,10 +168,10 @@ void wsrep::server_state::on_view(const wsrep::view& view)
for (std::vector<wsrep::view::member>::const_iterator i(members.begin());
i != members.end(); ++i)
{
wsrep::log() << "id: " << i->id() << " "
<< "name: " << i->name();
wsrep::log_info() << "id: " << i->id() << " "
<< "name: " << i->name();
}
wsrep::log() << "=================================================";
wsrep::log_info() << "=================================================";
wsrep::unique_lock<wsrep::mutex> lock(mutex_);
if (view.final())
{
@ -144,12 +181,23 @@ void wsrep::server_state::on_view(const wsrep::view& view)
void wsrep::server_state::on_sync()
{
wsrep::log() << "Server " << name_ << " synced with group";
wsrep::log_info() << "Server " << name_ << " synced with group";
wsrep::unique_lock<wsrep::mutex> lock(mutex_);
if (state_ != s_synced)
/* Follow the path joiner -> joined -> synced to notify possible
waiters. */
switch (state_)
{
case s_connected:
state(lock, s_joiner);
case s_joiner:
state(lock, s_joined);
case s_joined:
state(lock, s_synced);
}
break;
default:
/* State */
state(lock, s_synced);
};
}
int wsrep::server_state::on_apply(
@ -363,8 +411,8 @@ void wsrep::server_state::state(
{ 0, 1, 0, 1, 0, 0, 0, 0, 0}, /* dis */
{ 0, 0, 1, 0, 0, 0, 0, 0, 0}, /* ing */
{ 0, 0, 0, 1, 0, 1, 0, 0, 0}, /* ized */
{ 0, 0, 0, 0, 1, 0, 0, 1, 0}, /* cted */
{ 0, 0, 0, 0, 0, 1, 0, 1, 0}, /* jer */
{ 0, 0, 0, 0, 1, 0, 0, 0, 0}, /* cted */
{ 0, 0, 0, 0, 0, 1, 0, 0, 0}, /* jer */
{ 0, 0, 0, 0, 0, 0, 0, 1, 1}, /* jed */
{ 0, 0, 0, 0, 0, 1, 0, 0, 1}, /* dor */
{ 0, 0, 0, 0, 0, 1, 1, 0, 1}, /* sed */
@ -373,8 +421,8 @@ void wsrep::server_state::state(
if (allowed[state_][state])
{
wsrep::log() << "server " << name_ << " state change: "
<< state_ << " -> " << state;
wsrep::log_info() << "server " << name_ << " state change: "
<< state_ << " -> " << state;
state_ = state;
cond_.notify_all();
while (state_waiters_[state_])

36
src/wsrep_provider_v26.cpp
View File

@ -8,6 +8,7 @@
#include "wsrep/client_state.hpp"
#include "wsrep/view.hpp"
#include "wsrep/exception.hpp"
#include "wsrep/logger.hpp"
#include <wsrep_api.h>
@ -306,10 +307,10 @@ namespace
}
wsrep_cb_status_t view_cb(void* app_ctx,
void* recv_ctx __attribute__((unused)),
const wsrep_view_info_t* view_info,
const char*,
size_t)
void* recv_ctx __attribute__((unused)),
const wsrep_view_info_t* view_info,
const char*,
size_t)
{
assert(app_ctx);
assert(view_info);
@ -337,7 +338,7 @@ namespace
try
{
std::string req(server_state.server_service().sst_request());
std::string req(server_state.prepare_for_sst());
*sst_req = ::strdup(req.c_str());
*sst_req_len = strlen(req.c_str());
return WSREP_CB_SUCCESS;
@ -417,7 +418,7 @@ namespace
wsrep::gtid gtid(wsrep::id(req_gtid->uuid.data,
sizeof(req_gtid->uuid.data)),
wsrep::seqno(req_gtid->seqno));
if (server_state.server_service().start_sst(req, gtid, bypass))
if (server_state.start_sst(req, gtid, bypass))
{
return WSREP_CB_FAILURE;
}
@ -428,6 +429,27 @@ namespace
return WSREP_CB_FAILURE;
}
}
void logger_cb(wsrep_log_level_t level, const char* msg)
{
switch (level)
{
case WSREP_LOG_FATAL:
case WSREP_LOG_ERROR:
wsrep::log_error() << "wsrep-lib: " << msg;
break;
case WSREP_LOG_WARN:
wsrep::log_warning() << "wsrep-lib: " <<msg;
break;
case WSREP_LOG_INFO:
wsrep::log_info() << "wsrep-lib: " << msg;
break;
case WSREP_LOG_DEBUG:
wsrep::log_debug() << "wsrep-lib: " << msg;
break;
}
}
}
wsrep::wsrep_provider_v26::wsrep_provider_v26(
@ -448,7 +470,7 @@ wsrep::wsrep_provider_v26::wsrep_provider_v26(
init_args.proto_ver = 1;
init_args.state_id = 0;
init_args.state = 0;
init_args.logger_cb = 0;
init_args.logger_cb = &logger_cb;
init_args.connected_cb = &connected_cb;
init_args.view_cb = &view_cb;
init_args.sst_request_cb = &sst_request_cb;