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

Revert "codership/mariadb-wsrep#27 Galera cache encryption fixup"

Browse Source 
This reverts commit 043e8bc2ea.
This commit is contained in:
Teemu Ollakka
2019-01-21 14:12:10 +02:00
parent 043e8bc2ea
commit 476bcdb41e
7 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbsim/db_simulator.cpp
View File

@ -137,7 +137,7 @@ void db::simulator::start()
std::string server_options(params_.wsrep_provider_options);
if (server.server_state().load_provider(
params_.wsrep_provider, server_options, false))
params_.wsrep_provider, server_options))
{
throw wsrep::runtime_error("Failed to load provider");
}

3
include/wsrep/provider.hpp
View File

@ -384,8 +384,7 @@ namespace wsrep
static provider* make_provider(
wsrep::server_state&,
const std::string& provider_spec,
const std::string& provider_options,
bool encrypt);
const std::string& provider_options);
protected:
wsrep::server_state& server_state_;
};

3
include/wsrep/server_state.hpp
View File

@ -261,8 +261,7 @@ namespace wsrep
* @return Zero on success, non-zero on error.
*/
int load_provider(const std::string& provider,
const std::string& provider_options,
bool encrypt);
const std::string& provider_options);
void unload_provider();

5
src/provider.cpp
View File

@ -25,13 +25,12 @@
wsrep::provider* wsrep::provider::make_provider(
wsrep::server_state& server_state,
const std::string& provider_spec,
const std::string& provider_options,
bool const encrypt)
const std::string& provider_options)
{
try
{
return new wsrep::wsrep_provider_v26(
server_state, provider_options, provider_spec, encrypt);
server_state, provider_options, provider_spec);
}
catch (const wsrep::runtime_error& e)
{

5
src/server_state.cpp
View File

@ -335,15 +335,14 @@ static int apply_toi(wsrep::provider& provider,
//////////////////////////////////////////////////////////////////////////////
int wsrep::server_state::load_provider(const std::string& provider_spec,
const std::string& provider_options,
bool const encrypt)
const std::string& provider_options)
{
wsrep::log_info() << "Loading provider "
<< provider_spec
<< "initial position: "
<< initial_position_;
provider_ = wsrep::provider::make_provider(
*this, provider_spec, provider_options, encrypt);
*this, provider_spec, provider_options);
return (provider_ ? 0 : 1);
}

5
src/wsrep_provider_v26.cpp
View File

@ -567,8 +567,7 @@ namespace
wsrep::wsrep_provider_v26::wsrep_provider_v26(
wsrep::server_state& server_state,
const std::string& provider_options,
const std::string& provider_spec,
bool const encrypt)
const std::string& provider_spec)
: provider(server_state)
, wsrep_()
{
@ -592,7 +591,7 @@ wsrep::wsrep_provider_v26::wsrep_provider_v26(
init_args.connected_cb = &connected_cb;
init_args.view_cb = &view_cb;
init_args.sst_request_cb = &sst_request_cb;
init_args.encrypt_cb = encrypt ? &encrypt_cb : NULL;
init_args.encrypt_cb = &encrypt_cb;
init_args.apply_cb = &apply_cb;
init_args.unordered_cb = 0;
init_args.sst_donate_cb = &sst_donate_cb;

2
src/wsrep_provider_v26.hpp
View File

@ -31,7 +31,7 @@ namespace wsrep
public:
wsrep_provider_v26(wsrep::server_state&, const std::string&,
const std::string&, bool encrypt);
const std::string&);
~wsrep_provider_v26();
enum wsrep::provider::status
connect(const std::string&, const std::string&, const std::string&,