2183d5d3c5
Fix mistakes in merging.
2015-11-11 11:31:07 +00:00
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
1fc6b00211
Add conditionally compiled mechanism to "show buffers" to give a list of the currently allocated buffers, with a trace for each one of the calls that led to its creation.
2015-11-11 09:03:48 +00:00
49866b5959
ss_info_dassert now enabled also in release mode.
2015-11-10 21:19:50 +02:00
450078fa92
Interface of skygw_logmanager_init(int argc, char* argv[]) changed.
...
The previous interface of skygw_logmanager_init was conceptually
broken. With -o you could specify that logging should be done to
stdout. However, even if you did that, the log manager still checked
that the logging directory could be accessed. Unless it had been
specified using -j <path> the default was /var/log/maxscale.
That is, unless the program calling skygw_logmanager_init was invoked
by a user that had write access to /var/log/maxscale, there would be
a complaint even if nothing was ever written to that directory.
In practice this meant that even if -o was used you had to provide
a -j with a path that surely is writeable (e.g. "/tmp").
This has now been changed so that you explicitly must provide the
log directory and the flags -j and -o are removed.
bool skygw_logmanager_init(const char* logdir, int argc, char* argv[]);
If /logdir/ is provided then logged messages are written to a log file
in that directory. If /logdir/ is NULL then messages are logged to stdout
and no checks for access to any directory is not made.
2015-11-06 14:20:05 +02:00
548d03005b
Added test for maxscale_pcre2.c
2015-11-05 10:19:24 +02:00
603e737769
Cleaned up testbuffer.c and added a test for gwbuf_clone_all
2015-11-05 09:36:09 +02:00
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
126b4c1d79
Whitespace-fixes of maxkeys and maxpasswd.
...
Whitespace and indentation fixes of maxkeys.c and maxpasswd.c.
No other changes.
2015-11-04 12:30:06 +02:00
d57b4cd531
Fix to MXS-54: https://mariadb.atlassian.net/browse/MXS-54
...
Added a new configuration parameter that allows the user to control
whether authentication warning messages are logged.
2015-11-04 09:18:20 +02:00
9cd327a783
Fix to MXS-417: https://mariadb.atlassian.net/browse/MXS-417 Added support for single-character wildcard in IP addresses.
...
Single character wildcard addresses are now properly handled
2015-11-03 10:15:34 +02:00
7c582f91ea
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-11-02 18:09:59 +02:00
0d8faa6840
Invalid thread argument now results in shutdown.
...
This is done to avoid situations where the loaded configuration doesn't
match the contents of maxscale.cnf.
2015-11-02 12:00:08 +02:00
529e697eaf
Updated code based on review of ac308dcb2c34e081f9814ad40c0961a217c86fc4
...
Removed unnecessary spinlock and added more checks.
2015-11-02 12:00:08 +02:00
6810ed15dd
Fix to MXS-436: https://mariadb.atlassian.net/browse/MXS-436
...
Added autodetection of processor cores and used it as the default if an
invalid value is used for threads.
2015-11-02 12:00:08 +02:00
3187f2c3f8
Updated code based on review of 9a04984
2015-10-31 10:34:37 +02:00
cd55f62051
Fix to MXS-29: https://mariadb.atlassian.net/browse/MXS-29
...
If MAXSCALE_SCHEMA.REPLICATION_HEARTBEAT isn't replicated, a warning is logged.
2015-10-31 10:34:37 +02:00
c1eb84b377
Added utility functions for regular expression matching with the PCRE2 library.
2015-10-31 10:34:37 +02:00
b543f36a49
Indentation and whitespace fixes.
...
There were many combinations of tab-width used so making the
indentation look right in the editor wasn't really possible.
The changes made:
- All tabs replaced with spaces.
- Indentation depth 4.
- , followed by space.
- Most binary operators (*, =, -) surrounded by one space.
- No space following ( or before ).
- Keywords follwed by 1 space.
2015-10-30 10:21:54 +02:00
1f22e2854b
maxscale_getline moved to config.c
...
As a general purpose function should be somewhere else, but we
need to sort out what should be where first.
2015-10-30 09:38:40 +02:00
5507624326
Fixed typo'd sizeof.
2015-10-29 18:19:05 +02:00
c29858d215
Added a definition for the size of the SSL error message buffer and changed all buffers to use it.
2015-10-29 16:39:38 +02:00
f819f164b5
Cleaned up dcb_accept_SSL and added missing logging.
2015-10-29 16:39:38 +02:00
cab5e58045
Fixed SSL initialization for services failing.
2015-10-29 16:39:38 +02:00
8d6c583a1c
Added a check for duplicate sections in the configuration file.
2015-10-29 16:11:08 +02:00
1dc48f5ed8
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-10-23 13:18:11 +02:00
04a1f9bd3d
Error messages in getDatabases are now unique.
2015-10-20 22:45:29 +03:00
f18d921f4c
Fixed internal service test failing due to old assumptions.
2015-10-19 18:17:12 +03:00
75e8033052
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-10-19 09:36:04 +02:00
06f6b28048
Fix to MXS-412: https://mariadb.atlassian.net/browse/MXS-412
...
service->user is now set to NULL after the users are freed.
2015-10-19 09:01:58 +03:00
040587c828
Fix to MXS-413: https://mariadb.atlassian.net/browse/MXS-413
...
Added missing terminating newlines so showSession and improved maxadmin logic.
2015-10-19 09:01:58 +03:00
c74d320851
Remove stray character.
2015-10-17 20:02:59 +01:00
482db5e84d
User friendly bit mask display for DCB print; monitors to work via inserting hangups instead of callbacks.
2015-10-17 20:00:05 +01:00
57f5dd15bc
Resolve problem of lingering backend database processes; alter MySQL monitor to insert fake events when backend server unavailable; fix problem with count of current connections.
2015-10-16 17:55:07 +01:00
d000af33f6
Remove obsolete function.
2015-10-13 16:21:17 +02:00
efc0c7420e
Correct misplacement of decrementing current connections counter.
2015-10-13 16:19:24 +02:00
bb53eb0f6d
Put extra check in hashtable_fetch to return if zero entries (should never happen but will crash if not checked); remove dcb_close from mysql_backend where it closes backend DCBs, as these should be closed by the router.
2015-10-07 17:06:21 +01:00
897907b202
Fix to MXS-352: https://mariadb.atlassian.net/browse/MXS-352
...
If a service fails, MaxScale will try to start it again later on.
2015-10-07 15:35:12 +03:00
5c985b42ba
Fix problem with persistent DCB disposal
2015-10-05 16:36:07 +01:00
bff6db96a1
Same database on more than one server now cause the schemarouter session to be closed.
2015-10-05 10:20:58 +03:00
56ed36ee76
Moved SSL initialization to be done before services are started.
2015-10-05 09:05:38 +03:00
4aa161d78e
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-09-30 14:20:39 +02:00
4f316419c5
Merge branch 'develop' into MXS-329
2015-09-30 12:47:28 +03:00
48fd181245
Merge branch 'test_fix_1.3' into develop
2015-09-30 08:34:02 +03:00
638c2250c9
Fixed internal test suite.
2015-09-29 16:36:12 +03:00
d679bf1cd8
Fix to MXS-389: https://mariadb.atlassian.net/browse/MXS-389
...
Utility tools now use static log manager.
2015-09-29 14:56:05 +03:00
d582c5880c
Impose locking on dcb_call_foreach DCB callback mechanism. Add counters and maxima for DCBs and zombies to aid diagnosis.
2015-09-29 11:58:31 +01:00
de1e1f4e28
In test-programs the ss...assert functions assert always.
...
Now handled by defining the relevant defines. Should be fixed
by replacing the use of ss_info_assert with test macros that
always assert.
Task for fixing this properly:
https://mariadb.atlassian.net/browse/MXS-382
2015-09-28 10:08:50 +03:00
69af0df6b5
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-09-28 08:48:27 +02:00
2231d0870c
Place checks in callback routines because DCB will not always contain a reference to a router session, and the associated data will be invalid in this case.
2015-09-25 12:17:18 +01:00
