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

MXS-1513: mysql_mon.cc formatting changes

Browse Source 
Ran astyle, cut some long lines.
This commit is contained in:
Esa Korhonen
2017-12-04 13:42:14 +02:00
parent c0ab80e459
commit 046ed5c93d
1 changed files with 133 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
server/modules/monitor/mysqlmon/mysql_mon.cc
View File

@ -553,8 +553,8 @@ MXS_MODULE* MXS_CREATE_MODULE()
}; };
modulecmd_register_command(MXS_MODULE_NAME, "switchover", MODULECMD_TYPE_ACTIVE, modulecmd_register_command(MXS_MODULE_NAME, "switchover", MODULECMD_TYPE_ACTIVE,
mysql_handle_switchover, MXS_ARRAY_NELEMS(switchover_argv), switchover_argv, mysql_handle_switchover, MXS_ARRAY_NELEMS(switchover_argv),
"Perform master switchover"); switchover_argv, "Perform master switchover");
static modulecmd_arg_type_t failover_argv[] = static modulecmd_arg_type_t failover_argv[] =
{ {
@ -565,8 +565,8 @@ MXS_MODULE* MXS_CREATE_MODULE()
}; };
modulecmd_register_command(MXS_MODULE_NAME, "failover", MODULECMD_TYPE_ACTIVE, modulecmd_register_command(MXS_MODULE_NAME, "failover", MODULECMD_TYPE_ACTIVE,
mysql_handle_failover, MXS_ARRAY_NELEMS(failover_argv), failover_argv, mysql_handle_failover, MXS_ARRAY_NELEMS(failover_argv),
"Perform master failover"); failover_argv, "Perform master failover");
static MXS_MONITOR_OBJECT MyObject = static MXS_MONITOR_OBJECT MyObject =
{ {
@ -642,12 +642,12 @@ public:
{} {}
/** /**
* Parse a Gtid-triplet from a string. In case of a multi-triplet value, only the triplet with the given domain * Parse a Gtid-triplet from a string. In case of a multi-triplet value, only the triplet with
* is returned. * the given domain is returned.
* *
* @param str Gtid string * @param str Gtid string
* @param search_domain The Gtid domain whose triplet should be returned. Negative domain means autoselect, * @param search_domain The Gtid domain whose triplet should be returned. Negative domain stands for
* which is only allowed when the string contains one triplet. * autoselect, which is only allowed when the string contains one triplet.
*/ */
Gtid(const char* str, int64_t search_domain = -1) Gtid(const char* str, int64_t search_domain = -1)
: domain(0) : domain(0)
@ -698,7 +698,8 @@ public:
int master_server_id; /**< The master's server_id value. */ int master_server_id; /**< The master's server_id value. */
bool slave_io_running; /**< Whether the slave I/O thread is running and connected. */ bool slave_io_running; /**< Whether the slave I/O thread is running and connected. */
bool slave_sql_running; /**< Whether or not the SQL thread is running. */ bool slave_sql_running; /**< Whether or not the SQL thread is running. */
string master_log_file; /**< Name of the master binary log file that the I/O thread is currently reading from. */ string master_log_file; /**< Name of the master binary log file that the I/O thread is currently
* reading from. */
uint64_t read_master_log_pos; /**< Position up to which the I/O thread has read in the current master uint64_t read_master_log_pos; /**< Position up to which the I/O thread has read in the current master
* binary log file. */ * binary log file. */
Gtid gtid_io_pos; /**< Gtid I/O position of the slave thread. Only shows the triplet with Gtid gtid_io_pos; /**< Gtid I/O position of the slave thread. Only shows the triplet with
@ -2215,8 +2216,9 @@ monitorMain(void *arg)
if (failover_not_possible(handle)) if (failover_not_possible(handle))
{ {
const char PROBLEMS[] = "Failover is not possible due to one or more problems in the " const char PROBLEMS[] = "Failover is not possible due to one or more problems in the "
"replication configuration, disabling automatic failover. Failover should only be " "replication configuration, disabling automatic failover. Failover "
"enabled after the replication configuration has been fixed."; "should only be enabled after the replication configuration has been "
"fixed.";
MXS_ERROR(RE_ENABLE_FMT, PROBLEMS, CN_AUTO_FAILOVER, mon->name); MXS_ERROR(RE_ENABLE_FMT, PROBLEMS, CN_AUTO_FAILOVER, mon->name);
handle->auto_failover = false; handle->auto_failover = false;
disable_setting(handle, CN_AUTO_FAILOVER); disable_setting(handle, CN_AUTO_FAILOVER);