test/cetus
1
0
Fork 0
mirror of https://gitee.com/wangbin579/cetus.git synced 2024-12-02 03:47:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

admin: check param for UPDATE BACKENDS; add con_timeout

Browse Source
This commit is contained in:
jingxiaobing 2018-06-07 15:15:32 +08:00
parent 2670055022
commit afa51c3baa
4 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/admin/admin-commands.c
View File

@ -399,7 +399,7 @@ void admin_show_connectionlist(network_mysqld_con *admin_con, int show_count)
g_ptr_array_add(fields, field);
field = network_mysqld_proto_fielddef_new();
field->name = g_strdup("Time");
field->name = g_strdup("ProcessTime");
field->type = MYSQL_TYPE_STRING;
g_ptr_array_add(fields, field);
@ -976,25 +976,31 @@ void admin_delete_user_password(network_mysqld_con* con, char* user)
SERVER_STATUS_AUTOCOMMIT, 0);
}
#define ERROR_PARAM -1
static backend_type_t backend_type(const char* str)
{
backend_type_t type = BACKEND_TYPE_UNKNOWN;
backend_type_t type = ERROR_PARAM;
if (strcasecmp(str, "ro")==0)
type = BACKEND_TYPE_RO;
else if (strcasecmp(str, "rw")==0)
type = BACKEND_TYPE_RW;
else if (strcasecmp(str, "unknown")==0)
type = BACKEND_TYPE_UNKNOWN;
return type;
}
static backend_state_t backend_state(const char* str)
{
backend_state_t state = BACKEND_STATE_UNKNOWN;
backend_state_t state = ERROR_PARAM;
if (strcasecmp(str, "up")==0)
state = BACKEND_STATE_UP;
else if (strcasecmp(str, "down")==0)
state = BACKEND_STATE_DOWN;
else if (strcasecmp(str, "maintaining")==0)
state = BACKEND_STATE_MAINTAINING;
else if (strcasecmp(str, "unknown") == 0)
state = BACKEND_STATE_UNKNOWN;
return state;
}
@ -1047,6 +1053,10 @@ void admin_update_backend(network_mysqld_con* con, GList* equations,
}
int type = type_str ? backend_type(type_str) : bk->type;
int state = state_str ? backend_state(state_str) : bk->state;
if (type == ERROR_PARAM || state == ERROR_PARAM) {
network_mysqld_con_send_error(con->client, C("parameter error"));
return;
}
int ok = network_backends_modify(g->backends, backend_ndx, type, state, NO_PREVIOUS_STATE);
int affected_rows = ok ? 1 : 0;
network_mysqld_con_send_ok_full(con->client, affected_rows, 0,

10
plugins/admin/admin-plugin.c
View File

@ -424,6 +424,14 @@ NETWORK_MYSQLD_PLUGIN_PROTO(server_read_query) {
return NETWORK_SOCKET_SUCCESS;
}
NETWORK_MYSQLD_PLUGIN_PROTO(server_timeout)
{
con->prev_state = con->state;
con->state = ST_SEND_ERROR;
return NETWORK_SOCKET_SUCCESS;
}
/**
* cleanup the admin specific data on the current connection
*
@ -444,6 +452,8 @@ static int network_mysqld_server_connection_init(network_mysqld_con *con) {
con->plugins.con_read_query = server_read_query;
con->plugins.con_timeout = server_timeout;
con->plugins.con_cleanup = admin_disconnect_client;
return 0;

3
src/network-backend.c
View File

@ -326,9 +326,6 @@ network_backends_modify(network_backends_t *bs, guint ndx,
g_get_current_time(&now);
if (ndx >= network_backends_count(bs))
return -1;
if(state >= BACKEND_STATE_END) {
return -1;
}
network_backend_t *cur = bs->backends->pdata[ndx];

1
src/network-backend.h
View File

@ -38,7 +38,6 @@ typedef enum {
BACKEND_STATE_DOWN,
BACKEND_STATE_MAINTAINING,
BACKEND_STATE_DELETED,
BACKEND_STATE_END,
} backend_state_t;
#define NO_PREVIOUS_STATE -1