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

Merge commit '5cdba97ec7ee7f1ef74249b952774adf1b111464' into develop

Browse Source
This commit is contained in:
Esa Korhonen
2019-03-22 13:25:58 +02:00
parent 75c6ef2dc8 5cdba97ec7
commit 4c6306e363
1 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -154,27 +154,49 @@ MariaDBServer* MariaDBMonitor::get_server(SERVER* server)
bool MariaDBMonitor::set_replication_credentials(const MXS_CONFIG_PARAMETER* params) bool MariaDBMonitor::set_replication_credentials(const MXS_CONFIG_PARAMETER* params)
{ {
bool rval = false; bool repl_user_exists = params->contains(CN_REPLICATION_USER);
string repl_user = params->get_string(CN_REPLICATION_USER); bool repl_pw_exists = params->contains(CN_REPLICATION_PASSWORD);
string repl_pw = params->get_string(CN_REPLICATION_PASSWORD);
if (repl_user.empty() && repl_pw.empty()) // Because runtime modifications are performed 1-by-1, we must be less strict here and allow
// partial setups. Password is not required even if username is set. This is contrary to the
// general monitor username & pw, which are both required. Even this assumes that the username
// is given first in a "maxadmin alter monitor"-command.
string repl_user;
string repl_pw;
if (repl_user_exists)
{ {
// No replication credentials defined, use monitor credentials repl_user = params->get_string(CN_REPLICATION_USER);
repl_user = m_settings.conn_settings.username; if (repl_pw_exists)
repl_pw = m_settings.conn_settings.password; {
// Ok, both set.
repl_pw = params->get_string(CN_REPLICATION_PASSWORD);
}
// Password not set is ok. This needs to be accepted so that runtime modifications work.
// Hopefully the password is set later on.
}
else
{
if (repl_pw_exists)
{
MXS_ERROR("'%s' is defined while '%s' is not. If performing an \"alter monitor\"-command, "
"give '%s' first.", CN_REPLICATION_PASSWORD, CN_REPLICATION_USER, CN_REPLICATION_USER);
return false;
}
else
{
// Ok, neither is set. Use monitor credentials.
repl_user = m_settings.conn_settings.username;
repl_pw = m_settings.conn_settings.password;
}
} }
if (!repl_user.empty() && !repl_pw.empty()) m_replication_user = repl_user;
{ char* decrypted = decrypt_password(repl_pw.c_str());
m_replication_user = repl_user; m_replication_password = decrypted;
char* decrypted = decrypt_password(repl_pw.c_str()); MXS_FREE(decrypted);
m_replication_password = decrypted;
MXS_FREE(decrypted);
rval = true;
}
return rval; return true;
} }
MariaDBMonitor* MariaDBMonitor::create(const string& name, const string& module) MariaDBMonitor* MariaDBMonitor::create(const string& name, const string& module)
@ -240,7 +262,6 @@ bool MariaDBMonitor::configure(const MXS_CONFIG_PARAMETER* params)
} }
if (!set_replication_credentials(params)) if (!set_replication_credentials(params))
{ {
MXS_ERROR("Both '%s' and '%s' must be defined", CN_REPLICATION_USER, CN_REPLICATION_PASSWORD);
settings_ok = false; settings_ok = false;
} }
if (!m_assume_unique_hostnames) if (!m_assume_unique_hostnames)