Markus Makela
d3da98b58f
Merge branch 'MXS-544' into develop-MXS-544-merge
2016-03-03 21:39:39 +02:00
Johan Wikman
cb3213af63
server/include/poll.h renamed to server/include/maxscale/poll.h
...
Due to an include conflict between /usr/include/poll.h and
maxscale/server/include/poll.h the latter was moved to
maxscale/server/include/maxscale/poll.h.
Once 1.4 is out, all maxscale header files will be moved to that
same sub-directory. That will prevent include conflicts and also
make it easy to see which include files belong to maxscale and
which do not.
2016-03-01 12:56:39 +02:00
counterpoint
8367d93746
Migrate SSL functionality out of service and into listener. Develop config handling accordingly, including making provision for SSL parameters in servers for future use in implementing SSL to backend servers. Some elements still to be tidied mainly in mysql_client.c - but that will be part of detaching the SSL authentication from the MySQL protocol.
2016-01-27 15:46:19 +00:00
counterpoint
e58148356d
Split off listener functionality and move SSL initiation from service to listener. Put GWPROTOCOL in its own header file.
2016-01-26 16:08:02 +00:00
Johan Wikman
1b94c5b519
Reformat mascaled.c
2016-01-12 14:20:11 +02:00
Johan Wikman
453055a6c0
server/modules/protocol: All LOGIFs and skygw_log_writes replaced.
...
LOGIFs and skygw_log_writes replaced with the equivalent
MXS_[ERROR|WARNING|NOTICE|INFO|DEBUG] macros.
2015-11-17 09:21:47 +02:00
counterpoint
dee20fe077
Merge remote-tracking branch 'origin/develop' into MXS-329-develop-20151111
...
# Conflicts:
# server/core/CMakeLists.txt
# server/core/buffer.c
# server/core/service.c
# server/modules/filter/tee.c
# server/modules/monitor/mysql_mon.c
# server/modules/routing/binlog/blr.c
# server/modules/routing/binlog/blr_slave.c
# server/modules/routing/debugcmd.c
# server/modules/routing/readwritesplit/readwritesplit.c
# utils/skygw_utils.cc
- resolved.
2015-11-11 11:08:02 +00:00
Johan Wikman
834a88aeda
Log variables moved to log_manager.h
...
The log manager variables lm_enabled_log_files_bitmask, log_ses_count
and tls_log_info that earlier were declared separately in every
c-file are now declared in the log_manager.h header.
2015-11-04 14:26:53 +02:00
counterpoint
7aa36b77ea
Guarantee router session is present for call to clientReply; properly free callbacks; attempt to set all necessary values for dbusers; do more to ensure buffers freed.
2015-09-21 14:25:12 +01:00
counterpoint
cfeaf7d6e9
Merge remote-tracking branch 'origin/develop' into MXS-329
...
Conflicts:
server/core/session.c
2015-09-10 13:07:27 +01:00
Johan Wikman
160bbb70ee
MXS-251: strerror
...
Replaces all calls to strerror with calls to strerror_r. The former
is non-thread safe while the latter is.
2015-09-05 15:52:13 +03:00
counterpoint
37ac158791
Changes to try to eliminate setting dcb->session to NULL with risk of crashing system.
2015-08-24 12:12:43 +01:00
Markus Makela
78eab19c62
Fixed compiler warnings.
2015-07-14 17:13:09 +03:00
counterpoint
4f5de063eb
Merged dcb_read and dcb_read_n into a single function (dcb_read with an extra parameter).
2015-07-10 15:12:22 +01:00
counterpoint
4c8aa02c31
Finalise comments; change abort from assert(false) to raise(SIGABRT).
2015-07-07 16:57:13 +01:00
counterpoint
fffd8fb73a
Unify DCB close processing to single function dcb_close. Remove dcb_add_to_zombieslist (incorporating logic into dcb_close). Alter logic so that DCB that is just allocated will still go to zombie list if dcb->fd is not closed.
2015-07-07 16:57:12 +01:00
Markus Makela
aa4932bf2d
Moved the housekeeper heartbeat to a separate header for ease of integration.
...
This keeps the behavior the same but allows the heartbeat to be used as a crude timer
without including everything the housekeeper.h header includes.
Moved the protocol level updates on the DCBs last_read value into dcb_read.
This keeps the implementation nice and compact.
2015-02-24 05:00:16 +02:00
Markus Makela
c47d2f3791
Added session timeouts.
...
The parameter 'connection_timeout' for services takes a value as seconds.
All sessions that have been idle for longer than this will be disconnected.
2015-02-20 22:16:43 +02:00
Mark Riddoch
8fed527ac9
Merge branch 'release-1.0GA' into blr
2014-12-08 09:21:38 +00:00
Mark Riddoch
ce056dccd8
Update modue status of all GA modules
2014-12-08 09:19:35 +00:00
Mark Riddoch
ad2ca62248
Log the start of the lsitener to the message log in line with other protocols
2014-12-02 13:39:46 +00:00
Mark Riddoch
0e6fa09d7e
Fixes for Coverity issues
2014-11-19 16:01:38 +00:00
VilhoRaatikka
fd11e6a7f5
Session-specific logging. Added functions
...
void session_enable_log(SESSION* ses, logfile_id_t id)
and
void session_disable_log(SESSION* ses, logfile_id_t id)
Which switch specific log type on/off if the log type in question is not generally enabled.
Each thread carries a thread-specific struct log_info_t which includes members for current session id and bitfield for enabled log types for the current session. That information is checked before actual log write functions are called.
Each file where session-specific logging is used, must include the following exports:
/** Defined in log_manager.cc */
extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
2014-11-19 00:08:59 +02:00
Markus Makela
36c6a61330
Fixes to coverity bugs:
...
72670: query_classifier/query_classifier.cc
72682: server/modules/filter/qlafilter.c
72679: server/modules/filter/tee.c
72716: server/modules/protocol/maxscaled.c
72694: server/modules/protocol/telnetd.c
71743: server/modules/routing/readwritesplit/readwritesplit.c
2014-11-05 14:18:38 +02:00
Markus Makela
c344231f80
Renamed all occurences of SkySQL to MariaDB Corporation
2014-09-30 13:02:10 +03:00
Mark Riddoch
f3429dac1b
Fix for double free if incorrect password is passed
2014-09-24 11:13:33 +01:00
Mark Riddoch
e8b5c2cbdf
Updates to maxadmin to prevent hang when maxscale shuts down
...
Addition of maxadmin test script
2014-09-24 10:04:36 +01:00
Mark Riddoch
c273988e51
Fixed for EPOLLHUP events
...
Possible double free in maxscaled on close
binlog router debugging/tracing
2014-09-05 17:29:17 +01:00
Mark Riddoch
4af2e58c86
Update plugin status to BETA
2014-07-04 09:23:40 +01:00
Mark Riddoch
792ae454f4
Add support for #!../maxadmin scripts
...
Add the --help option
Add quoting for executing command with arguments that contain whitespace
2014-06-25 10:00:59 +01:00
Mark Riddoch
719503e471
Addition of new client utility, maxadmin.
...
Supporting protocol for the admin interface
New routing module, cli, which shares source with debugcli
Tidyup output of lsit commands
2014-06-13 23:40:07 +01:00