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

Merge branch 'logger' into v1.1.1

Browse Source
SQLiteServer
René Cannaò 10 years ago
parent ccef9a5670 57b4512040
commit f98eecbf4b
8 changed files with 117 additions and 11 deletions
Show Stats Download Patch File Download Diff File

4
include/MySQL_Logger.hpp
Unescape View File

@ -5,6 +5,7 @@
class MySQL_Logger {
private:
bool enabled;
char *base_filename;
char *datadir;
unsigned int log_file_id;
@ -13,6 +14,8 @@ class MySQL_Logger {
void wrlock();
void wrunlock();
std::fstream *logfile;
void close_log_unlocked();
void open_log_unlocked();
public:
MySQL_Logger();
~MySQL_Logger();
@ -20,6 +23,7 @@ class MySQL_Logger {
void flush_log_unlocked();
unsigned int find_next_id();
void set_datadir(char *);
void set_base_filename();
void log_request(MySQL_Session *);
void flush();
};

2
include/MySQL_Thread.h
Unescape View File

@ -295,6 +295,8 @@ class MySQL_Threads_Handler
uint16_t server_capabilities;
int poll_timeout;
int poll_timeout_on_failure;
char *eventslog_filename;
int eventslog_filesize;
} variables;
PtrArray *bind_fds;
MySQL_Listeners_Manager *MLM;

8
include/proxysql_structs.h
Unescape View File

@ -706,6 +706,10 @@ __thread bool mysql_thread___query_digests;
__thread bool mysql_thread___default_reconnect;
__thread bool mysql_thread___sessions_sort;
/* variables used by events log */
__thread char * mysql_thread___eventslog_filename;
__thread int mysql_thread___eventslog_filesize;
/* variables used by the monitoring module */
__thread int mysql_thread___monitor_history;
__thread int mysql_thread___monitor_connect_interval;
@ -765,6 +769,10 @@ extern __thread bool mysql_thread___query_digests;
extern __thread bool mysql_thread___default_reconnect;
extern __thread bool mysql_thread___sessions_sort;
/* variables used by events log */
extern __thread char * mysql_thread___eventslog_filename;
extern __thread int mysql_thread___eventslog_filesize;
/* variables used by the monitoring module */
extern __thread int mysql_thread___monitor_history;
extern __thread int mysql_thread___monitor_connect_interval;

66
lib/MySQL_Logger.cpp
Unescape View File

@ -8,20 +8,21 @@
extern Query_Processor *GloQPro;
MySQL_Logger::MySQL_Logger() {
enabled=false;
base_filename=NULL;
datadir=NULL;
// FIXME, temp
base_filename=(char *)"mysql-log";
base_filename=strdup((char *)"");
spinlock_rwlock_init(&rwlock);
logfile=NULL;
log_file_id=0;
max_log_file_size=1024*1024;
max_log_file_size=100*1024*1024;
};
MySQL_Logger::~MySQL_Logger() {
if (datadir) {
free(datadir);
}
free(base_filename);
};
void MySQL_Logger::wrlock() {
@ -37,21 +38,38 @@ void MySQL_Logger::flush_log() {
flush_log_unlocked();
wrunlock();
}
void MySQL_Logger::flush_log_unlocked() {
return; // FIXME: this line prevents the logger from starting. Here for testing
void MySQL_Logger::close_log_unlocked() {
if (logfile) {
logfile->flush();
logfile->close();
delete logfile;
logfile=NULL;
}
}
void MySQL_Logger::flush_log_unlocked() {
if (enabled==false) return;
close_log_unlocked();
open_log_unlocked();
}
void MySQL_Logger::open_log_unlocked() {
if (log_file_id==0) {
log_file_id=find_next_id()+1;
} else {
log_file_id++;
}
char *filen=(char *)malloc(strlen(datadir)+strlen(base_filename)+10);
sprintf(filen,"%s/%s.%06d",datadir,base_filename,log_file_id);
char *filen=NULL;
if (base_filename[0]=='/') { // absolute path
filen=(char *)malloc(strlen(base_filename)+10);
sprintf(filen,"/%s.%08d",base_filename,log_file_id);
} else { // relative path
filen=(char *)malloc(strlen(datadir)+strlen(base_filename)+10);
sprintf(filen,"%s/%s.%08d",datadir,base_filename,log_file_id);
}
logfile=new std::fstream();
logfile->exceptions ( std::ofstream::failbit | std::ofstream::badbit );
try {
@ -68,12 +86,36 @@ void MySQL_Logger::flush_log_unlocked() {
//close(fd);
};
void MySQL_Logger::set_base_filename() {
// if filename is the same, return
wrlock();
max_log_file_size=mysql_thread___eventslog_filesize;
if (strcmp(base_filename,mysql_thread___eventslog_filename)==0) {
wrunlock();
return;
}
// close current log
close_log_unlocked();
// set file id to 0 , so that find_next_id() will be called
log_file_id=0;
free(base_filename);
base_filename=strdup(mysql_thread___eventslog_filename);
if (strlen(base_filename)) {
enabled=true;
open_log_unlocked();
} else {
enabled=false;
}
wrunlock();
}
void MySQL_Logger::set_datadir(char *s) {
datadir=strdup(s);
flush_log();
};
void MySQL_Logger::log_request(MySQL_Session *sess) {
if (enabled==false) return;
if (logfile==NULL) return;
mysql_logger::event ev;
ev.set_thread_id(sess->thread_session_id);
@ -83,7 +125,13 @@ void MySQL_Logger::log_request(MySQL_Session *sess) {
ev.set_start_time(sess->CurrentQuery.start_time);
ev.set_end_time(sess->CurrentQuery.end_time);
ev.set_query_digest(GloQPro->get_digest(sess->CurrentQuery.QueryParserArgs));
ev.set_query((const char *)sess->CurrentQuery.QueryPointer);
char *c=(char *)sess->CurrentQuery.QueryPointer;
if (c) {
// FIXME: NEEDS LENGTH . Use Bytes
ev.set_query(c,sess->CurrentQuery.QueryLength);
} else {
ev.set_query("");
}
ev.set_server("");
ev.set_client("");
wrlock();
@ -113,7 +161,7 @@ unsigned int MySQL_Logger::find_next_id() {
size_t bfl=strlen(base_filename);
if ((dir = opendir(datadir)) != NULL) {
while ((ent = readdir (dir)) != NULL) {
if (strlen(ent->d_name)==bfl+7) {
if (strlen(ent->d_name)==bfl+9) {
if (strncmp(ent->d_name,base_filename,bfl)==0) {
if (ent->d_name[bfl]=='.') {
int idx=atoi(ent->d_name+bfl+1);

3
lib/MySQL_Session.cpp
Unescape View File

@ -92,8 +92,8 @@ void Query_Info::begin(unsigned char *_p, int len, bool mysql_header) {
QueryLength=0;
QueryParserArgs=NULL;
start_time=sess->thread->curtime;
init(_p, len, mysql_header);
if (mysql_thread___commands_stats || mysql_thread___query_digests) {
init(_p, len, mysql_header);
query_parser_init();
if (mysql_thread___commands_stats)
query_parser_command_type();
@ -136,6 +136,7 @@ void Query_Info::query_parser_free() {
unsigned long long Query_Info::query_parser_update_counters() {
if (MyComQueryCmd==MYSQL_COM_QUERY___NONE) return 0; // this means that it was never initialized
if (MyComQueryCmd==MYSQL_COM_QUERY_UNKNOWN) return 0; // this means that it was never initialized
unsigned long long ret=GloQPro->query_parser_update_counters(sess, MyComQueryCmd, QueryParserArgs, end_time-start_time);
MyComQueryCmd=MYSQL_COM_QUERY___NONE;
//l_free(QueryLength+1,QueryPointer);

36
lib/MySQL_Thread.cpp
Unescape View File

@ -140,6 +140,8 @@ static char * mysql_thread_variables_names[]= {
(char *)"connect_retries_delay",
(char *)"connect_timeout_server",
(char *)"connect_timeout_server_max",
(char *)"eventslog_filename",
(char *)"eventslog_filesize",
(char *)"default_charset",
(char *)"free_connections_pct",
(char *)"have_compress",
@ -243,6 +245,8 @@ MySQL_Threads_Handler::MySQL_Threads_Handler() {
variables.default_charset=33;
variables.interfaces=strdup((char *)"");
variables.server_version=strdup((char *)"5.1.30");
variables.eventslog_filename=strdup((char *)""); // proxysql-mysql-eventslog is recommended
variables.eventslog_filesize=100*1024*1024;
variables.server_capabilities=CLIENT_FOUND_ROWS | CLIENT_PROTOCOL_41 | CLIENT_IGNORE_SIGPIPE | CLIENT_TRANSACTIONS | CLIENT_SECURE_CONNECTION | CLIENT_CONNECT_WITH_DB | CLIENT_SSL;
variables.poll_timeout=2000;
variables.poll_timeout_on_failure=100;
@ -337,6 +341,7 @@ char * MySQL_Threads_Handler::get_variable_string(char *name) {
if (!strcasecmp(name,"monitor_query_status")) return strdup(variables.monitor_query_status);
}
if (!strcasecmp(name,"server_version")) return strdup(variables.server_version);
if (!strcasecmp(name,"eventslog_filename")) return strdup(variables.eventslog_filename);
if (!strcasecmp(name,"default_schema")) return strdup(variables.default_schema);
if (!strcasecmp(name,"interfaces")) return strdup(variables.interfaces);
proxy_error("Not existing variable: %s\n", name); assert(0);
@ -380,6 +385,7 @@ int MySQL_Threads_Handler::get_variable_int(char *name) {
if (!strcasecmp(name,"connect_timeout_server")) return (int)variables.connect_timeout_server;
if (!strcasecmp(name,"connect_timeout_server_max")) return (int)variables.connect_timeout_server_max;
if (!strcasecmp(name,"connect_retries_delay")) return (int)variables.connect_retries_delay;
if (!strcasecmp(name,"eventslog_filesize")) return (int)variables.eventslog_filesize;
if (!strcasecmp(name,"max_transaction_time")) return (int)variables.max_transaction_time;
if (!strcasecmp(name,"threshold_query_length")) return (int)variables.threshold_query_length;
if (!strcasecmp(name,"threshold_resultset_size")) return (int)variables.threshold_resultset_size;
@ -409,6 +415,7 @@ char * MySQL_Threads_Handler::get_variable(char *name) { // this is the public f
#define INTBUFSIZE 4096
char intbuf[INTBUFSIZE];
if (!strcasecmp(name,"server_version")) return strdup(variables.server_version);
if (!strcasecmp(name,"eventslog_filename")) return strdup(variables.eventslog_filename);
if (!strcasecmp(name,"default_schema")) return strdup(variables.default_schema);
if (!strcasecmp(name,"interfaces")) return strdup(variables.interfaces);
if (!strcasecmp(name,"server_capabilities")) {
@ -509,6 +516,10 @@ char * MySQL_Threads_Handler::get_variable(char *name) { // this is the public f
sprintf(intbuf,"%d",variables.connect_retries_delay);
return strdup(intbuf);
}
if (!strcasecmp(name,"eventslog_filesize")) {
sprintf(intbuf,"%d",variables.eventslog_filesize);
return strdup(intbuf);
}
if (!strcasecmp(name,"max_transaction_time")) {
sprintf(intbuf,"%d",variables.max_transaction_time);
return strdup(intbuf);
@ -921,6 +932,15 @@ bool MySQL_Threads_Handler::set_variable(char *name, char *value) { // this is t
return false;
}
}
if (!strcasecmp(name,"eventslog_filesize")) {
int intv=atoi(value);
if (intv >= 1024*1024 && intv <= 1*1024*1024*1024) {
variables.eventslog_filesize=intv;
return true;
} else {
return false;
}
}
if (!strcasecmp(name,"default_schema")) {
if (vallen) {
free(variables.default_schema);
@ -952,6 +972,15 @@ bool MySQL_Threads_Handler::set_variable(char *name, char *value) { // this is t
return false;
}
}
if (!strcasecmp(name,"eventslog_filename")) {
if (vallen) {
free(variables.eventslog_filename);
variables.eventslog_filename=strdup(value);
return true;
} else {
return false;
}
}
if (!strcasecmp(name,"server_capabilities")) {
int intv=atoi(value);
if (intv > 10 && intv <= 65535) {
@ -1183,6 +1212,7 @@ MySQL_Threads_Handler::~MySQL_Threads_Handler() {
if (variables.default_schema) free(variables.default_schema);
if (variables.interfaces) free(variables.interfaces);
if (variables.server_version) free(variables.server_version);
if (variables.eventslog_filename) free(variables.eventslog_filename);
free(mysql_threads);
mysql_threads=NULL;
delete MLM;
@ -1222,6 +1252,7 @@ MySQL_Thread::~MySQL_Thread() {
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; }
if (mysql_thread___eventslog_filename) { free(mysql_thread___eventslog_filename); mysql_thread___eventslog_filename=NULL; }
}
@ -1732,6 +1763,10 @@ void MySQL_Thread::refresh_variables() {
if (mysql_thread___server_version) free(mysql_thread___server_version);
mysql_thread___server_version=GloMTH->get_variable_string((char *)"server_version");
if (mysql_thread___eventslog_filename) free(mysql_thread___eventslog_filename);
mysql_thread___eventslog_filesize=GloMTH->get_variable_int((char *)"eventslog_filesize");
mysql_thread___eventslog_filename=GloMTH->get_variable_string((char *)"eventslog_filename");
GloMyLogger->set_base_filename(); // both filename and filesize are set here
if (mysql_thread___default_schema) free(mysql_thread___default_schema);
mysql_thread___default_schema=GloMTH->get_variable_string((char *)"default_schema");
mysql_thread___server_capabilities=GloMTH->get_variable_uint16((char *)"server_capabilities");
@ -1765,6 +1800,7 @@ MySQL_Thread::MySQL_Thread() {
mysql_sessions_connections_handler=NULL;
__thread_MySQL_Thread_Variables_version=0;
mysql_thread___server_version=NULL;
mysql_thread___eventslog_filename=NULL;
status_variables.queries=0;
status_variables.queries_slow=0;

7
lib/ProxySQL_GloVars.cpp
Unescape View File

@ -23,6 +23,13 @@ void crash_handler(int sig) {
fprintf(stderr, "Error: signal %d:\n", sig);
backtrace_symbols_fd(arr, s, STDERR_FILENO);
#ifdef SYS_gettid
// try to generate a core dump signaling again the thread
signal(sig, SIG_DFL);
pid_t tid;
tid = syscall(SYS_gettid);
kill(tid, sig);
#endif /* SYS_gettid */
exit(EXIT_FAILURE);
}

2
src/main.cpp
Unescape View File

@ -317,7 +317,6 @@ void ProxySQL_Main_init() {
#else
glovars.has_debug=false;
#endif /* DEBUG */
GloVars.global.start_time=monotonic_time();
__thr_sfp=l_mem_init();
{
@ -508,6 +507,7 @@ int main(int argc, const char * argv[]) {
} else { /* The daemon */
GloVars.global.start_time=monotonic_time();
if (ProxySQL_daemonize_phase2()==false) {
goto finish;
}

Write Preview
Loading…
Cancel
Save