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

Format MariaDBMonitor source

Browse Source 
Some parts were manually edited for better results. No functional changes.
This commit is contained in:
Esa Korhonen
2018-09-25 16:03:03 +03:00
parent bfb1c3f1b3
commit c58041d4fb
5 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1192,7 +1192,7 @@ bool MariaDBMonitor::promote_new_master(MariaDBServer* new_master, json_t** erro
* @return The selected promotion target or NULL if no valid candidates * @return The selected promotion target or NULL if no valid candidates
*/ */
MariaDBServer* MariaDBMonitor::select_promotion_target(MariaDBServer* demotion_target, MariaDBServer* MariaDBMonitor::select_promotion_target(MariaDBServer* demotion_target,
OperationType op, OperationType op,
Log log_mode, Log log_mode,
json_t** error_out) json_t** error_out)
{ {
@ -1475,19 +1475,19 @@ unique_ptr<ClusterOperation> MariaDBMonitor::failover_prepare(Log log_mode, json
// repeatedly since it is likely to change continuously. // repeatedly since it is likely to change continuously.
if (error_out || log_mode == Log::ON) if (error_out || log_mode == Log::ON)
{ {
string unproc_events = string_printf( const char unproc_fmt[] =
"The relay log of '%s' has %" PRIu64 " unprocessed events " "The relay log of '%s' has %" PRIu64
"(Gtid_IO_Pos: %s, Gtid_Current_Pos: %s).", " unprocessed events (Gtid_IO_Pos: %s, Gtid_Current_Pos: %s).";
promotion_target->name(), string unproc_events = string_printf(unproc_fmt, promotion_target->name(), events,
events, slave_conn->gtid_io_pos.to_string().c_str(),
slave_conn->gtid_io_pos.to_string().c_str(), promotion_target->m_gtid_current_pos.to_string().c_str());
promotion_target->m_gtid_current_pos.to_string().c_str());
if (error_out) if (error_out)
{ {
// Print a bit more helpful error for the user, goes to log too. This should be a very rare /* Print a bit more helpful error for the user, goes to log too.
// occurrence: either the dba managed to start failover really fast, or the relay log is * This should be a very rare occurrence: either the dba managed to start failover
// massive. In the latter case it's ok that the monitor does not do the waiting since there * really fast, or the relay log is massive. In the latter case it's ok
// is no telling how long the wait will be. * that the monitor does not do the waiting since there is no telling how long
* the wait will be. */
const char wait_relay_log[] = const char wait_relay_log[] =
"%s To avoid data loss, failover should be postponed until " "%s To avoid data loss, failover should be postponed until "
"the log has been processed. Please try again later."; "the log has been processed. Please try again later.";

8
server/modules/monitor/mariadbmon/mariadbmon.hh
View File

@ -248,9 +248,9 @@ private:
// Failover methods // Failover methods
std::unique_ptr<ClusterOperation> failover_prepare(Log log_mode, json_t** error_out); std::unique_ptr<ClusterOperation> failover_prepare(Log log_mode, json_t** error_out);
bool failover_perform(ClusterOperation& operation); bool failover_perform(ClusterOperation& operation);
const MariaDBServer* slave_receiving_events(const MariaDBServer* demotion_target, const MariaDBServer* slave_receiving_events(const MariaDBServer* demotion_target,
Duration* event_age_out); Duration* event_age_out);
bool manual_failover(json_t** output); bool manual_failover(json_t** output);
void handle_auto_failover(); void handle_auto_failover();
@ -264,7 +264,7 @@ private:
// Methods common to failover/switchover/rejoin // Methods common to failover/switchover/rejoin
MariaDBServer* select_promotion_target(MariaDBServer* current_master, MariaDBServer* select_promotion_target(MariaDBServer* current_master,
OperationType op, OperationType op,
Log log_mode, Log log_mode,
json_t** error_out); json_t** error_out);
bool server_is_excluded(const MariaDBServer* server); bool server_is_excluded(const MariaDBServer* server);

14
server/modules/monitor/mariadbmon/mariadbmon_common.hh
View File

@ -89,13 +89,13 @@ class MariaDBServer;
class ClusterOperation class ClusterOperation
{ {
public: public:
const OperationType type; // Failover or switchover const OperationType type; // Failover or switchover
MariaDBServer* const promotion_target; // Which server will be promoted MariaDBServer* const promotion_target; // Which server will be promoted
MariaDBServer* const demotion_target; // Which server will be demoted MariaDBServer* const demotion_target; // Which server will be demoted
const bool demotion_target_is_master; // Was the demotion target the master? const bool demotion_target_is_master; // Was the demotion target the master?
const bool handle_events; // Should scheduled server events be disabled/enabled? const bool handle_events; // Should scheduled server events be disabled/enabled?
json_t** const error_out; // Json error output json_t** const error_out; // Json error output
maxbase::Duration time_remaining; // How much time remains to complete the operation maxbase::Duration time_remaining; // How much time remains to complete the operation
ClusterOperation(OperationType type, ClusterOperation(OperationType type,
MariaDBServer* promotion_target, MariaDBServer* demotion_target, MariaDBServer* promotion_target, MariaDBServer* demotion_target,

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

@ -1272,9 +1272,9 @@ bool MariaDBServer::alter_event(const EventInfo& event, const string& target_sta
if (loc_at != string::npos) if (loc_at != string::npos)
{ {
auto host_begin = loc_at + 1; auto host_begin = loc_at + 1;
quoted_definer = event.definer.substr(0, loc_at + 1) + quoted_definer = event.definer.substr(0, loc_at + 1)
// host_begin may be the null-char if @ was the last char + // host_begin may be the null-char if @ was the last char
"'" + event.definer.substr(host_begin, string::npos) + "'"; "'" + event.definer.substr(host_begin, string::npos) + "'";
} }
else else
{ {