e3dc071549
Merge branch 'develop' of github.com:skysql/MaxScale into develop
2014-07-03 19:48:24 +03:00
ac914120b8
fix server/core/Makefile to make build with static lib working in Ubuntu
2014-07-03 19:35:16 +03:00
39679447c9
Bugzilla #455 , MaxScale crashed due missing buffer type information in multi-buffer responses.
2014-07-03 19:20:45 +03:00
a68d83ff7f
Moved error messages about broken pipe to DEBUG build since in cases we've seen it is due to socket closing in same host. Other case is that MaxScale attempts to write COM_QUIT (ending message) to socket that other thread already closed.
...
Added counter clean-up code to readwritesplit closeSession. If operation counters have leaked, that is, due to some error in query routing some counter have been left positive, it is zeroed at session ending. This ensures that there is no garbage in global counter even if individual session wouldn't clean up its counters.
2014-07-03 12:12:21 +03:00
0dfdc27ea5
revert -l:libmysqld.a to -lmysqld
2014-07-03 11:38:59 +03:00
6f6a5b67c9
Merge branch 'develop' of https://github.com/skysql/MaxScale into develop
2014-07-03 00:46:01 +03:00
e944ae2e70
http://bugs.skysql.com/show_bug.cgi?id=453
...
Fixed bug in session command resul handling. In case where backend sent error message the session command cursor wasn't updated properly.
Added check to bref_clear_state, if bref's waiter counter would go negative, decrement to global operation counter is skipped.
2014-07-03 00:43:30 +03:00
eb3a8eaab3
L:.a
2014-07-02 16:25:55 +03:00
f379ee3d7a
add -static for lmysqld
2014-07-02 15:52:16 +03:00
d58682d261
Updated Makefile to resolve issue with adding extra MaxScale in the
...
path for a make install command.
2014-07-01 16:53:10 +01:00
ede4f3778f
Merge pull request #10 from skysql/MAX-94
...
Max 94
2014-07-01 17:16:48 +03:00
8ffca16368
Added consistency check for detect_replication_lag and max_slave_replication_lag and router_options=slave_select_criteria=LEAST_BEHIND_MASTER
...
Fixed a bug in service_add_qualified_param which didn't handle param list correctly.
2014-07-01 16:54:16 +03:00
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
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
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
57a977bdc0
Merge branch 'develop' of https://github.com/skysql/MaxScale into develop
2014-06-30 22:38:15 +03:00
b875936a21
MAX-94, Added configuration parameter, max_slave_replication_lag=<longest allowed replication lag in seconds> to router section.
...
Parameter can be changed runtime but it requires reloading of config.
2014-06-30 22:35:27 +03: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
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
ee582bf2b2
write MaxScale PID into pidfile
...
write MaxScale PID into pidfile
2014-06-29 17:53:25 +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
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
20637ee224
Removed unnecessary SERVER pointer from dcb.c:dcb_call_foreach(), changed declaration and call accordingly.
2014-06-27 10:54:11 +03: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
1a33277f72
Merge from develop
...
Merge from develop
2014-06-26 17:08:21 +02:00
4d2e43a2d9
code cleanup and documentation
...
code cleanup and documentation
2014-06-26 16:56:21 +02:00
1d1da398d4
Merge branch 'develop' into MAX-99
...
Conflicts:
server/modules/routing/readwritesplit/readwritesplit.c
2014-06-25 17:50:29 +03:00
d30ff534b9
In dcb.c:dcb_read if there is nothing anymore to read from socket, it wasn't caught anyway. Added test for that case and immediate exit in that case.
2014-06-25 15:37:44 +03:00
fa08a141e4
Fix to reload dbusers
...
Tidyup show service output
2014-06-25 13:01:32 +01:00
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
e0596b7d72
Merge branch 'develop' into MAX-65
2014-06-25 08:28:17 +01:00
65c42b93cf
If backend fails and sets session state to SESSION_STATE_STOPPING before session is in state SESSION_STATE_ROUTER_READY, sessoin.c:session_alloc overwrites the session state by SESSION_STATE_ROUTER_READY. Protected session state modification and added check before changing the state.
...
cloesSession was called in session.c:session_free if all DCBs had been removed their references to session. closeSession, however, is function which handles closing router. Router is responsible for closing all backend DCBs (=connections). Thus, calling sessionClose after all backend connections had been removed already is unnecessary and causes assertion traps.
Simply removed the call.
2014-06-24 21:59:42 +03:00
c30e270768
Removed dcb->command from DCB structure as it was used for session commands but not anymore.
...
Corrected debug assertion in dcb_final_free because DCB can be freed also when DCB is being created, that is, state is DCB_STATE_ALLOC.
2014-06-24 21:56:15 +03:00
442ac7fefb
Added GWBUF type GWBUF_TYPE_SINGLE_STMT to indicate that buffer only includes single complete stmt. Added macro for checking the flag and changed existing routines as necessary.
2014-06-24 21:51:54 +03:00
a652e875b5
Support for multipacket statements
...
Remove double free in cloned DCB's
2014-06-24 17:59:29 +01:00
dfe3092dc5
Merge branch 'develop' into MAX-59
2014-06-24 18:21:09 +02:00
6bfa8897cd
Fix compiler warning
2014-06-24 11:51:25 +01:00
d42469c6cc
Merge branch 'develop' into MAX-59
2014-06-23 12:42:32 +02:00
e650930487
Cleanup up branch session on close.
2014-06-23 10:10:04 +01:00
7ba64875ad
master_id, depth, slaves default values
...
master_id, depth, slaves default values
2014-06-23 09:51:50 +02:00
7067e43b44
Core changes to support tee filter.
2014-06-20 17:49:40 +01:00
c759767a91
Use new session entry points to get remote and user rather than dereference
...
the DCB directly.
2014-06-19 16:07:21 +01:00
4d257897d3
Merge branch 'develop' of github.com:skysql/MaxScale into develop
...
Conflicts:
server/core/session.c
server/modules/protocol/mysql_backend.c
server/modules/routing/readwritesplit/readwritesplit.c
Resolved.
Addition of user in topfilter report and general tidyup
2014-06-18 17:45:57 +01:00
1b6a5efb64
merge from develop
...
merge from develop
2014-06-18 11:51:47 +02:00
