Merge branch 'release/2.5.0'

Author: rusher

.eslintrc

@@ -10,7 +10,7 @@
     "plugin:prettier/recommended"
   ],
   "parserOptions": {
-    "ecmaVersion": 6
+    "ecmaVersion": 2020
   },
   "env": {
     "node": true,

.travis.yml

@@ -41,35 +41,33 @@ matrix:
   allow_failures:
   - node_js: "12"
     env: DB=build SKIP_LEAK=1
-  - node_js: "12"
-    env: SKYSQL=true SKIP_LEAK=1
   include:
   - node_js: "12"
     env: DB=build SKIP_LEAK=1
   - node_js: "12"
     env: SKYSQL=true SKIP_LEAK=1
   - node_js: "10"
-    env: DB=mariadb:10.4
+    env: DB=mariadb:10.5
   - node_js: "12"
-    env: DB=mariadb:10.4 SKIP_LEAK=1 ADDITIONAL_CONF=--version=10.4.199
+    env: DB=mariadb:10.5 SKIP_LEAK=1 ADDITIONAL_CONF=--version=10.5.199
   - node_js: "14"
-    env: DB=mariadb:10.4 SKIP_LEAK=1
+    env: DB=mariadb:10.5 SKIP_LEAK=1
   - node_js: "12"
-    env: DB=mariadb:10.4 SKIP_LEAK=1 TEST_COLLATION=cp1251_general_ci
+    env: DB=mariadb:10.5 SKIP_LEAK=1 TEST_COLLATION=cp1251_general_ci
   - node_js: "12"
-    env: DB=mariadb:10.4 LINT=1 SKIP_LEAK=1
+    env: DB=mariadb:10.5 LINT=1 SKIP_LEAK=1
   - node_js: "12"
-    env: DB=mariadb:10.4 BENCH=1 SKIP_LEAK=1
+    env: DB=mariadb:10.5 BENCH=1 SKIP_LEAK=1
   - node_js: "12"
-    env: DB=mariadb:10.4 MAXSCALE_VERSION=2.2.9 TEST_PORT=4007 TEST_USER=bob TEXT_DATABASE=test2 SKIP_LEAK=1
+    env: DB=mariadb:10.5 MAXSCALE_VERSION=2.5.4 MAXSCALE_TEST_DISABLE=true SKIP_LEAK=1
   - node_js: "12"
     env: DB=mariadb:10.1 SKIP_LEAK=1
   - node_js: "12"
     env: DB=mariadb:10.2 SKIP_LEAK=1
   - node_js: "12"
     env: DB=mariadb:10.3 SKIP_LEAK=1
   - node_js: "12"
-    env: DB=mysql:5.6 SKIP_LEAK=1
+    env: DB=mariadb:10.4 SKIP_LEAK=1
   - node_js: "12"
     env: DB=mysql:5.7 SKIP_LEAK=1
   - node_js: "12"

.travis/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: '2.1'
 services:
   db:
     image: $DB
@@ -7,11 +7,14 @@ services:
       - 3305:3306
     volumes:
       - $SSLCERT:/etc/sslcert
-      - $ENTRYPOINT:/pam
+      - $ENTRYPOINT:/docker-entrypoint-initdb.d
     environment:
       MYSQL_DATABASE: testn
       MYSQL_ALLOW_EMPTY_PASSWORD: 1
-      MYSQL_ROOT_PASSWORD:
-
+    healthcheck:
+      test: ["CMD", "mysql", "--protocol=tcp", "-ubob", "-h127.0.0.1"]
+      timeout: 50s
+      retries: 10
+      interval: 5s
 
 

.travis/entrypoint/dbinit.sql

@@ -1,20 +1,8 @@
 version: '2.1'
 services:
-  maxscale:
-    depends_on:
-      - db
-    ports:
-      - 4006:4006
-      - 4007:4007
-      - 4008:4008
-    build:
-      context: .
-      dockerfile: maxscale/Dockerfile
-      args:
-        MAXSCALE_VERSION: $MAXSCALE_VERSION
   db:
     image: $DB
-    command: --max-connections=500 --max-allowed-packet=40m --innodb-log-file-size=400m --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --ssl-ca=/etc/sslcert/ca.crt --ssl-cert=/etc/sslcert/server.crt --ssl-key=/etc/sslcert/server.key --bind-address=0.0.0.0
+    command: --innodb-log-file-size=400m --max-allowed-packet=40m  --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --ssl-ca=/etc/sslcert/ca.crt --ssl-cert=/etc/sslcert/server.crt --ssl-key=/etc/sslcert/server.key --bind-address=0.0.0.0 $ADDITIONAL_CONF
     ports:
       - 3305:3306
     volumes:
@@ -23,3 +11,26 @@ services:
     environment:
       MYSQL_DATABASE: testn
       MYSQL_ALLOW_EMPTY_PASSWORD: 1
+    healthcheck:
+      test: ["CMD", "mysql", "--protocol=tcp", "-ubob", "-h127.0.0.1"]
+      timeout: 50s
+      retries: 10
+      interval: 5s
+
+  maxscale:
+    depends_on:
+      db:
+        condition: service_healthy
+    links:
+      - "db:database"
+    ports:
+      - 4006:4006
+      - 4008:4008
+      - 4009:4009
+    volumes:
+      - $SSLCERT:/etc/sslcert
+    build:
+      context: .
+      dockerfile: maxscale/Dockerfile
+      args:
+        MAXSCALE_VERSION: $MAXSCALE_VERSION

.travis/maxscale-compose.yml

@@ -1,21 +1,20 @@
 FROM centos:7
 
 ARG MAXSCALE_VERSION
-ENV MAXSCALE_VERSION ${MAXSCALE_VERSION:-2.2.9}
+ENV MAXSCALE_VERSION ${MAXSCALE_VERSION:-2.5.4}
 
 COPY maxscale/mariadb.repo /etc/yum.repos.d/
-
 RUN rpm --import https://yum.mariadb.org/RPM-GPG-KEY-MariaDB \
-    && yum -y install https://downloads.mariadb.com/MaxScale/${MAXSCALE_VERSION}/centos/7/x86_64/maxscale-${MAXSCALE_VERSION}-1.centos.7.x86_64.rpm \
+    && yum -y install https://downloads.mariadb.com/MaxScale/${MAXSCALE_VERSION}/centos/7/x86_64/maxscale-${MAXSCALE_VERSION}-1.rhel.7.x86_64.rpm \
     && yum -y update
 
 RUN yum -y install maxscale-${MAXSCALE_VERSION} MariaDB-client \
     && yum clean all \
     && rm -rf /tmp/*
 
 COPY maxscale/docker-entrypoint.sh /
-RUN chmod 777 /etc/maxscale.cnf
 COPY maxscale/maxscale.cnf /etc/
+RUN chmod 777 /etc/maxscale.cnf
 RUN chmod 777 /docker-entrypoint.sh
 
 

.travis/maxscale/Dockerfile

@@ -1,45 +1,59 @@
-# MaxScale documentation on GitHub:
-# https://github.com/mariadb-corporation/MaxScale/blob/2.1/Documentation/Documentation-Contents.md
+# MaxScale documentation:
+# https://mariadb.com/kb/en/mariadb-maxscale-24/
 
 # Global parameters
 #
 # Complete list of configuration options:
-# https://github.com/mariadb-corporation/MaxScale/blob/2.1/Documentation/Getting-Started/Configuration-Guide.md
-
+# https://mariadb.com/kb/en/mariadb-maxscale-24-mariadb-maxscale-configuration-guide/
 
 [maxscale]
-threads=2
-log_messages=1
-log_trace=1
-log_debug=1
+threads=auto
 
 # Server definitions
 #
 # Set the address of the server to the network
-# address of a MySQL server.
+# address of a MariaDB server.
 #
 
+[server2]
+type=server
+address=database
+port=3306
+protocol=MariaDBBackend
+ssl=true
+ssl_ca_cert=/etc/sslcert/server.crt
+ssl_cert=/etc/sslcert/client.crt
+ssl_key=/etc/sslcert/client.key
+
+
 [server1]
 type=server
 address=db
 port=3306
 protocol=MariaDBBackend
-authenticator_options=skip_authentication=true
-router_options=master
+
 
 # Monitor for the servers
 #
 # This will keep MaxScale aware of the state of the servers.
-# MySQL Monitor documentation:
-# https://github.com/mariadb-corporation/MaxScale/blob/2.1/Documentation/Monitors/MySQL-Monitor.md
+# MariaDB Monitor documentation:
+# https://mariadb.com/kb/en/mariadb-maxscale-24-mariadb-monitor/
 
-[MySQLMonitor]
+[MariaDB-Monitor]
 type=monitor
 module=mariadbmon
 servers=server1
 user=boby
-passwd=heyPassw0@rd
-monitor_interval=10000
+password=heyPassw0@rd
+monitor_interval=2000
+
+[MariaDB-Monitor2]
+type=monitor
+module=mariadbmon
+servers=server2
+user=boby
+password=heyPassw0@rd
+monitor_interval=2000
 
 # Service definitions
 #
@@ -48,78 +62,61 @@ monitor_interval=10000
 #
 
 # ReadConnRoute documentation:
-# https://github.com/mariadb-corporation/MaxScale/blob/2.1/Documentation/Routers/ReadConnRoute.md
+# https://mariadb.com/kb/en/mariadb-maxscale-24-readconnroute/
 
-[Read-OnlyService]
-enable_root_user=1
-version_string=10.4.99-MariaDB-maxScale
+[Read-Only-Service]
 type=service
-router=readconnroute
-servers=server1
+router=readwritesplit
+version_string=10.5.99-MariaDB-maxScale
+servers=server2
 user=boby
-passwd=heyPassw0@rd
+password=heyPassw0@rd
 router_options=slave
-localhost_match_wildcard_host=1
 
-[Read-WriteService]
-enable_root_user=1
-version_string=10.4.99-MariaDB-maxScale
+# ReadWriteSplit documentation:
+# https://mariadb.com/kb/en/mariadb-maxscale-24-readwritesplit/
+
+[Read-Write-Service]
 type=service
 router=readwritesplit
 servers=server1
+version_string=10.5.99-MariaDB-maxScale
 user=boby
-passwd=heyPassw0@rd
-localhost_match_wildcard_host=1
+password=heyPassw0@rd
 
-[WriteService]
+[Read-Write-Service2]
 type=service
-router=readconnroute
-servers=server1
+router=readwritesplit
+version_string=10.5.99-MariaDB-maxScale
+servers=server2
 user=boby
-passwd=heyPassw0@rd
-router_options=master
-localhost_match_wildcard_host=1
-version_string=10.4.99-MariaDB-maxScale
-
-
-# This service enables the use of the MaxAdmin interface
-# MaxScale administration guide:
-# https://github.com/mariadb-corporation/MaxScale/blob/2.1/Documentation/Reference/MaxAdmin.mda
-
-[MaxAdminService]
-enable_root_user=1
-version_string=10.4.99-MariaDB-maxScale
-type=service
-router=cli
+password=heyPassw0@rd
 
 # Listener definitions for the services
 #
 # These listeners represent the ports the
 # services will listen on.
 #
-[WriteListener]
-type=listener
-service=WriteService
-protocol=MariaDBClient
-port=4007
-#socket=/var/lib/maxscale/writeconn.sock
 
-[Read-OnlyListener]
+[Read-Only-Listener]
 type=listener
-service=Read-OnlyService
+service=Read-Only-Service
 protocol=MariaDBClient
 port=4008
-#socket=/var/lib/maxscale/readconn.sock
 
-[Read-WriteListener]
+[Read-Write-Listener]
 type=listener
-service=Read-WriteService
+service=Read-Write-Service
 protocol=MariaDBClient
 port=4006
-#socket=/var/lib/maxscale/rwsplit.sock
 
-[MaxAdminListener]
+
+[Read-Write-Listener2]
 type=listener
-service=MaxAdminService
-protocol=maxscaled
-socket=/tmp/maxadmin.sock
+service=Read-Write-Service2
+protocol=MariaDBClient
+port=4009
+ssl=true
+ssl_ca_cert=/etc/sslcert/ca.crt
+ssl_cert=/etc/sslcert/server.crt
+ssl_key=/etc/sslcert/server.key