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

Extracted mock_server_service out of mock_server_state.

Browse Source
This commit is contained in:
Teemu Ollakka
2018-10-17 12:07:02 +03:00
parent c0c977f9ab
commit a9abb3a80a
6 changed files with 108 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wsrep/server_state.hpp
View File

@ -270,7 +270,10 @@ namespace wsrep
* *
* @throw wsrep::runtime_error if provider has not been loaded * @throw wsrep::runtime_error if provider has not been loaded
* *
* @todo This should not be virtual. * @todo This should not be virtual. However, currently there
* is no mechanism for tests and integrations to provide
* their own provider implementations, so this is kept virtual
* for time being.
*/ */
virtual wsrep::provider& provider() const virtual wsrep::provider& provider() const
{ {

40
test/client_state_fixture.hpp
View File

@ -31,7 +31,8 @@ namespace
struct replicating_client_fixture_sync_rm struct replicating_client_fixture_sync_rm
{ {
replicating_client_fixture_sync_rm() replicating_client_fixture_sync_rm()
: sc("s1", "s1", wsrep::server_state::rm_sync) : server_service(sc)
, sc("s1", "s1", wsrep::server_state::rm_sync, server_service)
, cc(sc, wsrep::client_id(1), , cc(sc, wsrep::client_id(1),
wsrep::client_state::m_local) wsrep::client_state::m_local)
, tc(cc.transaction()) , tc(cc.transaction())
@ -43,6 +44,7 @@ namespace
BOOST_REQUIRE(tc.active() == false); BOOST_REQUIRE(tc.active() == false);
BOOST_REQUIRE(tc.state() == wsrep::transaction::s_executing); BOOST_REQUIRE(tc.state() == wsrep::transaction::s_executing);
} }
wsrep::mock_server_service server_service;
wsrep::mock_server_state sc; wsrep::mock_server_state sc;
wsrep::mock_client cc; wsrep::mock_client cc;
const wsrep::transaction& tc; const wsrep::transaction& tc;
@ -51,7 +53,8 @@ namespace
struct replicating_client_fixture_async_rm struct replicating_client_fixture_async_rm
{ {
replicating_client_fixture_async_rm() replicating_client_fixture_async_rm()
: sc("s1", "s1", wsrep::server_state::rm_async) : server_service(sc)
, sc("s1", "s1", wsrep::server_state::rm_async, server_service)
, cc(sc, wsrep::client_id(1), , cc(sc, wsrep::client_id(1),
wsrep::client_state::m_local) wsrep::client_state::m_local)
, tc(cc.transaction()) , tc(cc.transaction())
@ -63,6 +66,7 @@ namespace
BOOST_REQUIRE(tc.active() == false); BOOST_REQUIRE(tc.active() == false);
BOOST_REQUIRE(tc.state() == wsrep::transaction::s_executing); BOOST_REQUIRE(tc.state() == wsrep::transaction::s_executing);
} }
wsrep::mock_server_service server_service;
wsrep::mock_server_state sc; wsrep::mock_server_state sc;
wsrep::mock_client cc; wsrep::mock_client cc;
const wsrep::transaction& tc; const wsrep::transaction& tc;
@ -71,7 +75,8 @@ namespace
struct replicating_client_fixture_2pc struct replicating_client_fixture_2pc
{ {
replicating_client_fixture_2pc() replicating_client_fixture_2pc()
: sc("s1", "s1", wsrep::server_state::rm_sync) : server_service(sc)
, sc("s1", "s1", wsrep::server_state::rm_sync, server_service)
, cc(sc, wsrep::client_id(1), , cc(sc, wsrep::client_id(1),
wsrep::client_state::m_local) wsrep::client_state::m_local)
, tc(cc.transaction()) , tc(cc.transaction())
@ -84,6 +89,7 @@ namespace
BOOST_REQUIRE(tc.active() == false); BOOST_REQUIRE(tc.active() == false);
BOOST_REQUIRE(tc.state() == wsrep::transaction::s_executing); BOOST_REQUIRE(tc.state() == wsrep::transaction::s_executing);
} }
wsrep::mock_server_service server_service;
wsrep::mock_server_state sc; wsrep::mock_server_state sc;
wsrep::mock_client cc; wsrep::mock_client cc;
const wsrep::transaction& tc; const wsrep::transaction& tc;
@ -92,7 +98,8 @@ namespace
struct replicating_client_fixture_autocommit struct replicating_client_fixture_autocommit
{ {
replicating_client_fixture_autocommit() replicating_client_fixture_autocommit()
: sc("s1", "s1", wsrep::server_state::rm_sync) : server_service(sc)
, sc("s1", "s1", wsrep::server_state::rm_sync, server_service)
, cc(sc, wsrep::client_id(1), , cc(sc, wsrep::client_id(1),
wsrep::client_state::m_local) wsrep::client_state::m_local)
, tc(cc.transaction()) , tc(cc.transaction())
@ -105,6 +112,7 @@ namespace
BOOST_REQUIRE(tc.active() == false); BOOST_REQUIRE(tc.active() == false);
BOOST_REQUIRE(tc.state() == wsrep::transaction::s_executing); BOOST_REQUIRE(tc.state() == wsrep::transaction::s_executing);
} }
wsrep::mock_server_service server_service;
wsrep::mock_server_state sc; wsrep::mock_server_state sc;
wsrep::mock_client cc; wsrep::mock_client cc;
const wsrep::transaction& tc; const wsrep::transaction& tc;
@ -113,8 +121,9 @@ namespace
struct applying_client_fixture struct applying_client_fixture
{ {
applying_client_fixture() applying_client_fixture()
: sc("s1", "s1", : server_service(sc)
wsrep::server_state::rm_async) , sc("s1", "s1",
wsrep::server_state::rm_async, server_service)
, cc(sc, , cc(sc,
wsrep::client_id(1), wsrep::client_id(1),
wsrep::client_state::m_high_priority) wsrep::client_state::m_high_priority)
@ -136,6 +145,7 @@ namespace
BOOST_REQUIRE(tc.certified() == true); BOOST_REQUIRE(tc.certified() == true);
BOOST_REQUIRE(tc.ordered() == true); BOOST_REQUIRE(tc.ordered() == true);
} }
wsrep::mock_server_service server_service;
wsrep::mock_server_state sc; wsrep::mock_server_state sc;
wsrep::mock_client cc; wsrep::mock_client cc;
const wsrep::transaction& tc; const wsrep::transaction& tc;
@ -144,8 +154,9 @@ namespace
struct applying_client_fixture_2pc struct applying_client_fixture_2pc
{ {
applying_client_fixture_2pc() applying_client_fixture_2pc()
: sc("s1", "s1", : server_service(sc)
wsrep::server_state::rm_async) , sc("s1", "s1",
wsrep::server_state::rm_async, server_service)
, cc(sc, , cc(sc,
wsrep::client_id(1), wsrep::client_id(1),
wsrep::client_state::m_high_priority) wsrep::client_state::m_high_priority)
@ -168,6 +179,7 @@ namespace
BOOST_REQUIRE(tc.certified() == true); BOOST_REQUIRE(tc.certified() == true);
BOOST_REQUIRE(tc.ordered() == true); BOOST_REQUIRE(tc.ordered() == true);
} }
wsrep::mock_server_service server_service;
wsrep::mock_server_state sc; wsrep::mock_server_state sc;
wsrep::mock_client cc; wsrep::mock_client cc;
const wsrep::transaction& tc; const wsrep::transaction& tc;
@ -176,7 +188,8 @@ namespace
struct streaming_client_fixture_row struct streaming_client_fixture_row
{ {
streaming_client_fixture_row() streaming_client_fixture_row()
: sc("s1", "s1", wsrep::server_state::rm_sync) : server_service(sc)
, sc("s1", "s1", wsrep::server_state::rm_sync, server_service)
, cc(sc, , cc(sc,
wsrep::client_id(1), wsrep::client_id(1),
wsrep::client_state::m_local) wsrep::client_state::m_local)
@ -190,6 +203,7 @@ namespace
BOOST_REQUIRE(tc.state() == wsrep::transaction::s_executing); BOOST_REQUIRE(tc.state() == wsrep::transaction::s_executing);
cc.enable_streaming(wsrep::streaming_context::row, 1); cc.enable_streaming(wsrep::streaming_context::row, 1);
} }
wsrep::mock_server_service server_service;
wsrep::mock_server_state sc; wsrep::mock_server_state sc;
wsrep::mock_client cc; wsrep::mock_client cc;
const wsrep::transaction& tc; const wsrep::transaction& tc;
@ -198,7 +212,8 @@ namespace
struct streaming_client_fixture_byte struct streaming_client_fixture_byte
{ {
streaming_client_fixture_byte() streaming_client_fixture_byte()
: sc("s1", "s1", wsrep::server_state::rm_sync) : server_service(sc)
, sc("s1", "s1", wsrep::server_state::rm_sync, server_service)
, cc(sc, , cc(sc,
wsrep::client_id(1), wsrep::client_id(1),
wsrep::client_state::m_local) wsrep::client_state::m_local)
@ -212,6 +227,7 @@ namespace
BOOST_REQUIRE(tc.state() == wsrep::transaction::s_executing); BOOST_REQUIRE(tc.state() == wsrep::transaction::s_executing);
cc.enable_streaming(wsrep::streaming_context::bytes, 1); cc.enable_streaming(wsrep::streaming_context::bytes, 1);
} }
wsrep::mock_server_service server_service;
wsrep::mock_server_state sc; wsrep::mock_server_state sc;
wsrep::mock_client cc; wsrep::mock_client cc;
const wsrep::transaction& tc; const wsrep::transaction& tc;
@ -220,7 +236,8 @@ namespace
struct streaming_client_fixture_statement struct streaming_client_fixture_statement
{ {
streaming_client_fixture_statement() streaming_client_fixture_statement()
: sc("s1", "s1", wsrep::server_state::rm_sync) : server_service(sc)
, sc("s1", "s1", wsrep::server_state::rm_sync, server_service)
, cc(sc, , cc(sc,
wsrep::client_id(1), wsrep::client_id(1),
wsrep::client_state::m_local) wsrep::client_state::m_local)
@ -235,6 +252,7 @@ namespace
cc.enable_streaming(wsrep::streaming_context::row, 1); cc.enable_streaming(wsrep::streaming_context::row, 1);
} }
wsrep::mock_server_service server_service;
wsrep::mock_server_state sc; wsrep::mock_server_state sc;
wsrep::mock_client cc; wsrep::mock_client cc;
const wsrep::transaction& tc; const wsrep::transaction& tc;

88
test/mock_server_state.hpp
View File

@ -17,8 +17,8 @@
* along with wsrep-lib. If not, see <https://www.gnu.org/licenses/>. * along with wsrep-lib. If not, see <https://www.gnu.org/licenses/>.
*/ */
#ifndef WSREP_MOCK_SERVER_CONTEXT_HPP #ifndef WSREP_MOCK_SERVER_STATE_HPP
#define WSREP_MOCK_SERVER_CONTEXT_HPP #define WSREP_MOCK_SERVER_STATE_HPP
#include "wsrep/server_state.hpp" #include "wsrep/server_state.hpp"
#include "wsrep/server_service.hpp" #include "wsrep/server_service.hpp"
@ -31,50 +31,42 @@
namespace wsrep namespace wsrep
{ {
class mock_server_state class mock_server_service : public wsrep::server_service
: public wsrep::server_state
, public wsrep::server_service
{ {
public: public:
mock_server_state(const std::string& name, mock_server_service(wsrep::server_state& server_state)
const std::string& id, : sync_point_enabled_()
enum wsrep::server_state::rollback_mode rollback_mode)
: wsrep::server_state(mutex_, cond_, *this,
name, id, "", "", "./", wsrep::gtid::undefined(), 1, rollback_mode)
, sync_point_enabled_()
, sync_point_action_() , sync_point_action_()
, sst_before_init_() , sst_before_init_()
, mutex_() , server_state_(server_state)
, cond_()
, provider_(*this)
, last_client_id_(0) , last_client_id_(0)
, last_transaction_id_(0) , last_transaction_id_(0)
{ } { }
wsrep::mock_provider& provider() const
{ return provider_; }
wsrep::storage_service* storage_service(wsrep::client_service&) wsrep::storage_service* storage_service(wsrep::client_service&)
WSREP_OVERRIDE
{ {
return new wsrep::mock_storage_service(*this, return new wsrep::mock_storage_service(server_state_,
wsrep::client_id(++last_client_id_)); wsrep::client_id(++last_client_id_));
} }
wsrep::storage_service* storage_service(wsrep::high_priority_service&) wsrep::storage_service* storage_service(wsrep::high_priority_service&)
WSREP_OVERRIDE
{ {
return new wsrep::mock_storage_service(*this, return new wsrep::mock_storage_service(server_state_,
wsrep::client_id(++last_client_id_)); wsrep::client_id(++last_client_id_));
} }
void release_storage_service(wsrep::storage_service* storage_service) void release_storage_service(wsrep::storage_service* storage_service)
WSREP_OVERRIDE
{ {
delete storage_service; delete storage_service;
} }
wsrep::client_state* local_client_state() wsrep::client_state* local_client_state() WSREP_OVERRIDE
{ {
wsrep::client_state* ret(new wsrep::mock_client( wsrep::client_state* ret(new wsrep::mock_client(
*this, server_state_,
wsrep::client_id(++last_client_id_), wsrep::client_id(++last_client_id_),
wsrep::client_state::m_local)); wsrep::client_state::m_local));
ret->open(ret->id()); ret->open(ret->id());
@ -82,33 +74,37 @@ namespace wsrep
} }
void release_client_state(wsrep::client_state* client_state) void release_client_state(wsrep::client_state* client_state)
WSREP_OVERRIDE
{ {
delete client_state; delete client_state;
} }
wsrep::high_priority_service* streaming_applier_service( wsrep::high_priority_service* streaming_applier_service(
wsrep::client_service&) wsrep::client_service&)
WSREP_OVERRIDE
{ {
wsrep::mock_client* cs(new wsrep::mock_client( wsrep::mock_client* cs(new wsrep::mock_client(
*this, server_state_,
wsrep::client_id(++last_client_id_), wsrep::client_id(++last_client_id_),
wsrep::client_state::m_high_priority)); wsrep::client_state::m_high_priority));
wsrep::mock_high_priority_service* ret( wsrep::mock_high_priority_service* ret(
new wsrep::mock_high_priority_service(*this, cs, false)); new wsrep::mock_high_priority_service(server_state_,
cs, false));
cs->open(cs->id()); cs->open(cs->id());
cs->before_command(); cs->before_command();
return ret; return ret;
} }
wsrep::high_priority_service* streaming_applier_service( wsrep::high_priority_service* streaming_applier_service(
wsrep::high_priority_service&) wsrep::high_priority_service&) WSREP_OVERRIDE
{ {
wsrep::mock_client* cs(new wsrep::mock_client( wsrep::mock_client* cs(new wsrep::mock_client(
*this, server_state_,
wsrep::client_id(++last_client_id_), wsrep::client_id(++last_client_id_),
wsrep::client_state::m_high_priority)); wsrep::client_state::m_high_priority));
wsrep::mock_high_priority_service* ret( wsrep::mock_high_priority_service* ret(
new wsrep::mock_high_priority_service(*this, cs, false)); new wsrep::mock_high_priority_service(server_state_,
cs, false));
cs->open(cs->id()); cs->open(cs->id());
cs->before_command(); cs->before_command();
return ret; return ret;
@ -130,15 +126,17 @@ namespace wsrep
} }
void bootstrap() WSREP_OVERRIDE { } void bootstrap() WSREP_OVERRIDE { }
void log_message(enum wsrep::log::level level, const char* message) void log_message(enum wsrep::log::level level, const char* message)
WSREP_OVERRIDE
{ {
wsrep::log(level, name().c_str()) << message; wsrep::log(level, server_state_.name().c_str()) << message;
} }
void log_dummy_write_set(wsrep::client_state&, void log_dummy_write_set(wsrep::client_state&,
const wsrep::ws_meta&) const wsrep::ws_meta&)
WSREP_OVERRIDE WSREP_OVERRIDE
{ {
} }
void log_view(wsrep::high_priority_service*, const wsrep::view&) { } void log_view(wsrep::high_priority_service*, const wsrep::view&)
WSREP_OVERRIDE { }
void log_state_change(enum wsrep::server_state::state, void log_state_change(enum wsrep::server_state::state,
enum wsrep::server_state::state) enum wsrep::server_state::state)
{ } { }
@ -169,7 +167,7 @@ namespace wsrep
switch (sync_point_action_) switch (sync_point_action_)
{ {
case spa_initialize: case spa_initialize:
initialized(); server_state_.initialized();
break; break;
} }
} }
@ -183,12 +181,36 @@ namespace wsrep
bool sst_before_init_; bool sst_before_init_;
private: private:
wsrep::default_mutex mutex_; wsrep::server_state& server_state_;
wsrep::default_condition_variable cond_;
mutable wsrep::mock_provider provider_;
unsigned long long last_client_id_; unsigned long long last_client_id_;
unsigned long long last_transaction_id_; unsigned long long last_transaction_id_;
}; };
class mock_server_state : public wsrep::server_state
{
public:
mock_server_state(const std::string& name,
const std::string& id,
enum wsrep::server_state::rollback_mode rollback_mode,
wsrep::server_service& server_service)
: wsrep::server_state(mutex_, cond_, server_service,
name, id, "", "", "./",
wsrep::gtid::undefined(),
1,
rollback_mode)
, mutex_()
, cond_()
, provider_(*this)
{ }
wsrep::mock_provider& provider() const WSREP_OVERRIDE
{ return provider_; }
private:
wsrep::default_mutex mutex_;
wsrep::default_condition_variable cond_;
mutable wsrep::mock_provider provider_;
};
} }
#endif // WSREP_MOCK_SERVER_CONTEXT_HPP #endif // WSREP_MOCK_SERVER_STATE_HPP

2
test/mock_storage_service.cpp
View File

@ -23,7 +23,7 @@
#include "wsrep/client_state.hpp" #include "wsrep/client_state.hpp"
wsrep::mock_storage_service::mock_storage_service( wsrep::mock_storage_service::mock_storage_service(
wsrep::mock_server_state& server_state, wsrep::server_state& server_state,
wsrep::client_id client_id) wsrep::client_id client_id)
: server_state_(server_state) : server_state_(server_state)
, client_service_(client_state_) , client_service_(client_state_)

5
test/mock_storage_service.hpp
View File

@ -29,8 +29,7 @@ class mock_server_state;
class mock_storage_service : public wsrep::storage_service class mock_storage_service : public wsrep::storage_service
{ {
public: public:
mock_storage_service(wsrep::mock_server_state&, mock_storage_service(wsrep::server_state&, wsrep::client_id);
wsrep::client_id);
~mock_storage_service(); ~mock_storage_service();
int start_transaction(const wsrep::ws_handle&) WSREP_OVERRIDE; int start_transaction(const wsrep::ws_handle&) WSREP_OVERRIDE;
@ -56,7 +55,7 @@ class mock_server_state;
void store_globals() WSREP_OVERRIDE { } void store_globals() WSREP_OVERRIDE { }
void reset_globals() WSREP_OVERRIDE { } void reset_globals() WSREP_OVERRIDE { }
private: private:
wsrep::mock_server_state& server_state_; wsrep::server_state& server_state_;
wsrep::mock_client_service client_service_; wsrep::mock_client_service client_service_;
wsrep::mock_client_state client_state_; wsrep::mock_client_state client_state_;
}; };

43
test/server_context_test.cpp
View File

@ -26,8 +26,9 @@ namespace
struct applying_server_fixture struct applying_server_fixture
{ {
applying_server_fixture() applying_server_fixture()
: ss("s1", "s1", : server_service(ss)
wsrep::server_state::rm_sync) , ss("s1", "s1",
wsrep::server_state::rm_sync, server_service)
, cc(ss, , cc(ss,
wsrep::client_id(1), wsrep::client_id(1),
wsrep::client_state::m_high_priority) wsrep::client_state::m_high_priority)
@ -41,8 +42,9 @@ namespace
wsrep::provider::flag::commit) wsrep::provider::flag::commit)
{ {
cc.open(cc.id()); cc.open(cc.id());
cc.before_command(); BOOST_REQUIRE(cc.before_command() == 0);
} }
wsrep::mock_server_service server_service;
wsrep::mock_server_state ss; wsrep::mock_server_state ss;
wsrep::mock_client cc; wsrep::mock_client cc;
wsrep::mock_high_priority_service hps; wsrep::mock_high_priority_service hps;
@ -55,7 +57,7 @@ namespace
sst_first_server_fixture() sst_first_server_fixture()
: applying_server_fixture() : applying_server_fixture()
{ {
ss.sst_before_init_ = true; server_service.sst_before_init_ = true;
} }
}; };
@ -64,10 +66,9 @@ namespace
init_first_server_fixture() init_first_server_fixture()
: applying_server_fixture() : applying_server_fixture()
{ {
ss.sst_before_init_ = false; server_service.sst_before_init_ = false;
} }
}; };
} }
// Test on_apply() method for 1pc // Test on_apply() method for 1pc
@ -121,24 +122,14 @@ BOOST_FIXTURE_TEST_CASE(server_state_applying_2pc_rollback,
BOOST_REQUIRE(txc.state() == wsrep::transaction::s_aborted); BOOST_REQUIRE(txc.state() == wsrep::transaction::s_aborted);
} }
BOOST_AUTO_TEST_CASE(server_state_streaming) BOOST_FIXTURE_TEST_CASE(server_state_streaming, applying_server_fixture)
{ {
wsrep::mock_server_state ss("s1", "s1", ws_meta = wsrep::ws_meta(wsrep::gtid(wsrep::id("1"), wsrep::seqno(1)),
wsrep::server_state::rm_sync); wsrep::stid(wsrep::id("1"),
wsrep::mock_client cc(ss, wsrep::transaction_id(1),
wsrep::client_id(1), wsrep::client_id(1)),
wsrep::client_state::m_high_priority); wsrep::seqno(0),
cc.debug_log_level(1); wsrep::provider::flag::start_transaction);
wsrep::mock_high_priority_service hps(ss, &cc, false);
wsrep::ws_handle ws_handle(wsrep::transaction_id(1), (void*)1);
wsrep::ws_meta ws_meta(wsrep::gtid(wsrep::id("1"), wsrep::seqno(1)),
wsrep::stid(wsrep::id("1"),
wsrep::transaction_id(1),
wsrep::client_id(1)),
wsrep::seqno(0),
wsrep::provider::flag::start_transaction);
cc.open(cc.id());
BOOST_REQUIRE(cc.before_command() == 0);
BOOST_REQUIRE(ss.on_apply(hps, ws_handle, ws_meta, BOOST_REQUIRE(ss.on_apply(hps, ws_handle, ws_meta,
wsrep::const_buffer("1", 1)) == 0); wsrep::const_buffer("1", 1)) == 0);
BOOST_REQUIRE(ss.find_streaming_applier( BOOST_REQUIRE(ss.find_streaming_applier(
@ -205,10 +196,10 @@ BOOST_FIXTURE_TEST_CASE(server_state_sst_first_boostrap,
BOOST_REQUIRE(ss.connect("cluster", "local", "0", false) == 0); BOOST_REQUIRE(ss.connect("cluster", "local", "0", false) == 0);
ss.on_connect(wsrep::gtid(cluster_id, wsrep::seqno(0))); ss.on_connect(wsrep::gtid(cluster_id, wsrep::seqno(0)));
BOOST_REQUIRE(ss.state() == wsrep::server_state::s_connected); BOOST_REQUIRE(ss.state() == wsrep::server_state::s_connected);
ss.sync_point_enabled_ = "on_view_wait_initialized"; server_service.sync_point_enabled_ = "on_view_wait_initialized";
ss.sync_point_action_ = ss.spa_initialize; server_service.sync_point_action_ = server_service.spa_initialize;
ss.on_view(bootstrap_view, &hps); ss.on_view(bootstrap_view, &hps);
ss.sync_point_enabled_ = ""; server_service.sync_point_enabled_ = "";
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);