hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Markus Mäkelä
2020-03-19 15:13:19 +02:00
parent b98b8f9d4a a8e2584bfc
commit 80a8fd55be
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/REST-API/API.md
View File

@ -216,7 +216,7 @@ must be one of the methods that the requested resource supports.
#### Allow #### Allow
All resources return the Allow header with the supported HTTP methods. For All resources return the Allow header with the supported HTTP methods. For
example the resource `/service` will always return the `Accept: GET, PATCH, PUT` example the resource `/services` will always return the `Accept: GET, PATCH, PUT`
header. header.
#### Accept-Patch #### Accept-Patch
@ -320,7 +320,7 @@ representation of the error.
```javascript ```javascript
{ {
"error": { "error": {
"detail" : "The new `/server/` resource is missing the `port` parameter" "detail" : "The new `/servers/` resource is missing the `port` parameter"
} }
} }
``` ```

4
Documentation/REST-API/Resources-Server.md
View File

@ -373,7 +373,7 @@ _server1_ from the service _RW-Split-Router_.
Removing a service from a server is analogous to removing the server from the Removing a service from a server is analogous to removing the server from the
service. Both unlink the two objects from each other. service. Both unlink the two objects from each other.
Response to `GET /v1/server/server1`: Response to `GET /v1/servers/server1`:
```javascript ```javascript
{ {
@ -439,7 +439,7 @@ Response to `GET /v1/server/server1`:
} }
``` ```
Request for `PUT /v1/server/server1`: Request for `PATCH /v1/servers/server1`:
```javascript ```javascript
{ {

7
maxscale-system-test/maxtest/src/testconnections.cpp
View File

@ -577,13 +577,14 @@ TestConnections::~TestConnections()
// galera->disable_ssl(); // galera->disable_ssl();
} }
if (maxscales->use_valgrind) // stop all Maxscales to detect crashes on exit
{
// stop all Maxscales to get proper Valgrind logs
for (int i = 0; i < maxscales->N; i++) for (int i = 0; i < maxscales->N; i++)
{ {
stop_maxscale(i); stop_maxscale(i);
} }
if (maxscales->use_valgrind)
{
sleep(15); // sleep to let logs be written do disks sleep(15); // sleep to let logs be written do disks
} }

1
maxscale-system-test/rwsplit_readonly_stress.cpp
View File

@ -102,6 +102,7 @@ int main(int argc, char* argv[])
} }
Test->tprintf("Waiting for all threads to finish\n"); Test->tprintf("Waiting for all threads to finish\n");
Test->set_timeout(60);
running = 0; running = 0;
for (int i = 0; i < THREADS; i++) for (int i = 0; i < THREADS; i++)