diff --git a/server/core/monitor.cc b/server/core/monitor.cc index 113f56b80..ab7e9f167 100644 --- a/server/core/monitor.cc +++ b/server/core/monitor.cc @@ -1773,7 +1773,7 @@ void mon_process_state_changes(MXS_MONITOR *monitor, const char *script, uint64_ master_up = true; } - if (script && (events & event)) + if (script && *script && (events & event)) { monitor_launch_script(monitor, ptr, script, monitor->script_timeout); } diff --git a/server/modules/monitor/mariadbmon/mariadbmon.cc b/server/modules/monitor/mariadbmon/mariadbmon.cc index a268da871..2411dccaf 100644 --- a/server/modules/monitor/mariadbmon/mariadbmon.cc +++ b/server/modules/monitor/mariadbmon/mariadbmon.cc @@ -31,6 +31,7 @@ #include #include #include +#include #include // TODO: For monitorAddParameters #include "../../../core/internal/monitor.h" @@ -989,8 +990,10 @@ static bool set_replication_credentials(MYSQL_MONITOR *handle, const MXS_CONFIG_ if (*repl_user && *repl_pw) { - handle->replication_user = MXS_STRDUP_A(repl_user); - handle->replication_password = decrypt_password(repl_pw); + handle->replication_user = repl_user; + char* decrypted = decrypt_password(repl_pw); + handle->replication_password = decrypted; + MXS_FREE(decrypted); rval = true; } @@ -1033,22 +1036,22 @@ startMonitor(MXS_MONITOR *monitor, const MXS_CONFIG_PARAMETER* params) if (handle) { handle->shutdown = 0; - MXS_FREE(handle->script); - MXS_FREE(handle->replication_user); - MXS_FREE(handle->replication_password); + handle->script.clear(); + handle->replication_user.clear(); + handle->replication_password.clear(); MXS_FREE(handle->excluded_servers); handle->excluded_servers = NULL; handle->n_excluded = 0; } else { - handle = (MYSQL_MONITOR *) MXS_MALLOC(sizeof(MYSQL_MONITOR)); + handle = new MYSQL_MONITOR; HASHTABLE *server_info = hashtable_alloc(MAX_NUM_SLAVES, hashtable_item_strhash, hashtable_item_strcmp); - if (handle == NULL || server_info == NULL) + if (server_info == NULL) { - MXS_FREE(handle); + delete handle; hashtable_free(server_info); return NULL; } @@ -1060,7 +1063,6 @@ startMonitor(MXS_MONITOR *monitor, const MXS_CONFIG_PARAMETER* params) handle->id = config_get_global_options()->id; handle->warn_set_standalone_master = true; handle->master_gtid_domain = -1; - handle->external_master_host[0] = '\0'; handle->external_master_port = PORT_UNKNOWN; handle->monitor = monitor; } @@ -1077,15 +1079,14 @@ startMonitor(MXS_MONITOR *monitor, const MXS_CONFIG_PARAMETER* params) handle->failcount = config_get_integer(params, CN_FAILCOUNT); handle->allow_cluster_recovery = config_get_bool(params, "allow_cluster_recovery"); handle->mysql51_replication = config_get_bool(params, "mysql51_replication"); - handle->script = config_copy_string(params, "script"); + handle->script = config_get_string(params, "script"); handle->events = config_get_enum(params, "events", mxs_monitor_event_enum_values); - handle->auto_failover = config_get_bool(params, CN_AUTO_FAILOVER); handle->failover_timeout = config_get_integer(params, CN_FAILOVER_TIMEOUT); handle->switchover_timeout = config_get_integer(params, CN_SWITCHOVER_TIMEOUT); + handle->auto_failover = config_get_bool(params, CN_AUTO_FAILOVER); + handle->auto_rejoin = config_get_bool(params, CN_AUTO_REJOIN); handle->verify_master_failure = config_get_bool(params, CN_VERIFY_MASTER_FAILURE); handle->master_failure_timeout = config_get_integer(params, CN_MASTER_FAILURE_TIMEOUT); - handle->auto_rejoin = config_get_bool(params, CN_AUTO_REJOIN); - handle->excluded_servers = NULL; handle->n_excluded = mon_config_get_servers(params, CN_NO_PROMOTE_SERVERS, monitor, &handle->excluded_servers); @@ -1114,9 +1115,8 @@ startMonitor(MXS_MONITOR *monitor, const MXS_CONFIG_PARAMETER* params) if (error) { hashtable_free(handle->server_info); - MXS_FREE(handle->script); MXS_FREE(handle->excluded_servers); - MXS_FREE(handle); + delete handle; handle = NULL; } else @@ -1127,8 +1127,7 @@ startMonitor(MXS_MONITOR *monitor, const MXS_CONFIG_PARAMETER* params) { MXS_ERROR("Failed to start monitor thread for monitor '%s'.", monitor->name); hashtable_free(handle->server_info); - MXS_FREE(handle->script); - MXS_FREE(handle); + delete handle; handle = NULL; } } @@ -1207,8 +1206,7 @@ static void diagnostics(DCB *dcb, const MXS_MONITOR *mon) dcb_printf(dcb, "Switchover timeout: %u\n", handle->switchover_timeout); dcb_printf(dcb, "Automatic rejoin: %s\n", handle->auto_rejoin ? "Enabled" : "Disabled"); dcb_printf(dcb, "MaxScale monitor ID: %lu\n", handle->id); - dcb_printf(dcb, "Detect replication lag: %s\n", (handle->replicationHeartbeat == 1) ? - "Enabled" : "Disabled"); + dcb_printf(dcb, "Detect replication lag: %s\n", (handle->replicationHeartbeat) ? "Enabled" : "Disabled"); dcb_printf(dcb, "Detect stale master: %s\n", (handle->detectStaleMaster == 1) ? "Enabled" : "Disabled"); if (handle->n_excluded > 0) @@ -1282,9 +1280,9 @@ static json_t* diagnostics_json(const MXS_MONITOR *mon) json_object_set_new(rval, CN_SWITCHOVER_TIMEOUT, json_integer(handle->switchover_timeout)); json_object_set_new(rval, CN_AUTO_REJOIN, json_boolean(handle->auto_rejoin)); - if (handle->script) + if (!handle->script.empty()) { - json_object_set_new(rval, "script", json_string(handle->script)); + json_object_set_new(rval, "script", json_string(handle->script.c_str())); } if (handle->n_excluded > 0) { @@ -2112,7 +2110,7 @@ monitorMain(void *arg) MYSQL_MONITOR *handle = (MYSQL_MONITOR *) arg; MXS_MONITOR* mon = handle->monitor; MXS_MONITORED_SERVER *ptr; - int replication_heartbeat; + bool replication_heartbeat; bool detect_stale_master; int num_servers = 0; MXS_MONITORED_SERVER *root_master = NULL; @@ -2285,21 +2283,20 @@ monitorMain(void *arg) if (master_info->slave_status.master_host != handle->external_master_host || master_info->slave_status.master_port != handle->external_master_port) { - const char* new_ext_host = master_info->slave_status.master_host.c_str(); + const string new_ext_host = master_info->slave_status.master_host; const int new_ext_port = master_info->slave_status.master_port; if (handle->external_master_port == PORT_UNKNOWN) { MXS_NOTICE("Cluster master server is replicating from an external master: %s:%d", - new_ext_host, new_ext_port); + new_ext_host.c_str(), new_ext_port); } else { MXS_NOTICE("The external master of the cluster has changed: %s:%d -> %s:%d.", - handle->external_master_host, handle->external_master_port, - new_ext_host, new_ext_port); + handle->external_master_host.c_str(), handle->external_master_port, + new_ext_host.c_str(), new_ext_port); } - snprintf(handle->external_master_host, sizeof(handle->external_master_host), - "%s", new_ext_host); + handle->external_master_host = new_ext_host; handle->external_master_port = new_ext_port; } } @@ -2309,7 +2306,7 @@ monitorMain(void *arg) { MXS_NOTICE("Cluster lost the external master."); } - handle->external_master_host[0] = '\0'; + handle->external_master_host.clear(); handle->external_master_port = PORT_UNKNOWN; } } @@ -2470,7 +2467,7 @@ monitorMain(void *arg) * After updating the status of all servers, check if monitor events * need to be launched. */ - mon_process_state_changes(mon, handle->script, handle->events); + mon_process_state_changes(mon, handle->script.c_str(), handle->events); bool failover_performed = false; // Has an automatic failover been performed this loop? if (handle->auto_failover) @@ -3669,7 +3666,7 @@ bool start_external_replication(MYSQL_MONITOR* mon, MXS_MONITORED_SERVER* new_ma mxs_mysql_query(new_master->con, "START SLAVE;") == 0) { MXS_NOTICE("New master starting replication from external master %s:%d.", - mon->external_master_host, mon->external_master_port); + mon->external_master_host.c_str(), mon->external_master_port); rval = true; } else diff --git a/server/modules/monitor/mariadbmon/mariadbmon.hh b/server/modules/monitor/mariadbmon/mariadbmon.hh index 7c429402c..6ca481b42 100644 --- a/server/modules/monitor/mariadbmon/mariadbmon.hh +++ b/server/modules/monitor/mariadbmon/mariadbmon.hh @@ -14,61 +14,60 @@ */ #include -#include -#include -#include -#include -#include +#include #include #include #include -#include -#include #include -#include -#include #include +using std::string; + // MariaDB Monitor instance data -struct MYSQL_MONITOR +class MYSQL_MONITOR { +public: + MXS_MONITOR* monitor; /**< Generic monitor object */ THREAD thread; /**< Monitor thread */ int shutdown; /**< Flag to shutdown the monitor thread */ int status; /**< Monitor status */ + MXS_MONITORED_SERVER *master; /**< Master server for MySQL Master/Slave replication */ + HASHTABLE *server_info; /**< Contains server specific information */ + bool warn_set_standalone_master; /**< Log a warning when setting standalone master */ unsigned long id; /**< Monitor ID */ - int replicationHeartbeat; /**< Monitor flag for MySQL replication heartbeat */ + + // Values updated by monitor + int64_t master_gtid_domain; /**< Gtid domain currently used by the master */ + string external_master_host; /**< External master host, for fail/switchover */ + int external_master_port; /**< External master port */ + + // Replication topology detection settings + bool mysql51_replication; /**< Use MySQL 5.1 replication */ bool detectStaleMaster; /**< Monitor flag for MySQL replication Stale Master detection */ bool detectStaleSlave; /**< Monitor flag for MySQL replication Stale Master detection */ bool multimaster; /**< Detect and handle multi-master topologies */ bool ignore_external_masters; /**< Ignore masters outside of the monitor configuration */ - int disableMasterFailback; /**< Monitor flag for Galera Cluster Master failback */ - int availableWhenDonor; /**< Monitor flag for Galera Cluster Donor availability */ - int disableMasterRoleSetting; /**< Monitor flag to disable setting master role */ - bool mysql51_replication; /**< Use MySQL 5.1 replication */ - MXS_MONITORED_SERVER *master; /**< Master server for MySQL Master/Slave replication */ - char* script; /**< Script to call when state changes occur on servers */ - uint64_t events; /**< enabled events */ - HASHTABLE *server_info; /**< Contains server specific information */ bool detect_standalone_master; /**< If standalone master are detected */ - int failcount; /**< How many monitoring cycles servers must be - down before failover is initiated */ - bool allow_cluster_recovery; /**< Allow failed servers to rejoin the cluster */ - bool warn_set_standalone_master; /**< Log a warning when setting standalone master */ - bool auto_failover; /**< If automatic master failover is enabled */ + bool replicationHeartbeat; /**< Monitor flag for MySQL replication heartbeat */ + + // Failover, switchover and rejoin settings + string replication_user; /**< Replication user for CHANGE MASTER TO-commands */ + string replication_password; /**< Replication password for CHANGE MASTER TO-commands */ + int failcount; /**< How many monitoring cycles master must be down before auto-failover + * begins */ uint32_t failover_timeout; /**< Timeout in seconds for the master failover */ uint32_t switchover_timeout; /**< Timeout in seconds for the master switchover */ - char* replication_user; /**< Replication user for failover */ - char* replication_password; /**< Replication password for failover*/ bool verify_master_failure; /**< Whether master failure is verified via slaves */ - int master_failure_timeout; /**< Time in seconds to wait before doing failover */ - int64_t master_gtid_domain; /**< Gtid domain currently used by the master */ - char external_master_host[MAX_SERVER_ADDRESS_LEN]; /**< External master host, for fail/switchover */ - int external_master_port; /**< External master port */ + int master_failure_timeout; /**< Master failure verification (via slaves) time in seconds */ + bool auto_failover; /**< If automatic master failover is enabled */ bool auto_rejoin; /**< Attempt to start slave replication on standalone servers or servers - replicating from the wrong master. */ - int n_excluded; /**< Number of excluded servers */ + * replicating from the wrong master automatically. */ MXS_MONITORED_SERVER** excluded_servers; /**< Servers banned for master promotion during auto-failover. */ + int n_excluded; /**< Number of excluded servers */ - MXS_MONITOR* monitor; + // Other settings + string script; /**< Script to call when state changes occur on servers */ + uint64_t events; /**< enabled events */ + bool allow_cluster_recovery; /**< Allow failed servers to rejoin the cluster */ };