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

Some methods in wsrep-lib still hide/ignore return codes from provider

Browse Source 
which complicates diagnostics and debugging.

Don't ignore provider return codes and more verbose error logging for
sst_sent(), sst_received(), set_encryption_key() methods

Refs codership/wsrep-lib#127
This commit is contained in:
Alexey Yurchenko
2020-03-27 15:31:23 +02:00
parent 593f737605
commit daae4a9c35
6 changed files with 107 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/wsrep_provider_v26.cpp
View File

@ -37,6 +37,7 @@
#include <iostream>
#include <sstream>
#include <cstring> // strerror()
namespace
{
@ -71,6 +72,11 @@ namespace
case WSREP_NOT_ALLOWED:
return wsrep::provider::error_not_allowed;
}
wsrep::log_warning() << "Unexpected value for wsrep_status_t: "
<< status << " ("
<< (status < 0 ? strerror(-status) : "") << ')';
return wsrep::provider::error_unknown;
}
@ -661,9 +667,12 @@ wsrep::wsrep_provider_v26::wsrep_provider_v26(
if (key.size())
{
wsrep::const_buffer const_key(key.data(), key.size());
if(enc_set_key(const_key))
enum status const retval(enc_set_key(const_key));
if (retval != success)
{
throw wsrep::runtime_error("Failed to set encryption key");
std::string msg("Failed to set encryption key: ");
msg += to_string(retval);
throw wsrep::runtime_error(msg);
}
}
}
@ -941,40 +950,31 @@ wsrep::gtid wsrep::wsrep_provider_v26::last_committed_gtid() const
wsrep::seqno(wsrep_gtid.seqno));
}
int wsrep::wsrep_provider_v26::sst_sent(const wsrep::gtid& gtid, int err)
enum wsrep::provider::status
wsrep::wsrep_provider_v26::sst_sent(const wsrep::gtid& gtid, int err)
{
wsrep_gtid_t wsrep_gtid;
std::memcpy(wsrep_gtid.uuid.data, gtid.id().data(),
sizeof(wsrep_gtid.uuid.data));
wsrep_gtid.seqno = gtid.seqno().get();
if (wsrep_->sst_sent(wsrep_, &wsrep_gtid, err) != WSREP_OK)
{
return 1;
}
return 0;
return map_return_value(wsrep_->sst_sent(wsrep_, &wsrep_gtid, err));
}
int wsrep::wsrep_provider_v26::sst_received(const wsrep::gtid& gtid, int err)
enum wsrep::provider::status
wsrep::wsrep_provider_v26::sst_received(const wsrep::gtid& gtid, int err)
{
wsrep_gtid_t wsrep_gtid;
std::memcpy(wsrep_gtid.uuid.data, gtid.id().data(),
sizeof(wsrep_gtid.uuid.data));
wsrep_gtid.seqno = gtid.seqno().get();
if (wsrep_->sst_received(wsrep_, &wsrep_gtid, 0, err) != WSREP_OK)
{
return 1;
}
return 0;
return map_return_value(wsrep_->sst_received(wsrep_, &wsrep_gtid, 0, err));
}
int wsrep::wsrep_provider_v26::enc_set_key(const wsrep::const_buffer& key)
enum wsrep::provider::status
wsrep::wsrep_provider_v26::enc_set_key(const wsrep::const_buffer& key)
{
wsrep_enc_key_t enc_key = {key.data(), key.size()};
if (wsrep_->enc_set_key(wsrep_, &enc_key) != WSREP_OK)
{
return 1;
}
return 0;
return map_return_value(wsrep_->enc_set_key(wsrep_, &enc_key));
}
std::vector<wsrep::provider::status_variable>