Improve docker testing setup

Updated some versions, added new capabilities and created a simple sanity check script to see that the most basic functionality works.
mariadb-corporation · Nov 20, 2018 · 5aaec40 · 5aaec40
1 parent ae5c534
commit 5aaec40
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 12 deletions.
diff --git a/maxscale-cdc-adapter/test/build.sh b/maxscale-cdc-adapter/test/build.sh
@@ -2,19 +2,13 @@
 
 cd $(dirname $(realpath $0))
 
-docker exec -i adapter bash <<EOF
-rm -rf /src/
-EOF
-
 docker cp ../../ adapter:/src/
 
 docker exec -i adapter bash <<EOF
 # The adapter itself
-cd /src/
-rm -rf build
-mkdir build
-cd build
-cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DKAFKA=OFF -DKETTLE=OFF -DMAX_KAFKA=OFF -DMAX_CDC=ON
+mkdir -p /build
+cd /build
+cmake ../src -DCMAKE_INSTALL_PREFIX=/usr -DKAFKA=OFF -DKETTLE=OFF -DMAX_KAFKA=OFF -DMAX_CDC=ON
 make
 make install
 EOF
diff --git a/maxscale-cdc-adapter/test/docker/docker-compose.yml b/maxscale-cdc-adapter/test/docker/docker-compose.yml
@@ -4,7 +4,7 @@ services:
     image: mariadb/maxscale
     container_name: maxscale
     volumes:
-      - ./maxscale/maxscale.cnf:/etc/maxscale.cnf.d/maxscale.cnf
+      - ./maxscale/maxscale.cnf:/etc/maxscale.cnf
       - ./maxscale/master.ini:/var/lib/maxscale/master.ini
     ports:
       - "4001:4001"
@@ -23,9 +23,12 @@ services:
   adapter:
     build: mxs_adapter
     container_name: adapter
+    cap_add:
+        - SYS_PTRACE
+
 
   mcs:
-    image: mariadb/columnstore_singlenode
+    image: mariadb/columnstore:latest
     container_name: mcs
     ports:
       - "13306:13306"

diff --git a/maxscale-cdc-adapter/test/docker/maxscale/maxscale.cnf b/maxscale-cdc-adapter/test/docker/maxscale/maxscale.cnf
@@ -1,3 +1,7 @@
+[maxscale]
+threads=4
+log_info=1
+
 [replication-service]
 type=service
 router=binlogrouter

diff --git a/maxscale-cdc-adapter/test/docker/mxs_adapter/Dockerfile b/maxscale-cdc-adapter/test/docker/mxs_adapter/Dockerfile
@@ -6,7 +6,7 @@ RUN yum -y --nogpgcheck install epel-release && \
     git gcc-c++ make openssl-devel jansson-devel boost-devel && \
     curl -sS https://downloads.mariadb.com/MariaDB/mariadb_repo_setup|bash && \
     yum -y --nogpgcheck install maxscale-cdc-connector && \
-    yum -y --nogpgcheck install https://downloads.mariadb.com/Data-Adapters/mariadb-columnstore-api/1.1.5/centos/x86_64/7/mariadb-columnstore-api-1.1.5-1-x86_64-centos7.rpm && \
+    yum -y --nogpgcheck install https://downloads.mariadb.com/Data-Adapters/mariadb-columnstore-api/1.1.6/centos/x86_64/7/mariadb-columnstore-api-1.1.6-1-x86_64-centos7.rpm && \
     yum clean all
 
 # The pre-configured Columnstore.xml

diff --git a/maxscale-cdc-adapter/test/sanity_check.sh b/maxscale-cdc-adapter/test/sanity_check.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+(cd docker
+docker-compose up -d)
+
+./build.sh
+
+mysql --force -v -u root -h 127.0.0.1 -P 3000 <<EOF
+CREATE TABLE IF NOT EXISTS test.t1(a INT, b VARCHAR(200), c DATETIME, d DOUBLE, e DECIMAL(10,2));
+INSERT INTO test.t1 VALUES (1, '2', NOW(), 4.0, 5.00);
+UPDATE test.t1 SET a = 2 WHERE b = '2';
+DELETE FROM test.t1;
+EOF
+
+docker exec -i mcs mysql <<EOF
+CREATE USER root;
+GRANT ALL ON *.* TO root;
+EOF
+
+timeout --foreground -k 5 10 docker exec -ti adapter mxs_adapter -u cdcuser -p cdc -h maxscale -a test t1