Commit Graph

1186 Commits

Author SHA1 Message Date
6bc20f765a Merge pull request #7 from skysql/MAX-167
Max 167
2014-06-30 16:18:27 +01:00
d40711f219 failure message in start, for any error
failure message in start, for any error
2014-06-30 17:04:26 +02:00
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
6d672cb967 Added status bit BREF_QUERY_ACTIVE to indicate if a query, other than session command, sent to backend for execution. The flag is cleared when the first packet belonging to the response arrives.
The flag is part of the active operation counting, which is utilized in load balancing. The active operation count per backend is used by default as criteria when router chooses to which backend a query should be routed.
2014-06-30 13:44:34 +03:00
3e3c1af211 Clean up 2014-06-30 13:43:25 +03:00
862d504a74 Enabled set and clear the flag BREF_WAITING_RESULT. It is actually a counter which is modified with atomic operations only. Setting and clearing BREF_WAITING_RESULT also includes atomic increment and decrement of corresponding backend server's current operations counter, backend_server->stats.n_current_ops. 2014-06-30 11:00:04 +03:00
aa828e8751 Added missing comment to get_root_master
Added missing comment to get_root_master
2014-06-30 09:00:43 +02:00
fcf67716fd Added mechanism for choosing slave for a query based on the current load in all connected slaves. Counting operations is not correctly done here. Reading values and choosing accordingly is done.
Fixed several things in session command reply processing.
2014-06-29 22:21:30 +03:00
0743177fbd Fixed reload with -HUP
Fixed reload with -HUP and added _TERM (that is default anyway)
2014-06-29 18:37:05 +02:00
4b0d66f66a Added default MAXSCALE_BASEDIR
Added default /usr/local/skysql/maxscale for MAXSCALE_BASEDIR
2014-06-29 17:57:06 +02:00
ee582bf2b2 write MaxScale PID into pidfile
write MaxScale PID into pidfile
2014-06-29 17:53:25 +02:00
3b14c780ad LSB version of maxscale init script
LSB version of maxscale init script
2014-06-29 15:40:30 +02:00
fc68996701 First implementation LSB compatibility
First implementation LSB compatibility
2014-06-28 23:05:45 +02:00
4f47f09207 maxscale start script
maxscale start script
2014-06-28 18:09:36 +02:00
25cc7452c0 Merge branch 'develop' of github.com:skysql/MaxScale into develop 2014-06-27 18:47:38 +01:00
621608d306 Updated documentation 2014-06-27 18:47:20 +01:00
32526d31b6 code cleanup
code cleanup
2014-06-27 18:14:46 +02:00
5cbc7b9f7d root server IN_MAINT returns NULL to caller
the replication tree returns NULL if the root server is maintenance mode
2014-06-27 17:55:46 +02:00
3a299a9ed8 get_replication_tree checks for SERVER_IS_DOWN
get_replication_tree checks for SERVER_IS_DOWN, this will produce a
replication tree even with servers in SERVER_IN_MAINT state
2014-06-27 17:16:38 +02:00
a25b757134 Merge branch 'develop' into MAX-90
Conflicts:
	server/core/server.c
	server/include/server.h
	server/modules/routing/readconnroute.c
2014-06-27 16:04:39 +01:00
ce2d20b70c Fixed printf format 2014-06-27 15:52:57 +01:00
3e83174cd8 Log messages updated for Replication heartbeat
Log messages updated for Replication heartbeat
2014-06-27 15:10:25 +02:00
111693775b master_id and node_id are long vars
master_id and node_id are long vars
2014-06-27 14:21:12 +02:00
96b6454e13 fix compile warnings
fix compile warnings
2014-06-27 14:11:57 +02:00
875b464c22 pending_status added to MONITOR_SERVERS
pending_status added to MONITOR_SERVERS
2014-06-27 14:04:02 +02:00
380f5b6bf3 Merge branch 'develop' into MAX-59 2014-06-27 13:58:12 +02:00
4f12e123c5 Removed SERVER parameter from dcb_call_foreach
Removed SERVER parameter from dcb_call_foreach
2014-06-27 13:51:40 +02:00
475e408551 remove tmporal files from debian dir 2014-06-27 14:45:55 +03:00
c2b20eab84 add debian files 2014-06-27 14:44:55 +03:00
fdcdc064b1 Added server pending states in monitor
server pending states are now saved and copied to server status before
monitor thread sleep
2014-06-27 13:38:35 +02:00
eee2ad7143 Merge branch 'develop' into MAX-90
Conflicts:
	server/core/service.c
2014-06-27 12:15:30 +01:00
25d4f784bc Implementation of server routing generic functionality and for readconnrouter 2014-06-27 12:07:47 +01:00
237bacd131 Merge branch 'develop' into MAX-59 2014-06-27 11:07:55 +02:00
de5d4fda8b Merge of new user interface changes 2014-06-27 09:57:39 +01:00
c824e9fad6 Merge branch 'develop' into MAX-111 2014-06-27 09:52:00 +01:00
7cdef05710 Fix issue with OK being split across multiple reads 2014-06-27 09:27:43 +01:00
20637ee224 Removed unnecessary SERVER pointer from dcb.c:dcb_call_foreach(), changed declaration and call accordingly. 2014-06-27 10:54:11 +03:00
edf9f0c59c Listed and described shortly max_slave_connections and server_options=slave_selection_criteria parameters. 2014-06-27 10:50:56 +03:00
c13275c0e7 merge from develop
merge from develop
2014-06-26 21:27:22 +02:00
52646a9942 Fix compile warning
Fix compile warning
2014-06-26 21:22:33 +02:00
a351a5eb09 fix compile warning
fix compile warning
2014-06-26 21:17:49 +02:00
1f77f37fbb fix type in path in .spec 2014-06-26 21:16:43 +03:00
eb5912239a Documentation for MaxAdmin - rewrite of CLI command guide 2014-06-26 17:23:33 +01:00
f246219beb Fix compile errors and warnings
Fix compile errors and warnings
2014-06-26 18:20:33 +02:00
ace2550d93 Merge branch 'develop' into MAX-111 2014-06-26 16:52:57 +01:00
031294f655 Diagnostic update 2014-06-26 16:52:10 +01:00
f96b762478 User interface improvements
Addition of enable/disable heartbeat, enable/disable root, list monitors,
show monitors

Better filter diagnostic output
2014-06-26 16:46:19 +01:00
8808fd7e47 Some debug messages removed
Some debug messages removed
2014-06-26 17:18:53 +02:00
1dbb4b1780 removed duplicated routine code
removed duplicated routine code
2014-06-26 17:12:08 +02:00
1a33277f72 Merge from develop
Merge from develop
2014-06-26 17:08:21 +02:00