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

Remove server_get_parameter_nolock

Browse Source 
The function is no longer needed as there is no recursive access to the
server.
This commit is contained in:
Markus Mäkelä
2018-06-08 13:08:00 +03:00
parent ba0e3bd6b7
commit 9f5358eac0
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/maxscale/server.h
View File

@ -378,7 +378,6 @@ extern void server_clear_status_nolock(SERVER *server, uint64_t bit);
extern void server_transfer_status(SERVER *dest_server, const SERVER *source_server); extern void server_transfer_status(SERVER *dest_server, const SERVER *source_server);
extern void server_add_mon_user(SERVER *server, const char *user, const char *passwd); extern void server_add_mon_user(SERVER *server, const char *user, const char *passwd);
extern size_t server_get_parameter(const SERVER *server, const char *name, char* out, size_t size); extern size_t server_get_parameter(const SERVER *server, const char *name, char* out, size_t size);
extern size_t server_get_parameter_nolock(const SERVER *server, const char *name, char* out, size_t size);
extern void server_update_credentials(SERVER *server, const char *user, const char *passwd); extern void server_update_credentials(SERVER *server, const char *user, const char *passwd);
extern DCB* server_get_persistent(SERVER *server, const char *user, const char* ip, const char *protocol, int id); extern DCB* server_get_persistent(SERVER *server, const char *user, const char* ip, const char *protocol, int id);
extern void server_update_address(SERVER *server, const char *address); extern void server_update_address(SERVER *server, const char *address);

2
server/core/server.cc
View File

@ -942,7 +942,7 @@ static void server_parameter_free(SERVER_PARAM *tofree)
* *
* @note Should only be called when the server is already locked * @note Should only be called when the server is already locked
*/ */
size_t server_get_parameter_nolock(const SERVER *server, const char *name, char* out, size_t size) static size_t server_get_parameter_nolock(const SERVER *server, const char *name, char* out, size_t size)
{ {
ss_dassert(SPINLOCK_IS_LOCKED(&server->lock)); ss_dassert(SPINLOCK_IS_LOCKED(&server->lock));
size_t len = 0; size_t len = 0;

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

@ -437,7 +437,7 @@ MXS_MONITORED_SERVER *GaleraMonitor::get_candidate_master()
moitor_servers->server->depth = 0; moitor_servers->server->depth = 0;
char buf[50]; // Enough to hold most numbers char buf[50]; // Enough to hold most numbers
if (m_use_priority && server_get_parameter_nolock(moitor_servers->server, "priority", buf, sizeof(buf))) if (m_use_priority && server_get_parameter(moitor_servers->server, "priority", buf, sizeof(buf)))
{ {
/** The server has a priority */ /** The server has a priority */
if ((currval = atoi(buf)) > 0) if ((currval = atoi(buf)) > 0)
@ -586,8 +586,7 @@ void GaleraMonitor::update_sst_donor_nodes(int is_cluster)
* the server list will be order by default method. * the server list will be order by default method.
*/ */
if (m_use_priority && if (m_use_priority && server_get_parameter(ptr->server, "priority", NULL, 0))
server_get_parameter_nolock(ptr->server, "priority", NULL, 0))
{ {
ignore_priority = false; ignore_priority = false;
} }
@ -722,8 +721,8 @@ static int compare_node_priority (const void *a, const void *b)
const MXS_MONITORED_SERVER *s_b = *(MXS_MONITORED_SERVER * const *)b; const MXS_MONITORED_SERVER *s_b = *(MXS_MONITORED_SERVER * const *)b;
char pri_a[50]; char pri_a[50];
char pri_b[50]; char pri_b[50];
bool have_a = server_get_parameter_nolock(s_a->server, "priority", pri_a, sizeof(pri_a)); bool have_a = server_get_parameter(s_a->server, "priority", pri_a, sizeof(pri_a));
bool have_b = server_get_parameter_nolock(s_b->server, "priority", pri_b, sizeof(pri_b)); bool have_b = server_get_parameter(s_b->server, "priority", pri_b, sizeof(pri_b));
/** /**
* Check priority parameter: * Check priority parameter: