aherman
/
proxysql
mirror of https://github.com/sysown/proxysql
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "T92 add consul script path variable"

Browse Source
pull/505/head
Ionut Prunache 10 years ago
parent 6cf3ed0857
commit 4dc0fa720f
5 changed files with 40 additions and 64 deletions
Show Stats Download Patch File Download Diff File

4
.gitignore vendored
Unescape View File

@ -29,10 +29,6 @@ oldcode/tests/connect_speed
*.swp
# CLion project files
.idea
CMakeLists.txt
# CTags
.tags
.tags_sorted_by_file

4
doc/global_variables.md
Unescape View File

@ -48,10 +48,6 @@ Not currently used (planned usage in a future version).
Not currently used (planned usage in a future version).
### `admin-proxysql_consul_script_path`
Defines the path to the proxysql-consul script used for integration with Consul. When commands like `SAVE MYSQL SERVERS TO CLUSTER` are executed, ProxySQL forks a process that executes the script at the path defined by the variable to forward the table contents to Consul. The default is `/usr/bin/local/proxysql-consul` which is the path where `make install` installs the script.
### `mysql-commands_stats`
Enable per-command MySQL query statistics. A command is a type of SQL query that is being executed. Some examples are: SELECT, INSERT or ALTER TABLE. See the `stats_mysql_commands_counters` section in the [admin tables documentation](https://github.com/sysown/proxysql-0.2/blob/master/doc/admin_tables.md#stats_mysql_commands_counters) in order to see more details about what kind of statistics are gathered.

5
include/proxysql_admin.h
Unescape View File

@ -33,8 +33,7 @@ class ProxySQL_Admin {
char *telnet_admin_ifaces;
char *telnet_stats_ifaces;
bool admin_read_only;
char *admin_version;
char *proxysql_consul_script_path;
char * admin_version;
#ifdef DEBUG
bool debug;
#endif /* DEBUG */
@ -112,7 +111,7 @@ class ProxySQL_Admin {
void flush_mysql_users__from_disk_to_memory();
void flush_mysql_servers__from_memory_to_disk();
void flush_mysql_servers__from_disk_to_memory();
void flush_mysql_query_rules__from_memory_to_disk();
void flush_mysql_query_rules__from_memory_to_disk();
void flush_mysql_query_rules__from_disk_to_memory();
bool save_mysql_query_rules_to_cluster();
void load_mysql_servers_to_runtime();

90
lib/ProxySQL_Admin.cpp
Unescape View File

@ -98,16 +98,15 @@ pthread_mutex_t admin_mutex = PTHREAD_MUTEX_INITIALIZER;
static char * admin_variables_names[]= {
(char *)"admin_credentials",
(char *)"stats_credentials",
(char *)"mysql_ifaces",
(char *)"telnet_admin_ifaces",
(char *)"telnet_stats_ifaces",
(char *)"mysql_ifaces",
(char *)"refresh_interval",
(char *)"admin_credentials",
(char *)"stats_credentials",
(char *)"mysql_ifaces",
(char *)"telnet_admin_ifaces",
(char *)"telnet_stats_ifaces",
(char *)"mysql_ifaces",
(char *)"refresh_interval",
(char *)"read_only",
(char *)"version",
(char *)"proxysql_consul_script_path",
#ifdef DEBUG
(char *)"debug",
#endif /* DEBUG */
@ -216,7 +215,7 @@ class admin_main_loop_listeners {
}
return ifaces;
}
public:
int nfds;
@ -1269,7 +1268,7 @@ void admin_session_handler(MySQL_Session *sess, ProxySQL_Admin *pa, PtrSize_t *p
memcpy(query,(char *)pkt->ptr+sizeof(mysql_hdr)+1,query_length-1);
query[query_length-1]=0;
char *query_no_space=(char *)l_alloc(query_length);
char *query_no_space=(char *)l_alloc(query_length);
memcpy(query_no_space,query,query_length);
unsigned int query_no_space_length=remove_spaces(query_no_space);
@ -1307,16 +1306,16 @@ void admin_session_handler(MySQL_Session *sess, ProxySQL_Admin *pa, PtrSize_t *p
}
if (sess->stats==false) {
if ((query_no_space_length>8) && (!strncasecmp("PROXYSQL ", query_no_space, 8))) {
if ((query_no_space_length>8) && (!strncasecmp("PROXYSQL ", query_no_space, 8))) {
proxy_debug(PROXY_DEBUG_ADMIN, 4, "Received PROXYSQL command\n");
pthread_mutex_lock(&admin_mutex);
run_query=admin_handler_command_proxysql(query_no_space, query_no_space_length, sess, pa);
pthread_mutex_unlock(&admin_mutex);
goto __run_query;
}
if ((query_no_space_length>5) && ( (!strncasecmp("SAVE ", query_no_space, 5)) || (!strncasecmp("LOAD ", query_no_space, 5))) ) {
if ((query_no_space_length>5) && ( (!strncasecmp("SAVE ", query_no_space, 5)) || (!strncasecmp("LOAD ", query_no_space, 5))) ) {
proxy_debug(PROXY_DEBUG_ADMIN, 4, "Received LOAD or SAVE command\n");
run_query=admin_handler_command_load_or_save(query_no_space, query_no_space_length, sess, pa, &query, &query_length);
run_query=admin_handler_command_load_or_save(query_no_space, query_no_space_length, sess, pa, &query, &query_length);
goto __run_query;
}
if ((query_no_space_length>16) && ( (!strncasecmp("KILL CONNECTION ", query_no_space, 16)) || (!strncasecmp("KILL CONNECTION ", query_no_space, 16))) ) {
@ -1821,7 +1820,7 @@ void *child_mysql(void *arg) {
MySQL_Data_Stream *myds=sess->client_myds;
fds[0].fd=client;
fds[0].revents=0;
fds[0].revents=0;
fds[0].events=POLLIN|POLLOUT;
//sess->myprot_client.generate_pkt_initial_handshake(sess->client_myds,true,NULL,NULL);
@ -1829,14 +1828,14 @@ void *child_mysql(void *arg) {
unsigned long oldtime=monotonic_time();
unsigned long curtime=monotonic_time();
while (__sync_fetch_and_add(&glovars.shutdown,0)==0) {
if (myds->available_data_out()) {
fds[0].events=POLLIN|POLLOUT;
fds[0].events=POLLIN|POLLOUT;
} else {
fds[0].events=POLLIN;
fds[0].events=POLLIN;
}
fds[0].revents=0;
fds[0].revents=0;
//rc=poll(fds,nfds,2000);
rc=poll(fds,nfds,__sync_fetch_and_add(&__admin_refresh_interval,0));
{
@ -1872,13 +1871,13 @@ __exit_child_mysql:
//delete sess;
if (mysql_thread___default_schema) { free(mysql_thread___default_schema); mysql_thread___default_schema=NULL; }
if (mysql_thread___server_version) { free(mysql_thread___server_version); mysql_thread___server_version=NULL; }
delete mysql_thr;
// l_mem_destroy(__thr_sfp);
delete mysql_thr;
// l_mem_destroy(__thr_sfp);
return NULL;
}
void* child_telnet(void* arg)
{
{
int bytes_read;
//int i;
// struct timeval tv;
@ -1891,7 +1890,7 @@ void* child_telnet(void* arg)
memset(line,0,LINESIZE+1);
while ((strncmp(line, "quit", 4) != 0) && glovars.shutdown==0) {
bytes_read = recv(client, line, LINESIZE, 0);
if (bytes_read==-1) {
if (bytes_read==-1) {
break;
}
char *eow = strchr(line, '\n');
@ -1909,7 +1908,7 @@ void* child_telnet(void* arg)
}
void* child_telnet_also(void* arg)
{
{
int bytes_read;
//int i;
// struct timeval tv;
@ -1922,7 +1921,7 @@ void* child_telnet_also(void* arg)
memset(line,0,LINESIZE+1);
while ((strncmp(line, "quit", 4) != 0) && glovars.shutdown==0) {
bytes_read = recv(client, line, LINESIZE, 0);
if (bytes_read==-1) {
if (bytes_read==-1) {
break;
}
char *eow = strchr(line, '\n');
@ -1956,7 +1955,7 @@ static void * admin_main_loop(void *arg)
volatile int *shutdown=((struct _main_args *)arg)->shutdown;
char *socket_names[MAX_ADMIN_LISTENERS];
for (i=0;i<MAX_ADMIN_LISTENERS;i++) { socket_names[i]=NULL; }
pthread_attr_t attr;
pthread_attr_t attr;
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
pthread_attr_setstacksize (&attr, mystacksize);
@ -2036,9 +2035,9 @@ __end_while_pool:
// int s = ( atoi(port) ? listen_on_port(add, atoi(port), 50) : listen_on_unix(add, 50));
// if (s>0) { fds[nfds].fd=s; fds[nfds].events=POLLIN; fds[nfds].revents=0; callback_func[nfds]=2; socket_names[nfds]=strdup(sn); nfds++; }
// }
S_amll.wrunlock();
S_amll.wrunlock();
}
}
//if (__sync_add_and_fetch(shutdown,0)==0) __sync_add_and_fetch(shutdown,1);
for (i=0; i<nfds; i++) {
@ -2084,7 +2083,6 @@ ProxySQL_Admin::ProxySQL_Admin() {
variables.refresh_interval=2000;
variables.admin_read_only=false; // by default, the admin interface accepts writes
variables.admin_version=(char *)PROXYSQL_VERSION;
variables.proxysql_consul_script_path = strdup((char *)"/usr/local/bin/proxysql-consul");
#ifdef DEBUG
variables.debug=GloVars.global.gdbg;
#endif /* DEBUG */
@ -2118,7 +2116,7 @@ bool ProxySQL_Admin::init() {
main_poll_fds=(struct pollfd *)malloc(sizeof(struct pollfd)*MAX_ADMIN_LISTENERS);
main_poll_nfds=0;
pthread_attr_t attr;
pthread_attr_t attr;
pthread_attr_init(&attr);
pthread_attr_setstacksize (&attr, mystacksize);
@ -2180,7 +2178,7 @@ bool ProxySQL_Admin::init() {
dump_mysql_collations();
#ifdef DEBUG
#ifdef DEBUG
admindb->execute("ATTACH DATABASE 'file:mem_mydb?mode=memory&cache=shared' AS myhgm");
#endif /* DEBUG */
@ -2207,16 +2205,16 @@ bool ProxySQL_Admin::init() {
if (GloVars.__cmd_proxysql_reload || GloVars.__cmd_proxysql_initial) {
if (GloVars.configfile_open) {
if (GloVars.confFile->cfg) {
Read_MySQL_Servers_from_configfile();
if (GloVars.confFile->cfg) {
Read_MySQL_Servers_from_configfile();
Read_Global_Variables_from_configfile("admin");
Read_Global_Variables_from_configfile("mysql");
Read_MySQL_Users_from_configfile();
Read_MySQL_Query_Rules_from_configfile();
__insert_or_replace_disktable_select_maintable();
} else {
if (GloVars.confFile->OpenFile(GloVars.config_file)==true) {
Read_MySQL_Servers_from_configfile();
if (GloVars.confFile->OpenFile(GloVars.config_file)==true) {
Read_MySQL_Servers_from_configfile();
Read_MySQL_Users_from_configfile();
Read_MySQL_Query_Rules_from_configfile();
Read_Global_Variables_from_configfile("admin");
@ -2233,7 +2231,7 @@ bool ProxySQL_Admin::init() {
S_amll.update_ifaces(variables.telnet_admin_ifaces, &S_amll.ifaces_telnet_admin);
S_amll.update_ifaces(variables.telnet_stats_ifaces, &S_amll.ifaces_telnet_stats);
// pthread_t admin_thr;
struct _main_args *arg=(struct _main_args *)malloc(sizeof(struct _main_args));
@ -2484,7 +2482,7 @@ void ProxySQL_Admin::flush_mysql_variables___runtime_to_database(SQLite3DB *db,
}
int l=strlen(a)+200;
GloMTH->wrlock();
char **varnames=GloMTH->get_variables_list();
char **varnames=GloMTH->get_variables_list();
char *query=(char *)malloc(l);
for (int i=0; varnames[i]; i++) {
char *val=GloMTH->get_variable(varnames[i]);
@ -2514,7 +2512,6 @@ char * ProxySQL_Admin::get_variable(char *name) {
#define INTBUFSIZE 4096
char intbuf[INTBUFSIZE];
if (!strcasecmp(name,"version")) return s_strdup(variables.admin_version);
if (!strcasecmp(name,"proxysql_consul_script_path")) return s_strdup(variables.proxysql_consul_script_path);
if (!strcasecmp(name,"admin_credentials")) return s_strdup(variables.admin_credentials);
if (!strcasecmp(name,"stats_credentials")) return s_strdup(variables.stats_credentials);
if (!strcasecmp(name,"mysql_ifaces")) return s_strdup(variables.mysql_ifaces);
@ -2701,16 +2698,6 @@ bool ProxySQL_Admin::set_variable(char *name, char *value) { // this is the pub
return false;
}
}
if (!strcasecmp(name, "proxysql_consul_script_path")) {
if (vallen) {
if (variables.proxysql_consul_script_path)
free(variables.proxysql_consul_script_path);
variables.proxysql_consul_script_path=strdup(value);
return true;
} else {
return false;
}
}
if (!strcasecmp(name,"read_only")) {
if (strcasecmp(value,"true")==0 || strcasecmp(value,"1")==0) {
variables.admin_read_only=true;
@ -3014,7 +3001,7 @@ void ProxySQL_Admin::flush_admin_variables___runtime_to_database(SQLite3DB *db,
}
int l=strlen(a)+200;
char **varnames=get_variables_list();
char **varnames=get_variables_list();
char *query=(char *)malloc(l);
for (int i=0; varnames[i]; i++) {
char *val=get_variable(varnames[i]);
@ -3316,7 +3303,7 @@ void ProxySQL_Admin::save_mysql_users_runtime_to_database() {
if (!resultset) return;
for (std::vector<SQLite3_row *>::iterator it = resultset->rows.begin() ; it != resultset->rows.end(); ++it) {
SQLite3_row *r=*it;
}
}
if(resultset) delete resultset;
*/
char *qd=(char *)"UPDATE mysql_users SET active=0";
@ -3465,7 +3452,7 @@ void ProxySQL_Admin::load_mysql_servers_to_runtime() {
if (resultset) delete resultset;
resultset=NULL;
query=(char *)"SELECT a.* FROM mysql_replication_hostgroups a LEFT JOIN mysql_replication_hostgroups b ON a.writer_hostgroup=b.reader_hostgroup WHERE b.reader_hostgroup IS NULL";
query=(char *)"SELECT a.* FROM mysql_replication_hostgroups a LEFT JOIN mysql_replication_hostgroups b ON a.writer_hostgroup=b.reader_hostgroup WHERE b.reader_hostgroup IS NULL";
proxy_debug(PROXY_DEBUG_ADMIN, 4, "%s\n", query);
admindb->execute_statement(query, &error , &cols , &affected_rows , &resultset);
@ -3503,8 +3490,7 @@ int ProxySQL_Admin::save_config_to_cluster(char *tablename) {
if (pid == 0) {
// child
errno = 0;
char *proxysql_consul_script_path = get_variable((char *)"proxysql_consul_script_path");
int exec_status = execlp(proxysql_consul_script_path, proxysql_consul_script_path, "put", tablename, (char *) 0);
int exec_status = execlp("/usr/local/bin/proxysql-consul", "/usr/local/bin/proxysql-consul", "put", tablename, (char *) 0);
if (exec_status == -1) {
proxy_error("Exec failed for config save script with errno: %d.\n", errno);
}

1
requirements.txt
Unescape View File

@ -1,5 +1,4 @@
docker-compose==1.4.2
docopt==0.6.2
Jinja2==2.8
MySQL-python==1.2.5
nose==1.3.6

Write Preview
Loading…
Cancel
Save