83 Commits

Author SHA1 Message Date
counterpoint
6a92a419ff Remove function declaration - moved to header. Implement spin_reporter in server.c, required for correct compilation when SPINLOCK_PROFILE is defined true. 2015-07-27 09:01:20 +01:00
counterpoint
8376bbf3e6 Fix mismatch of int sizes; move calculation of maximum size of persistent pool to a better location. 2015-07-09 08:37:20 +01:00
counterpoint
ce879b65c2 Fix wrong debug message; add maxadmin info for actual max size of persistent pool. 2015-07-08 16:03:50 +01:00
counterpoint
09fdb0a2c2 Hopefully final tidy up. 2015-06-23 14:58:53 +01:00
counterpoint
b880350cf3 Complete merge of latest develop branch 2015-06-22 10:39:13 +01:00
Martin Brampton
4c38e2224b Merge remote-tracking branch 'origin/develop' into MXS-122
Conflicts:
	server/core/CMakeLists.txt
	server/core/dcb.c
	server/include/dcb.h
	server/include/server.h
	server/modules/protocol/mysql_backend.c
2015-06-19 23:12:54 +01:00
Martin Brampton
b1c657c2eb Add another debug output; fix bug; clarify variable names. 2015-06-19 20:51:22 +01:00
counterpoint
033080e11e Fix bugs 2015-06-19 15:31:34 +01:00
counterpoint
ef428b9229 Added debug messages for persistent connections; additional information via maxadmin re persistent connections. 2015-06-19 15:01:57 +01:00
Martin Brampton
84d5af1e00 Throw away poll events that occur for persistent pool DCBs with no related session; fix typos. 2015-06-14 18:19:30 +01:00
counterpoint
99e9987f9b Clear persistent pool DCBs when server freed. 2015-06-09 08:26:14 +01:00
counterpoint
e395ab1442 Provide explicit time checking for age of persistent DCBs. 2015-06-03 16:47:02 +01:00
MassimilianoPinto
72d14f8894 Addition of server_update_address/port 2015-06-03 10:15:54 +02:00
counterpoint
1a76fc141d Add configuration capabilities for persistent connections. 2015-06-02 15:44:57 +01:00
counterpoint
739ea82e36 Clean up modifications. 2015-06-01 14:05:31 +01:00
counterpoint
6c5e6a5959 Move code around to fix headers problem etc. 2015-05-27 10:17:35 +01:00
counterpoint
8964e76f84 Improve messages 2015-05-26 17:03:13 +01:00
counterpoint
d90ea82aaa Try different code, continue polling while not in use. 2015-05-26 16:31:52 +01:00
counterpoint
1e700ea85b Fix bugs 2015-05-26 11:32:13 +01:00
counterpoint
d7cd40e5a5 Bug fixes and improvements. 2015-05-22 15:53:54 +01:00
counterpoint
b51c5f52ef Fix problems in knowing user for persistent connections. 2015-05-22 14:23:14 +01:00
counterpoint
462bfe677b Fix some bugs; add info for maxadmin. 2015-05-22 11:17:17 +01:00
counterpoint
6f31357372 Initial changes for persistent connections - add some basic functionality. 2015-05-20 18:15:11 +01:00
Markus Makela
1b0fd4576a Merge branch 'maxinfo' into develop
Conflicts:
	server/core/service.c
	server/core/session.c
	server/include/session.h
2015-03-04 11:33:00 +02:00
Mark Riddoch
2f218cba3a Addition of maxinfo commands
show sessions
	show clients
	show listeners
	show services
	show servers
2015-02-19 12:55:39 +00:00
Guillaume Lefranc
b8b75b604f Make JSON output valid 2015-02-19 13:55:29 +01:00
Guillaume Lefranc
e047247200 Add command to print all servers in JSON format 2015-02-19 10:07:31 +01:00
VilhoRaatikka
ac97fcd764 Removed redundancy from error and message logs.
server.c: Added new member to SERVER->master_err_is_logged. It is used if server loses master status. It causes error log print in readwritesplit router's eror handling. Initial value is false and it is set always to false when server's status is set to master.
Added message log printing to mysql monitor, if master status changes to something else. It is not warning or error but only information which probably interests the user.

readwritesplit.c:Muted warnings and error printings in cases if slaves are not found if it is allowed to have a master only.
readwritesplit.c:Corrected error log printing in case where master lost its status. REdundant prints are removed.
2014-12-18 19:12:01 +02:00
Mark Riddoch
fdb9c5e6dc Switch to thread safe versions of localtime and asctime 2014-12-03 09:53:17 +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
MassimilianoPinto
9967a45379 Disable Master failback in Galera Monitor
Disable Master failback in Galera Monitor
2014-10-30 18:41:30 +01:00
counterpoint
e8758d3678 Fix problems in tests, fix issue in server.c (bug 581) 2014-10-17 10:57:17 +01:00
counterpoint
d5071267e7 More tests; minor fixes. 2014-10-08 18:04:28 +01:00
Markus Makela
b0683d9b4d Updated the licensing year from 2013 to 2013-2014 2014-10-01 14:37:12 +03:00
Markus Makela
f4e591e382 Changed 'SkySQL Gateway' to 'MariaDB Corporation MaxScale' 2014-09-30 13:15:03 +03:00
Markus Makela
c344231f80 Renamed all occurences of SkySQL to MariaDB Corporation 2014-09-30 13:02:10 +03:00
Mark Riddoch
440f88491b Fixed missue \n in list servers command 2014-09-12 17:32:31 +01:00
Mark Riddoch
d1b4852d29 Addition of server "Auth Error" status 2014-09-12 08:55:32 +01:00
MassimilianoPinto
63a7ccf520 Merge branch 'MAX-232' into 232-bis
Conflicts:
	server/core/server.c
	server/include/server.h
2014-09-04 09:23:29 +02:00
MassimilianoPinto
63d267e5ef Fix for broken replication
Fix for broken replication has been added to mysql_monitor.
Both Slave_IO  and Slave_SQL threads must be running in order to assign
the SERVER_SLAVE status but If only Slave_IO is running let’s assign
the master_id to current server and continue building the replication
tree; if no slaves at all the master will be still available.
The “detect_stale_master” option has been added, its default is 0.
If set to 1 the monitor will keep the last detected master even if the
replication setup is completely not working, i.e. both Slave_IO  and
Slave_SQL threads are not running: this applies only to the server that
was master before.
After monitor or MaxScale are restarted and the replication is still
stopped or not configured there will be no master because it’s not
possible to compute the replication topology tree.
2014-09-01 11:18:57 +02:00
VilhoRaatikka
4a30626974 Merge branch 'Z2' of https://github.com/skysql/MaxScale into Z2
Conflicts:
	client/Makefile
	server/core/buffer.c
	server/core/test/makefile
	server/include/buffer.h
	server/modules/filter/Makefile
	server/modules/routing/webserver.c
2014-08-29 16:21:08 +03:00
Mark Riddoch
d6a2ef6996 Misc fixes to doxygen comments 2014-08-19 13:22:40 +01:00
VilhoRaatikka
cf38dad43a Merge branch 'Z2' of https://github.com/skysql/MaxScale into Z2
Conflicts:
	server/core/modutil.c
2014-08-05 18:26:55 +03:00
MassimilianoPinto
744892e47c Support for MySQL Cluster
Support for MySQL Cluster with ndbcluster monitor and readconnroute
with router_option=ndb
2014-07-30 09:41:03 +02:00
Mark Riddoch
87e66a0ea8 Revert "Implementation of HTTPD protocol, gwbuf properties and a dmeo web application"
This reverts commit 6fd5dff34902051f38932947493280e1e62dbeb1.
2014-07-15 17:53:39 +01:00
Mark Riddoch
6fd5dff349 Implementation of HTTPD protocol, gwbuf properties and a dmeo web application
interface to test the new httpd.
2014-07-15 17:39:31 +01:00
Vilho Raatikka
248b479bb6 Merge pull request #9 from skysql/MAX-90
Addition of server weighting to the read/write splitter
2014-07-01 16:04:52 +03:00
Mark Riddoch
eaaac58b44 Addition of server weighting to the read/write splitter
Tidy up the output of show server and show servers so that columsn align
2014-07-01 11:06:28 +01:00
MassimilianoPinto
37eaf7b455 Replication Lag default is now -2
Replication Lag default is now -2

-1 will be used for no information available from slaves
2014-07-01 10:21:24 +02:00
VilhoRaatikka
0b89245a4b Merge branch 'develop' into MAX-167
Conflicts:
	server/modules/monitor/mysql_mon.c
	server/modules/routing/readwritesplit/readwritesplit.c
2014-06-30 14:17:00 +03:00