1104 Commits

Author SHA1 Message Date
Mark Riddoch
85c752d15c Updated error handlign in lien with new requirements of the core 2015-02-04 12:15:34 +00:00
Mark Riddoch
add315d795 Updated to reflect the shange to the way servers are stored within services 2015-02-04 11:17:29 +00:00
Markus Makela
86bed0541c Merge branch 'develop' into MAX-324 2015-02-04 13:01:43 +02:00
Mark Riddoch
ea7260b27b Merge branch 'blr' into develop 2015-02-04 10:28:12 +00:00
Mark Riddoch
85a38c9600 Add fix for crash if no router options are supplied 2015-02-04 10:26:55 +00:00
Mark Riddoch
23d920c1a9 Addition of support for show slave status 2015-02-04 10:05:35 +00:00
Mark Riddoch
0083e62c41 Merge branch 'blr' into develop 2015-02-03 17:19:06 +00:00
Mark Riddoch
e9af90e4b6 Add support for:
select @@maxscale_version;
	show variables like "maxscale%"
	show master status
	show slave hosts
2015-02-03 17:14:37 +00:00
Markus Makela
0b5bedd2b8 The database name the client is connecting with is now checked that it exists in the hashtable before setting the session into a valid state. 2015-02-03 18:17:37 +02:00
Mark Riddoch
048467b447 Fixed issue with simple parser for queries from slaves. 2015-02-03 14:35:22 +00:00
Markus Makela
9681b9cec4 Added error handling and re-mapping of databases to dbshard router in addition to hint detection. 2015-02-02 21:37:04 +02:00
Markus Makela
c9c55ecfa3 Cleaned up unused code. 2015-02-01 21:53:05 +02:00
Markus Makela
b6cd0916a0 Fixed a deadlock when the same thread tried to route a reply and a query at the same time. 2015-02-01 21:39:35 +02:00
Markus Makela
d9ab0261b9 Fixed SHOW TABLES FROM ... queries being routed to the active database instead of the one defined in the query. 2015-01-31 12:38:39 +02:00
Markus Makela
a69e1d5f01 Added some error handling to shardrouter.
The shardrouter now handles situations where the subservice sessions have failed and returns an error if an attempt to
query such a service is made.
2015-01-30 22:28:01 +02:00
Mark Riddoch
15b2cb64ce Add a default value of uuid 2015-01-30 15:20:59 +00:00
Mark Riddoch
5ac736a14e Fix for CRC in fake rotate events 2015-01-30 14:55:14 +00:00
Markus Makela
ea88cea959 Merge branch 'develop' into MAX-324 2015-01-29 20:36:26 +02:00
Mark Riddoch
a786d76852 Fixed typo 2015-01-29 16:04:06 +00:00
Mark Riddoch
00d9787d20 Fixed typo in error log message 2015-01-29 16:01:19 +00:00
VilhoRaatikka
a016fdd0b7 Complementary fix to #507, http://bugs.skysql.com/show_bug.cgi?id=507.
Missing braces in get_route_target made the previous fix ineffective.
2015-01-28 12:20:30 +02:00
Mark Riddoch
0a9509168b Addition of cache for server responses. This allows cached responses to be sent
if there is no master avaiable when MaxScale starts
2015-01-28 08:44:13 +00:00
VilhoRaatikka
21bb341c7d Fix to bug #507, http://bugs.mariadb.com/show_bug.cgi?id=507
readwritesplit.c:get_route_target routed query to slave although query type was combined QUERY_TYPE_READ | QUERY_TYPE_MASTER_READ, where the latter is supposed to be routed to master.
2015-01-27 15:21:31 +02:00
VilhoRaatikka
270c0ebf8a Clean up, added comments, removed some dead code. 2015-01-27 10:24:37 +02:00
Mark Riddoch
b758dc1a4a Clear residual buffered data when reconnecting to the master in all cases 2015-01-26 11:23:46 +00:00
Markus Makela
08dd4d7053 First working implementation of the hierarchical router. 2015-01-25 21:24:22 +02:00
Markus Makela
8791cc455e Added the initial implementation of the shardrouter module. 2015-01-23 06:40:30 +02:00
Markus Makela
db1ea422a0 Merge branch 'develop' into MAX-324
Conflicts:
	server/core/modutil.c
2015-01-20 04:25:40 +02:00
VilhoRaatikka
272cd73cad Fix to bug #701, http://bugs.mariadb.com/show_bug.cgi?id=701
debugcmd.c:execute_cmd:added skip counter which adjusts the starting position of next argument correctly thus avoiding cropping the latter quoted argument.
2015-01-19 18:38:46 +02:00
VilhoRaatikka
5d1f029260 New fix candidate to bug #698, http://bugs.mariadb.com/show_bug.cgi?id=698
client/test/maxadmin_test.sh: added new cases for testing maxadmin
service.c:dListListeners:fixed NULL-pointer reference
debugcli.h: replaced magic number 80 with constant integer.
cli.c:execute:fixed command buffer overflow
debugcmd.c:convert_arg:restored return value to 0 in case of error
2015-01-19 17:55:02 +02:00
VilhoRaatikka
f5d8e2366a modutil.c:modutil_reply_routing_error: Removed GWBUF type flag setting and added flags argument to function prototype so that the caller can set necessary flags and they are then copied to GWBUF which is first created in modutil_reply_rounting_error. 2015-01-17 23:07:06 +02:00
VilhoRaatikka
6d2b38d4b6 Complementary fix to #694,http://bugs.mariadb.com/show_bug.cgi?id=694
RWSplit router handles query processing errors that happened in router by sending parse error reply to client. routeQuery fails only when backend has failed.
2015-01-17 22:40:52 +02:00
VilhoRaatikka
d362ed227f Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2015-01-17 01:29:50 +02:00
VilhoRaatikka
1a76d2d06f Fix to bug #698, http://bugs.mariadb.com/show_bug.cgi?id=698
debugcmd.c:convert_arg returned zero if argument is invalid. That zero was cast to pointer. Using it caused NULL-pointer references. Changed the return value indicating about error to 0x1 which is then handled properly.
2015-01-17 01:24:56 +02:00
Timofey Turenko
885dfb0242 Merge branch 'remove_makefiles' into develop 2015-01-16 18:04:16 +02:00
VilhoRaatikka
113ea8381b Complamentary fix to #694, added error flag reset to readconnrouter as well. 2015-01-16 11:56:20 +02:00
VilhoRaatikka
da77da803b Complementory fix to bug #694, http://bugs.mariadb.com/show_bug.cgi?id=694
Added new error action to router.h, added functionality to reset error flag from DCB in handleError. Error is reset before every new routing call.
2015-01-16 11:13:42 +02:00
Markus Makela
f2ceaf166f Commented out old code and fixed a memory leak. 2015-01-16 07:41:10 +02:00
Markus Makela
f54d4a76aa Final implementation of client session based sharding. 2015-01-15 20:24:01 +02:00
VilhoRaatikka
39e4253c81 Fix to bug #694, http://bugs.mariadb.com/show_bug.cgi?id=694
query_classifier.cc: set_query_type lost previous query type if the new was more restrictive. Problem was that if query is both READ and SESSION_WRITE and configuration parameter use_sql_variables_in=all was set, routing target became ambiguous. Replaced call to set_query_type with simply adding new type to type (=bit field) and checking unsupported combinations in readwritesplit.c:get_route_target. If such a case is met, a detailed error is written to error log in readwritesplit.c. mysql_client.c sees the error code and sends an error to client. Then mysql_client.c calls router's handleError which ensures that there are enough backend servers so that the session can continue.
2015-01-15 15:16:22 +02:00
Markus Makela
db70163373 Merge branch 'develop' into MAX-324
Conflicts:
	query_classifier/query_classifier.cc
2015-01-15 13:17:42 +02:00
Timofey Turenko
06c2d201e0 remove makefiles and other garbage 2015-01-14 19:08:24 +02:00
VilhoRaatikka
b3824a1eaf Clean up bits and pieces, removed some unnecessary checks. 2015-01-14 14:11:19 +02:00
Markus Makela
c1ed24aa78 Initial implementation of session based sharding. 2015-01-14 10:47:04 +02:00
Markus Makela
632190f9aa Merge branch 'release-1.0GA' into MAX-324 2015-01-08 14:11:19 +02:00
Markus Makela
aa60e02697 Fix to session variables not being written to all backends when USE DATABASE is used. 2015-01-08 14:08:49 +02:00
Mark Riddoch
af415f58c3 Add support for select @@max_allowed_packet 2015-01-07 17:38:41 +00:00
Markus Makela
c4006d43c2 Fix to Coverity defect 85262 2015-01-06 05:28:58 +02:00
Markus Makela
6e17bf5ec1 Updated dbshard with the new server reference changes. 2015-01-06 05:01:37 +02:00
Markus Makela
fed828eb29 Merge branch 'release-1.0GA' into MAX-324
Conflicts:
	server/MaxScale_template.cnf
	server/core/service.c
2015-01-06 04:45:30 +02:00