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

Fixes to local streaming replication processing.

Browse Source
This commit is contained in:
Teemu Ollakka
2018-07-08 15:27:49 +03:00
parent 2913aecebd
commit 7c424d8337
12 changed files with 122 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbsim/db_storage_service.hpp
View File

@ -12,7 +12,7 @@ namespace db
{
class storage_service : public wsrep::storage_service
{
int start_transaction() override
int start_transaction(const wsrep::ws_handle&) override
{ throw wsrep::not_implemented_error(); }
int append_fragment(const wsrep::id&,
wsrep::transaction_id,

7
include/wsrep/client_state.hpp
View File

@ -307,6 +307,12 @@ namespace wsrep
fragment_unit,
size_t fragment_size);
void disable_streaming()
{
assert(state_ == s_exec && mode_ == m_local);
transaction_.streaming_context_.disable();
}
/**
* Prepare write set meta data for fragment storage ordering.
* This method should be called from storage service commit
@ -316,7 +322,6 @@ namespace wsrep
const wsrep::ws_meta& ws_meta,
bool is_commit)
{
assert(mode_ == m_high_priority);
assert(state_ == s_exec);
return transaction_.prepare_for_fragment_ordering(
ws_handle, ws_meta, is_commit);

5
include/wsrep/storage_service.hpp
View File

@ -35,12 +35,11 @@ namespace wsrep
/**
* Start a new transaction for storage access.
*
* @param ws_hande Write set handle
* @param ws_meta Write set meta data
* @param[out] ws_handle Write set handle for a new transaction
*
* @return Zero in case of success, non-zero on error.
*/
virtual int start_transaction() = 0;
virtual int start_transaction(const wsrep::ws_handle&) = 0;
/**
* Append fragment into stable storage.

3
include/wsrep/streaming_context.hpp
View File

@ -46,9 +46,10 @@ namespace wsrep
fragment_size_ = 0;
}
void certified(wsrep::seqno seqno)
void certified(wsrep::seqno seqno, size_t bytes)
{
fragments_.push_back(seqno);
bytes_certified_ += bytes;
}
size_t fragments_certified() const

15
src/server_state.cpp
View File

@ -463,6 +463,20 @@ void wsrep::server_state::on_view(const wsrep::view& view)
if (view.status() == wsrep::view::primary)
{
wsrep::unique_lock<wsrep::mutex> lock(mutex_);
if (view.own_index() >= 0)
{
if (id_.is_undefined())
{
// No identifier was passed during server state initialization
// and the ID was generated by the provider.
id_ = view.members()[view.own_index()].id();
}
else
{
// Own identifier must not change between views.
// assert(id_ == view.members()[view.own_index()].id());
}
}
assert(view.final() == false);
//
@ -555,6 +569,7 @@ void wsrep::server_state::on_view(const wsrep::view& view)
assert(view.final());
wsrep::unique_lock<wsrep::mutex> lock(mutex_);
state(lock, s_disconnected);
id_ = wsrep::id::undefined();
}
}

52
src/transaction.cpp
View File

@ -64,9 +64,8 @@ namespace
~scoped_storage_service()
{
storage_service_->reset_globals();
client_service_.store_globals();
deleter_(storage_service_);
client_service_.store_globals();
}
private:
scoped_storage_service(const scoped_storage_service&);
@ -666,8 +665,15 @@ int wsrep::transaction::after_statement()
void wsrep::transaction::after_applying()
{
wsrep::unique_lock<wsrep::mutex> lock(client_state_.mutex_);
assert(state_ == s_committed || state_ == s_aborted);
debug_log_state("after_applying enter");
assert(state_ == s_executing ||
state_ == s_committed ||
state_ == s_aborted);
if (state_ != s_executing)
{
cleanup();
}
debug_log_state("after_applying leave");
}
bool wsrep::transaction::bf_abort(
@ -820,8 +826,17 @@ int wsrep::transaction::certify_fragment(
return 1;
}
// The rest of this method will be executed in storage service
// scope.
if (provider().append_data(ws_handle_,
wsrep::const_buffer(data.data(), data.size())))
{
lock.lock();
state(lock, s_must_abort);
return 1;
}
int ret(0);
// Storage service scope
{
scoped_storage_service<storage_service_deleter>
sr_scope(
client_service_,
@ -834,7 +849,7 @@ int wsrep::transaction::certify_fragment(
// This is done to ensure that there is enough capacity
// available to store the fragment. The fragment meta data
// is updated after certification.
if (storage_service.start_transaction())
if (storage_service.start_transaction(ws_handle_))
{
lock.lock();
state(lock, s_must_abort);
@ -842,8 +857,10 @@ int wsrep::transaction::certify_fragment(
return 1;
}
wsrep::id server_id(client_state_.server_state().id());
assert(server_id.is_undefined() == false);
if (storage_service.append_fragment(
client_state_.server_state().id(),
server_id,
id(),
flags_,
wsrep::const_buffer(data.data(), data.size())))
@ -854,27 +871,36 @@ int wsrep::transaction::certify_fragment(
return 1;
}
wsrep::ws_meta sr_ws_meta;
enum wsrep::provider::status
cert_ret(provider().certify(client_state_.id().get(),
ws_handle_,
flags_,
ws_meta_));
int ret(0);
sr_ws_meta));
switch (cert_ret)
{
case wsrep::provider::success:
streaming_context_.certified(ws_meta_.seqno());
if (storage_service.commit(ws_handle_, ws_meta_))
assert(sr_ws_meta.seqno().is_undefined() == false);
streaming_context_.certified(sr_ws_meta.seqno(), data.size());
if (storage_service.update_fragment_meta(sr_ws_meta))
{
ret = 1;
break;
}
wsrep::log_info() << "Committing "
<< sr_ws_meta.transaction_id().get();
if (storage_service.commit(ws_handle_, sr_ws_meta))
{
ret = 1;
}
break;
default:
storage_service.rollback(ws_handle_, ws_meta_);
storage_service.rollback(ws_handle_, sr_ws_meta);
ret = 1;
break;
}
provider().release(ws_handle_);
}
lock.lock();
if (ret)
{

2
test/mock_high_priority_service.cpp
View File

@ -64,5 +64,5 @@ int wsrep::mock_high_priority_service::apply_toi(const wsrep::ws_meta&,
void wsrep::mock_high_priority_service::after_apply()
{
client_state_->after_statement();
client_state_->after_applying();
}

19
test/mock_storage_service.cpp
View File

@ -28,29 +28,30 @@ wsrep::mock_storage_service::~mock_storage_service()
client_state_.cleanup();
}
int wsrep::mock_storage_service::start_transaction()
int wsrep::mock_storage_service::start_transaction(const wsrep::ws_handle& ws_handle)
{
return client_state_.start_transaction(
server_state_.next_transaction_id());
return client_state_.start_transaction(ws_handle.transaction_id());
}
int wsrep::mock_storage_service::commit(const wsrep::ws_handle& ws_handle,
const wsrep::ws_meta& ws_meta)
{
return client_state_.prepare_for_fragment_ordering(
int ret(client_state_.prepare_for_fragment_ordering(
ws_handle, ws_meta, true) ||
client_state_.before_commit() ||
client_state_.ordered_commit() ||
client_state_.after_commit() ||
client_state_.after_statement();
client_state_.after_commit());
client_state_.after_applying();
return ret;
}
int wsrep::mock_storage_service::rollback(const wsrep::ws_handle& ws_handle,
const wsrep::ws_meta& ws_meta)
{
return client_state_.prepare_for_fragment_ordering(
int ret(client_state_.prepare_for_fragment_ordering(
ws_handle, ws_meta, false) ||
client_state_.before_rollback() ||
client_state_.after_rollback() ||
client_state_.after_statement();
client_state_.after_rollback());
client_state_.after_applying();
return ret;
}

2
test/mock_storage_service.hpp
View File

@ -18,7 +18,7 @@ class mock_server_state;
wsrep::client_id);
~mock_storage_service();
int start_transaction() WSREP_OVERRIDE;
int start_transaction(const wsrep::ws_handle&) WSREP_OVERRIDE;
int append_fragment(const wsrep::id&,
wsrep::transaction_id,

4
test/server_context_test.cpp
View File

@ -172,7 +172,7 @@ BOOST_FIXTURE_TEST_CASE(server_state_sst_first_boostrap,
wsrep::id cluster_id("1");
wsrep::gtid state_id(cluster_id, wsrep::seqno(0));
std::vector<wsrep::view::member> members;
members.push_back(wsrep::view::member(wsrep::id("1"), "name", ""));
members.push_back(wsrep::view::member(wsrep::id("s1"), "name", ""));
wsrep::view bootstrap_view(state_id,
wsrep::seqno(1),
wsrep::view::primary,
@ -198,7 +198,7 @@ BOOST_FIXTURE_TEST_CASE(server_state_init_first_boostrap,
wsrep::id cluster_id("1");
wsrep::gtid state_id(cluster_id, wsrep::seqno(0));
std::vector<wsrep::view::member> members;
members.push_back(wsrep::view::member(wsrep::id("1"), "name", ""));
members.push_back(wsrep::view::member(wsrep::id("s1"), "name", ""));
wsrep::view bootstrap_view(state_id,
wsrep::seqno(1),
wsrep::view::primary,

4
test/transaction_test.cpp
View File

@ -950,7 +950,7 @@ BOOST_FIXTURE_TEST_CASE(transaction_1pc_applying,
BOOST_REQUIRE(tc.state() == wsrep::transaction::s_ordered_commit);
BOOST_REQUIRE(cc.after_commit() == 0);
BOOST_REQUIRE(tc.state() == wsrep::transaction::s_committed);
cc.after_statement();
cc.after_applying();
BOOST_REQUIRE(tc.state() == wsrep::transaction::s_committed);
BOOST_REQUIRE(tc.active() == false);
BOOST_REQUIRE(cc.current_error() == wsrep::e_success);
@ -964,7 +964,7 @@ BOOST_FIXTURE_TEST_CASE(transaction_applying_rollback,
BOOST_REQUIRE(tc.state() == wsrep::transaction::s_aborting);
BOOST_REQUIRE(cc.after_rollback() == 0);
BOOST_REQUIRE(tc.state() == wsrep::transaction::s_aborted);
cc.after_statement();
cc.after_applying();
BOOST_REQUIRE(tc.state() == wsrep::transaction::s_aborted);
BOOST_REQUIRE(tc.active() == false);
BOOST_REQUIRE(cc.current_error() == wsrep::e_success);

2
test/transaction_test_2pc.cpp
View File

@ -239,7 +239,7 @@ BOOST_FIXTURE_TEST_CASE(transaction_2pc_applying,
BOOST_REQUIRE(tc.state() == wsrep::transaction::s_ordered_commit);
BOOST_REQUIRE(cc.after_commit() == 0);
BOOST_REQUIRE(tc.state() == wsrep::transaction::s_committed);
BOOST_REQUIRE(cc.after_statement() == 0);
cc.after_applying();
BOOST_REQUIRE(tc.state() == wsrep::transaction::s_committed);
BOOST_REQUIRE(tc.active() == false);
BOOST_REQUIRE(cc.current_error() == wsrep::e_success);