hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2020 Replace ss[_info]_dassert with mxb_assert[_message]

Browse Source
This commit is contained in:
Johan Wikman
2018-08-22 09:59:02 +03:00
parent b1e405442f
commit 3f53eddbde
161 changed files with 1640 additions and 1643 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/monitor/auroramon/auroramon.cc
View File

@ -68,7 +68,7 @@ void AuroraMonitor::update_server_status(MXS_MONITORED_SERVER* monitored_server)
"WHERE session_id = 'MASTER_SESSION_ID'") == 0 &&
(result = mysql_store_result(monitored_server->con)))
{
ss_dassert(mysql_field_count(monitored_server->con) == 2);
mxb_assert(mysql_field_count(monitored_server->con) == 2);
MYSQL_ROW row = mysql_fetch_row(result);
int status = SERVER_SLAVE;

2
server/modules/monitor/galeramon/galeramon.cc
View File

@ -183,7 +183,7 @@ void GaleraMonitor::update_server_status(MXS_MONITORED_SERVER* monitored_server)
info.local_index = local_index;
}
ss_dassert(row[0] && row[1]);
mxb_assert(row[0] && row[1]);
if (strcmp(row[0], "wsrep_local_state") == 0)
{

14
server/modules/monitor/mariadbmon/cluster_discovery.cc
View File

@ -119,7 +119,7 @@ void MariaDBMonitor::tarjan_scc_visit_node(MariaDBServer *node, ServerArray* sta
auto cycle_ind = *next_cycle;
while (true)
{
ss_dassert(!stack->empty());
mxb_assert(!stack->empty());
MariaDBServer* cycle_server = stack->back();
NodeData& cycle_node = cycle_server->m_node;
stack->pop_back();
@ -246,7 +246,7 @@ void MariaDBMonitor::find_graph_cycles()
*/
MariaDBServer* MariaDBMonitor::find_best_reach_server(const ServerArray& candidates)
{
ss_dassert(!candidates.empty());
mxb_assert(!candidates.empty());
MariaDBServer* best_reach = NULL;
/* Search for the server with the best reach. */
for (auto iter = candidates.begin(); iter != candidates.end(); iter++)
@ -373,7 +373,7 @@ static void node_reach_visit(MariaDBServer* node, int* reach)
*/
void MariaDBMonitor::calculate_node_reach(MariaDBServer* node)
{
ss_dassert(node && node->m_node.reach == NodeData::REACH_UNKNOWN);
mxb_assert(node && node->m_node.reach == NodeData::REACH_UNKNOWN);
// Reset indexes since they will be reused.
reset_node_index_info();
@ -395,7 +395,7 @@ MariaDBServer* MariaDBMonitor::find_master_inside_cycle(ServerArray& cycle_membe
for (auto iter = cycle_members.begin(); iter != cycle_members.end(); iter++)
{
MariaDBServer* server = *iter;
ss_dassert(server->m_node.cycle != NodeData::CYCLE_NONE);
mxb_assert(server->m_node.cycle != NodeData::CYCLE_NONE);
if (server->is_usable() && !server->is_read_only())
{
return server;
@ -474,7 +474,7 @@ void MariaDBMonitor::assign_server_roles()
*/
void MariaDBMonitor::assign_slave_and_relay_master(MariaDBServer* start_node)
{
ss_dassert(start_node->m_node.index == NodeData::INDEX_NOT_VISITED);
mxb_assert(start_node->m_node.index == NodeData::INDEX_NOT_VISITED);
// Combines a node with its connection state. The state tracks whether there is a series of
// running slave connections all the way to the master server. If even one server is down or
// a connection is broken in the series, the link is considered stale.
@ -754,7 +754,7 @@ void MariaDBMonitor::update_topology()
const char sel_new_master[] = "Selecting new master server.";
if (m_master)
{
ss_dassert(!reason_not_valid.empty());
mxb_assert(!reason_not_valid.empty());
MXS_WARNING("The current master server '%s' is no longer valid because %s. %s",
m_master->name(), reason_not_valid.c_str(), sel_new_master);
}
@ -796,7 +796,7 @@ void MariaDBMonitor::update_topology()
{
if (m_master)
{
ss_dassert(!reason_not_valid.empty());
mxb_assert(!reason_not_valid.empty());
MXS_WARNING("The current master server '%s' is no longer valid because %s, "
"but there is no valid alternative to swap to.",
m_master->name(), reason_not_valid.c_str());

14
server/modules/monitor/mariadbmon/cluster_manipulation.cc
View File

@ -205,7 +205,7 @@ string MariaDBMonitor::generate_change_master_cmd(const string& master_host, int
int MariaDBMonitor::redirect_slaves(MariaDBServer* new_master, const ServerArray& slaves,
ServerArray* redirected_slaves)
{
ss_dassert(redirected_slaves != NULL);
mxb_assert(redirected_slaves != NULL);
MXS_NOTICE("Redirecting slaves to new master.");
string change_cmd = generate_change_master_cmd(new_master->m_server_base->server->address,
new_master->m_server_base->server->port);
@ -351,7 +351,7 @@ bool MariaDBMonitor::cluster_can_be_joined()
*/
bool MariaDBMonitor::get_joinable_servers(ServerArray* output)
{
ss_dassert(output);
mxb_assert(output);
// Whether a join operation should be attempted or not depends on several criteria. Start with the ones
// easiest to test. Go though all slaves and construct a preliminary list.
@ -476,7 +476,7 @@ bool MariaDBMonitor::server_is_rejoin_suspect(MariaDBServer* rejoin_cand, json_t
bool MariaDBMonitor::do_switchover(MariaDBServer* demotion_target, MariaDBServer* promotion_target,
json_t** err_out)
{
ss_dassert(demotion_target && promotion_target);
mxb_assert(demotion_target && promotion_target);
// Total time limit on how long this operation may take. Checked and modified after significant steps are
// completed.
@ -818,7 +818,7 @@ bool MariaDBMonitor::switchover_wait_slaves_catchup(const ServerArray& slaves, c
bool MariaDBMonitor::wait_cluster_stabilization(MariaDBServer* new_master, const ServerArray& slaves,
int seconds_remaining)
{
ss_dassert(!slaves.empty());
mxb_assert(!slaves.empty());
bool rval = false;
time_t begin = time(NULL);
@ -905,7 +905,7 @@ bool MariaDBMonitor::wait_cluster_stabilization(MariaDBServer* new_master, const
*/
bool MariaDBMonitor::switchover_check_preferred_master(MariaDBServer* preferred, json_t** err_out)
{
ss_dassert(preferred);
mxb_assert(preferred);
bool rval = true;
if (!preferred->update_slave_info() || !preferred->check_replication_settings())
{
@ -1405,7 +1405,7 @@ bool MariaDBMonitor::cluster_supports_failover(string* reasons_out)
*/
bool MariaDBMonitor::slave_receiving_events()
{
ss_dassert(m_master);
mxb_assert(m_master);
bool received_event = false;
int64_t master_id = m_master->m_server_base->server->node_id;
@ -1480,7 +1480,7 @@ bool MariaDBMonitor::switchover_prepare(SERVER* promotion_server, SERVER* demoti
const auto op = ClusterOperation::SWITCHOVER;
// Check that both servers are ok if specified, or autoselect them. Demotion target must be checked
// first since the promotion target depends on it.
ss_dassert(promotion_target_out && demotion_target_out &&
mxb_assert(promotion_target_out && demotion_target_out &&
!*promotion_target_out && !*demotion_target_out);
const char NO_SERVER[] = "Server '%s' is not a member of monitor '%s'.";

6
server/modules/monitor/mariadbmon/gtid.cc
View File

@ -21,7 +21,7 @@ using std::string;
GtidList GtidList::from_string(const string& gtid_string)
{
ss_dassert(gtid_string.size());
mxb_assert(gtid_string.size());
GtidList rval;
bool error = false;
bool have_more = false;
@ -110,7 +110,7 @@ uint64_t GtidList::events_ahead(const GtidList& lhs, const GtidList& rhs,
auto lhs_triplet = lhs.m_triplets[ind_lhs];
auto rhs_triplet = rhs.m_triplets[ind_rhs];
// Server id -1 should never be saved in a real gtid variable.
ss_dassert(lhs_triplet.m_server_id != SERVER_ID_UNKNOWN &&
mxb_assert(lhs_triplet.m_server_id != SERVER_ID_UNKNOWN &&
rhs_triplet.m_server_id != SERVER_ID_UNKNOWN);
// Search for matching domain_id:s, advance the smaller one.
if (lhs_triplet.m_domain < rhs_triplet.m_domain)
@ -147,7 +147,7 @@ Gtid Gtid::from_string(const char* str, char** endptr)
/* Error checking the gtid string is a bit questionable, as having an error means that the server is
buggy or network has faults, in which case nothing can be trusted. But without error checking
MaxScale may crash if string is wrong. */
ss_dassert(endptr);
mxb_assert(endptr);
const char* ptr = str;
char* strtoull_endptr = NULL;
// Parse three numbers separated by -

34
server/modules/monitor/mariadbmon/mariadbmon.cc
View File

@ -91,7 +91,7 @@ void MariaDBMonitor::reset_server_info()
for (auto iter = m_servers.begin(); iter != m_servers.end(); iter++)
{
auto mon_server = (*iter)->m_server_base;
ss_dassert(m_server_info.count(mon_server) == 0);
mxb_assert(m_server_info.count(mon_server) == 0);
ServerInfoMap::value_type new_val(mon_server, *iter);
m_server_info.insert(new_val);
}
@ -132,7 +132,7 @@ void MariaDBMonitor::reset_node_index_info()
*/
MariaDBServer* MariaDBMonitor::get_server_info(MXS_MONITORED_SERVER* db)
{
ss_dassert(m_server_info.count(db) == 1); // Should always exist in the map
mxb_assert(m_server_info.count(db) == 1); // Should always exist in the map
return m_server_info[db];
}
@ -247,7 +247,7 @@ void MariaDBMonitor::diagnostics(DCB *dcb) const
* thread and not the admin thread. Because the diagnostic must be printable even when the monitor is
* not running, the printing must be done outside the normal loop. */
ss_dassert(mxs_rworker_get_current() == mxs_rworker_get(MXS_RWORKER_MAIN));
mxb_assert(mxs_rworker_get_current() == mxs_rworker_get(MXS_RWORKER_MAIN));
/* The 'dcb' is owned by the admin thread (the thread executing this function), and probably
* should not be written to by any other thread. To prevent this, have the monitor thread
* print the diagnostics to a string. */
@ -297,7 +297,7 @@ string MariaDBMonitor::diagnostics_to_string() const
json_t* MariaDBMonitor::diagnostics_json() const
{
ss_dassert(mxs_rworker_get_current() == mxs_rworker_get(MXS_RWORKER_MAIN));
mxb_assert(mxs_rworker_get_current() == mxs_rworker_get(MXS_RWORKER_MAIN));
json_t* rval = NULL;
MariaDBMonitor* mutable_ptr = const_cast<MariaDBMonitor*>(this);
auto func = [this, &rval]
@ -464,7 +464,7 @@ void MariaDBMonitor::tick()
}
// Sanity check. Master may not be both slave and master.
ss_dassert(m_master == NULL || !m_master->has_status(SERVER_SLAVE | SERVER_MASTER));
mxb_assert(m_master == NULL || !m_master->has_status(SERVER_SLAVE | SERVER_MASTER));
// Update shared status. The next functions read the shared status. TODO: change the following
// functions to read "pending_status" instead.
@ -589,7 +589,7 @@ void MariaDBMonitor::update_external_master()
{
if (server_is_slave_of_ext_master(m_master->m_server_base->server))
{
ss_dassert(!m_master->m_slave_status.empty());
mxb_assert(!m_master->m_slave_status.empty());
if (m_master->m_slave_status[0].master_host != m_external_master_host ||
m_master->m_slave_status[0].master_port != m_external_master_port)
{
@ -744,7 +744,7 @@ bool MariaDBMonitor::execute_manual_command(std::function<void (void)> command,
{
PRINT_MXS_JSON_ERROR(error_out,
"Previous command has not been executed, cannot send another command.");
ss_dassert(!true);
mxb_assert(!true);
}
else
{
@ -806,10 +806,10 @@ bool MariaDBMonitor::run_manual_rejoin(SERVER* rejoin_server, json_t** error_out
*/
bool handle_manual_switchover(const MODULECMD_ARG* args, json_t** error_out)
{
ss_dassert((args->argc >= 1) && (args->argc <= 3));
ss_dassert(MODULECMD_GET_TYPE(&args->argv[0].type) == MODULECMD_ARG_MONITOR);
ss_dassert((args->argc < 2) || (MODULECMD_GET_TYPE(&args->argv[1].type) == MODULECMD_ARG_SERVER));
ss_dassert((args->argc < 3) || (MODULECMD_GET_TYPE(&args->argv[2].type) == MODULECMD_ARG_SERVER));
mxb_assert((args->argc >= 1) && (args->argc <= 3));
mxb_assert(MODULECMD_GET_TYPE(&args->argv[0].type) == MODULECMD_ARG_MONITOR);
mxb_assert((args->argc < 2) || (MODULECMD_GET_TYPE(&args->argv[1].type) == MODULECMD_ARG_SERVER));
mxb_assert((args->argc < 3) || (MODULECMD_GET_TYPE(&args->argv[2].type) == MODULECMD_ARG_SERVER));
bool rval = false;
if (config_get_global_options()->passive)
@ -837,8 +837,8 @@ bool handle_manual_switchover(const MODULECMD_ARG* args, json_t** error_out)
*/
bool handle_manual_failover(const MODULECMD_ARG* args, json_t** output)
{
ss_dassert(args->argc == 1);
ss_dassert(MODULECMD_GET_TYPE(&args->argv[0].type) == MODULECMD_ARG_MONITOR);
mxb_assert(args->argc == 1);
mxb_assert(MODULECMD_GET_TYPE(&args->argv[0].type) == MODULECMD_ARG_MONITOR);
bool rv = false;
if (config_get_global_options()->passive)
@ -863,9 +863,9 @@ bool handle_manual_failover(const MODULECMD_ARG* args, json_t** output)
*/
bool handle_manual_rejoin(const MODULECMD_ARG* args, json_t** output)
{
ss_dassert(args->argc == 2);
ss_dassert(MODULECMD_GET_TYPE(&args->argv[0].type) == MODULECMD_ARG_MONITOR);
ss_dassert(MODULECMD_GET_TYPE(&args->argv[1].type) == MODULECMD_ARG_SERVER);
mxb_assert(args->argc == 2);
mxb_assert(MODULECMD_GET_TYPE(&args->argv[0].type) == MODULECMD_ARG_MONITOR);
mxb_assert(MODULECMD_GET_TYPE(&args->argv[1].type) == MODULECMD_ARG_SERVER);
bool rv = false;
if (config_get_global_options()->passive)
@ -907,7 +907,7 @@ string get_connection_errors(const ServerArray& servers)
for (auto iter = servers.begin(); iter != servers.end(); iter++)
{
const char* error = mysql_error((*iter)->m_server_base->con);
ss_dassert(*error); // Every connection should have an error.
mxb_assert(*error); // Every connection should have an error.
rval += separator + (*iter)->name() + ": '" + error + "'";
separator = ", ";
}

16
server/modules/monitor/mariadbmon/mariadbserver.cc
View File

@ -49,7 +49,7 @@ MariaDBServer::MariaDBServer(MXS_MONITORED_SERVER* monitored_server, int config_
, m_replication_lag(MXS_RLAG_UNDEFINED)
, m_print_update_errormsg(true)
{
ss_dassert(monitored_server);
mxb_assert(monitored_server);
}
NodeData::NodeData()
@ -121,7 +121,7 @@ bool MariaDBServer::do_show_slave_status(string* errmsg_out)
query = "SHOW SLAVE STATUS";
break;
default:
ss_dassert(!true); // This method should not be called for versions < 5.5
mxb_assert(!true); // This method should not be called for versions < 5.5
return false;
}
@ -1003,7 +1003,7 @@ void MariaDBServer::sstatus_array_set_conn_status(SlaveStatusArray* new_slave_st
SlaveStatus& new_row = new_sstatus[i];
if (new_row.slave_io_running == SlaveStatus::SLAVE_IO_YES)
{
ss_dassert(new_row.master_server_id > 0);
mxb_assert(new_row.master_server_id > 0);
new_row.seen_connected = true;
}
else if (new_row.slave_io_running == SlaveStatus::SLAVE_IO_CONNECTING)
@ -1221,7 +1221,7 @@ string SlaveStatus::slave_io_to_string(SlaveStatus::slave_io_running_t slave_io)
rval = NO;
break;
default:
ss_dassert(!false);
mxb_assert(!false);
}
return rval;
}
@ -1241,7 +1241,7 @@ QueryResult::QueryResult(MYSQL_RES* resultset)
string key(field_info[column_index].name);
// TODO: Think of a way to handle duplicate names nicely. Currently this should only be used
// for known queries.
ss_dassert(m_col_indexes.count(key) == 0);
mxb_assert(m_col_indexes.count(key) == 0);
m_col_indexes[key] = column_index;
}
}
@ -1284,14 +1284,14 @@ int64_t QueryResult::get_col_index(const string& col_name) const
string QueryResult::get_string(int64_t column_ind) const
{
ss_dassert(column_ind < m_columns && column_ind >= 0);
mxb_assert(column_ind < m_columns && column_ind >= 0);
char* data = m_rowdata[column_ind];
return data ? data : "";
}
int64_t QueryResult::get_uint(int64_t column_ind) const
{
ss_dassert(column_ind < m_columns && column_ind >= 0);
mxb_assert(column_ind < m_columns && column_ind >= 0);
char* data = m_rowdata[column_ind];
int64_t rval = -1;
if (data && *data)
@ -1309,7 +1309,7 @@ int64_t QueryResult::get_uint(int64_t column_ind) const
bool QueryResult::get_bool(int64_t column_ind) const
{
ss_dassert(column_ind < m_columns && column_ind >= 0);
mxb_assert(column_ind < m_columns && column_ind >= 0);
char* data = m_rowdata[column_ind];
return data ? (strcmp(data,"Y") == 0 || strcmp(data, "1") == 0) : false;
}

4
server/modules/monitor/mariadbmon/test/test_cycle_find.cc
View File

@ -134,7 +134,7 @@ int MariaDBMonitor::Test::run_tests()
void MariaDBMonitor::Test::init_servers(int count)
{
clear_servers();
ss_dassert(m_monitor->m_server_info.empty() && m_monitor->m_servers.empty() &&
mxb_assert(m_monitor->m_server_info.empty() && m_monitor->m_servers.empty() &&
m_monitor->m_servers_by_id.empty());
for (int i = 1; i < count + 1; i++)
@ -188,7 +188,7 @@ void MariaDBMonitor::Test::add_replication(EdgeArray edges)
break;
}
auto iter2 = m_monitor->m_servers_by_id.find(slave_id);
ss_dassert(iter2 != m_monitor->m_servers_by_id.end());
mxb_assert(iter2 != m_monitor->m_servers_by_id.end());
SlaveStatus ss;
ss.master_server_id = master_id;
ss.slave_io_running = SlaveStatus::SLAVE_IO_YES;