From 85934542ef83a13f8d0c4624cb4770c89e5b1182 Mon Sep 17 00:00:00 2001 From: "Artem.Sidorkin" Date: Wed, 19 Dec 2018 15:10:24 +0300 Subject: [PATCH 1/5] Added unified cdc update tests. --- ...d-and-test-all-eventuate-local-postgres.sh | 11 ++++++++- ...st-all-eventuate-local-postgres-polling.sh | 2 +- ...d-test-all-eventuate-local-postgres-wal.sh | 2 +- ...entuate-local-mysql-unified-cdc-update.yml | 19 +++++++++++++++ ...al-postgres-polling-unified-cdc-update.yml | 24 +++++++++++++++++++ ...-local-postgres-wal-unified-cdc-update.yml | 20 ++++++++++++++++ single-module/mysql-cli.sh | 7 ++++++ single-module/postgres-cli.sh | 11 +++++++++ .../examples/todolist/testutil/TestUtil.java | 23 +++++++++++++----- single-module/test-upgrade-mysql.sh | 15 ++++++++++++ .../test-upgrade-postgres-polling.sh | 15 ++++++++++++ single-module/test-upgrade-postgres-wal.sh | 15 ++++++++++++ single-module/update-mysql.sql | 3 +++ single-module/update-postgres.sql | 1 + 14 files changed, 159 insertions(+), 9 deletions(-) create mode 100644 single-module/docker-compose-eventuate-local-mysql-unified-cdc-update.yml create mode 100644 single-module/docker-compose-eventuate-local-postgres-polling-unified-cdc-update.yml create mode 100644 single-module/docker-compose-eventuate-local-postgres-wal-unified-cdc-update.yml create mode 100755 single-module/mysql-cli.sh create mode 100755 single-module/postgres-cli.sh create mode 100755 single-module/test-upgrade-mysql.sh create mode 100755 single-module/test-upgrade-postgres-polling.sh create mode 100755 single-module/test-upgrade-postgres-wal.sh create mode 100755 single-module/update-mysql.sql create mode 100755 single-module/update-postgres.sql diff --git a/single-module/_build-and-test-all-eventuate-local-postgres.sh b/single-module/_build-and-test-all-eventuate-local-postgres.sh index c83415f..54a097c 100755 --- a/single-module/_build-and-test-all-eventuate-local-postgres.sh +++ b/single-module/_build-and-test-all-eventuate-local-postgres.sh @@ -1,5 +1,12 @@ #! /bin/bash +NO_RM=false + +if [ "$1" = "--no-rm" ] ; then + NO_RM=true + shift +fi + . ./set-env-postgres.sh docker-compose -f docker-compose-eventuate-local-postgres-${MODE}.yml down @@ -13,4 +20,6 @@ docker-compose -f docker-compose-eventuate-local-postgres-${MODE}.yml up --build ./gradlew cleanTest e2eTest -P ignoreE2EFailures=false -docker-compose -f docker-compose-eventuate-local-postgres-${MODE}.yml down +if [ $NO_RM = false ] ; then + docker-compose -f docker-compose-eventuate-local-postgres-${MODE}.yml down +fi diff --git a/single-module/build-and-test-all-eventuate-local-postgres-polling.sh b/single-module/build-and-test-all-eventuate-local-postgres-polling.sh index 1695a26..5208b52 100755 --- a/single-module/build-and-test-all-eventuate-local-postgres-polling.sh +++ b/single-module/build-and-test-all-eventuate-local-postgres-polling.sh @@ -2,4 +2,4 @@ export MODE=polling -./_build-and-test-all-eventuate-local-postgres.sh +./_build-and-test-all-eventuate-local-postgres.sh $* diff --git a/single-module/build-and-test-all-eventuate-local-postgres-wal.sh b/single-module/build-and-test-all-eventuate-local-postgres-wal.sh index 874548a..719a67d 100755 --- a/single-module/build-and-test-all-eventuate-local-postgres-wal.sh +++ b/single-module/build-and-test-all-eventuate-local-postgres-wal.sh @@ -2,4 +2,4 @@ export MODE=wal -./_build-and-test-all-eventuate-local-postgres.sh +./_build-and-test-all-eventuate-local-postgres.sh $* diff --git a/single-module/docker-compose-eventuate-local-mysql-unified-cdc-update.yml b/single-module/docker-compose-eventuate-local-mysql-unified-cdc-update.yml new file mode 100644 index 0000000..bf8cf33 --- /dev/null +++ b/single-module/docker-compose-eventuate-local-mysql-unified-cdc-update.yml @@ -0,0 +1,19 @@ +cdcservice: + image: eventuateio/eventuateio-local-new-cdc-service:0.30.0.M7 + ports: + - "8099:8080" + links: + - mysql + - kafka + - zookeeper + environment: + SPRING_DATASOURCE_URL: jdbc:mysql://mysql/eventuate + SPRING_DATASOURCE_USERNAME: mysqluser + SPRING_DATASOURCE_PASSWORD: mysqlpw + SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.jdbc.Driver + EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:9092 + EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181 + EVENTUATELOCAL_CDC_DB_USER_NAME: root + EVENTUATELOCAL_CDC_DB_PASSWORD: rootpassword + EVENTUATELOCAL_CDC_OLD_DEBEZIUM_DB_HISTORY_TOPIC_NAME: eventuate.local.cdc.my-sql-connector.offset.storage + EVENTUATELOCAL_CDC_BINLOG_CLIENT_ID: 1 diff --git a/single-module/docker-compose-eventuate-local-postgres-polling-unified-cdc-update.yml b/single-module/docker-compose-eventuate-local-postgres-polling-unified-cdc-update.yml new file mode 100644 index 0000000..a929dbd --- /dev/null +++ b/single-module/docker-compose-eventuate-local-postgres-polling-unified-cdc-update.yml @@ -0,0 +1,24 @@ +cdcservice: + image: eventuateio/eventuateio-local-new-cdc-service:0.30.0.M7 + ports: + - "8099:8080" + links: + - postgres + - kafka + - zookeeper + environment: + SPRING_DATASOURCE_URL: jdbc:postgresql://postgres/eventuate + SPRING_DATASOURCE_USERNAME: eventuate + SPRING_DATASOURCE_PASSWORD: eventuate + SPRING_DATASOURCE_TEST_ON_BORROW: "true" + SPRING_DATASOURCE_VALIDATION_QUERY: SELECT 1 + SPRING_DATASOURCE_DRIVER_CLASS_NAME: org.postgresql.Driver + EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:9092 + EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181 + EVENTUATELOCAL_CDC_POLLING_INTERVAL_IN_MILLISECONDS: 500 + EVENTUATELOCAL_CDC_MAX_EVENTS_PER_POLLING: 1000 + EVENTUATELOCAL_CDC_MAX_ATTEMPTS_FOR_POLLING: 100 + EVENTUATELOCAL_CDC_POLLING_RETRY_INTERVAL_IN_MILLISECONDS: 500 + EVENTUATELOCAL_CDC_OLD_DEBEZIUM_DB_HISTORY_TOPIC_NAME: none + EVENTUATELOCAL_CDC_BINLOG_CLIENT_ID: 1 + SPRING_PROFILES_ACTIVE: EventuatePolling diff --git a/single-module/docker-compose-eventuate-local-postgres-wal-unified-cdc-update.yml b/single-module/docker-compose-eventuate-local-postgres-wal-unified-cdc-update.yml new file mode 100644 index 0000000..b73c338 --- /dev/null +++ b/single-module/docker-compose-eventuate-local-postgres-wal-unified-cdc-update.yml @@ -0,0 +1,20 @@ +cdcservice: + image: eventuateio/eventuateio-local-new-cdc-service:0.20.1.RELEASE + ports: + - "8099:8080" + links: + - postgres + - kafka + - zookeeper + environment: + SPRING_DATASOURCE_URL: jdbc:postgresql://postgres/eventuate + SPRING_DATASOURCE_USERNAME: eventuate + SPRING_DATASOURCE_PASSWORD: eventuate + SPRING_DATASOURCE_TEST_ON_BORROW: "true" + SPRING_DATASOURCE_VALIDATION_QUERY: SELECT 1 + SPRING_DATASOURCE_DRIVER_CLASS_NAME: org.postgresql.Driver + EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:9092 + EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181 + EVENTUATELOCAL_CDC_OLD_DEBEZIUM_DB_HISTORY_TOPIC_NAME: none + EVENTUATELOCAL_CDC_BINLOG_CLIENT_ID: 1 + SPRING_PROFILES_ACTIVE: PostgresWal \ No newline at end of file diff --git a/single-module/mysql-cli.sh b/single-module/mysql-cli.sh new file mode 100755 index 0000000..e64e943 --- /dev/null +++ b/single-module/mysql-cli.sh @@ -0,0 +1,7 @@ +#! /bin/bash -e + +docker run $* \ + --name mysqlterm --rm \ + -e MYSQL_PORT_3306_TCP_ADDR=$DOCKER_HOST_IP -e MYSQL_PORT_3306_TCP_PORT=3306 -e MYSQL_ENV_MYSQL_ROOT_PASSWORD=rootpassword \ + mysql:5.7.13 \ + sh -c 'exec mysql -h"$MYSQL_PORT_3306_TCP_ADDR" -P"$MYSQL_PORT_3306_TCP_PORT" -uroot -p"$MYSQL_ENV_MYSQL_ROOT_PASSWORD" ' diff --git a/single-module/postgres-cli.sh b/single-module/postgres-cli.sh new file mode 100755 index 0000000..a8b2500 --- /dev/null +++ b/single-module/postgres-cli.sh @@ -0,0 +1,11 @@ +#! /bin/bash -e + +if [ -z "$POSTGRES_PORT" ]; then + export POSTGRES_PORT=5432 +fi + +docker run $* \ + --name postgresterm --rm \ + -e POSTGRES_ENV_POSTGRES_USER=eventuate -e POSTGRES_PORT=$POSTGRES_PORT -e POSTGRES_ENV_POSTGRES_PASSWORD=eventuate -e POSTGRES_HOST=$DOCKER_HOST_IP \ + postgres:9.6.5 \ + sh -c 'export PGPASSWORD="$POSTGRES_ENV_POSTGRES_PASSWORD"; exec psql -p $POSTGRES_PORT -h $POSTGRES_HOST -U "$POSTGRES_ENV_POSTGRES_USER" ' diff --git a/single-module/src/test/java/net/chrisrichardson/eventstore/examples/todolist/testutil/TestUtil.java b/single-module/src/test/java/net/chrisrichardson/eventstore/examples/todolist/testutil/TestUtil.java index 5b825e4..a842311 100755 --- a/single-module/src/test/java/net/chrisrichardson/eventstore/examples/todolist/testutil/TestUtil.java +++ b/single-module/src/test/java/net/chrisrichardson/eventstore/examples/todolist/testutil/TestUtil.java @@ -5,16 +5,27 @@ import rx.Observable; import rx.functions.Func1; +import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; public class TestUtil { + private static final int DEFAULT_INTERVAL_MS = Optional + .ofNullable(System.getenv("TODO_LIST_DEFAULT_INTERVAL_MS")) + .map(Integer::parseInt) + .orElse(400); + + private static final int DEFAULT_ITERATIONS = Optional + .ofNullable(System.getenv("TODO_LIST_DEFAULT_ITERATIONS")) + .map(Integer::parseInt) + .orElse(50); + public static T awaitSuccessfulRequest(Supplier> func, Func1 predicate) { try { - return Observable.interval(400, TimeUnit.MILLISECONDS) - .take(50) + return Observable.interval(DEFAULT_INTERVAL_MS, TimeUnit.MILLISECONDS) + .take(DEFAULT_ITERATIONS) .map(x -> func.get()) .filter(re -> re.getStatusCode().equals(HttpStatus.OK) && re.getBody() != null && predicate.call(re.getBody())) .toBlocking().first().getBody(); @@ -25,8 +36,8 @@ public static T awaitSuccessfulRequest(Supplier> func, Fun public static ResponseEntity awaitNotFoundResponse(Func1 func) { try { - return Observable.interval(400, TimeUnit.MILLISECONDS) - .take(50) + return Observable.interval(DEFAULT_INTERVAL_MS, TimeUnit.MILLISECONDS) + .take(DEFAULT_ITERATIONS) .map(func) .filter(re -> re.getStatusCode().equals(HttpStatus.NOT_FOUND)) .toBlocking().first(); @@ -37,8 +48,8 @@ public static ResponseEntity awaitNotFoundResponse(Func1 f public static T awaitSuccessfulRequest(Supplier> func) { try { - return Observable.interval(400, TimeUnit.MILLISECONDS) - .take(50) + return Observable.interval(DEFAULT_INTERVAL_MS, TimeUnit.MILLISECONDS) + .take(DEFAULT_ITERATIONS) .map(x -> func.get()) .filter(re -> re.getStatusCode().equals(HttpStatus.OK) && re.getBody() != null) .toBlocking().first().getBody(); diff --git a/single-module/test-upgrade-mysql.sh b/single-module/test-upgrade-mysql.sh new file mode 100755 index 0000000..fcf733b --- /dev/null +++ b/single-module/test-upgrade-mysql.sh @@ -0,0 +1,15 @@ +#! /bin/bash -e + +./build-and-test-all-eventuate-local-mysql.sh --no-rm + +cat update-mysql.sql | ./mysql-cli.sh -i + +DOCKER_COMPOSE="docker-compose -p java-spring-todo-list -f docker-compose-eventuate-local-mysql.yml -f docker-compose-eventuate-local-mysql-unified-cdc-update.yml " + +$DOCKER_COMPOSE up -d --no-deps cdcservice + +./wait-for-services.sh $DOCKER_HOST_IP 8099 + +./gradlew e2eTest + +$DOCKER_COMPOSE down \ No newline at end of file diff --git a/single-module/test-upgrade-postgres-polling.sh b/single-module/test-upgrade-postgres-polling.sh new file mode 100755 index 0000000..1220210 --- /dev/null +++ b/single-module/test-upgrade-postgres-polling.sh @@ -0,0 +1,15 @@ +#! /bin/bash -e + +./build-and-test-all-eventuate-local-postgres-polling.sh --no-rm + +cat update-postgres.sql | ./postgres-cli.sh -i + +DOCKER_COMPOSE="docker-compose -f docker-compose-eventuate-local-postgres-polling.yml -f docker-compose-eventuate-local-postgres-polling-unified-cdc-update.yml " + +$DOCKER_COMPOSE up -d --no-deps cdcservice + +./wait-for-services.sh $DOCKER_HOST_IP 8099 + +./gradlew e2eTest + +$DOCKER_COMPOSE down \ No newline at end of file diff --git a/single-module/test-upgrade-postgres-wal.sh b/single-module/test-upgrade-postgres-wal.sh new file mode 100755 index 0000000..860a602 --- /dev/null +++ b/single-module/test-upgrade-postgres-wal.sh @@ -0,0 +1,15 @@ +#! /bin/bash -e + +./build-and-test-all-eventuate-local-postgres-wal.sh --no-rm + +cat update-postgres.sql | ./postgres-cli.sh -i + +DOCKER_COMPOSE="docker-compose -f docker-compose-eventuate-local-postgres-wal.yml -f docker-compose-eventuate-local-postgres-wal-unified-cdc-update.yml " + +$DOCKER_COMPOSE up -d --no-deps cdcservice + +./wait-for-services.sh $DOCKER_HOST_IP 8099 + +./gradlew e2eTest + +$DOCKER_COMPOSE down \ No newline at end of file diff --git a/single-module/update-mysql.sql b/single-module/update-mysql.sql new file mode 100755 index 0000000..e2ccb1d --- /dev/null +++ b/single-module/update-mysql.sql @@ -0,0 +1,3 @@ +USE eventuate; + +create table cdc_monitoring (reader_id BIGINT PRIMARY KEY, last_time BIGINT); diff --git a/single-module/update-postgres.sql b/single-module/update-postgres.sql new file mode 100755 index 0000000..2eb24cd --- /dev/null +++ b/single-module/update-postgres.sql @@ -0,0 +1 @@ +CREATE TABLE eventuate.cdc_monitoring (reader_id BIGINT PRIMARY KEY, last_time BIGINT); \ No newline at end of file From 21765530660a1df1dc8d7200afdfb73007caa7ca Mon Sep 17 00:00:00 2001 From: "Artem.Sidorkin" Date: Wed, 23 Jan 2019 18:11:14 +0300 Subject: [PATCH 2/5] Updated unified cdc --- ...cker-compose-eventuate-local-mysql-unified-cdc-update.yml | 5 +++-- ...e-eventuate-local-postgres-polling-unified-cdc-update.yml | 4 ++-- ...mpose-eventuate-local-postgres-wal-unified-cdc-update.yml | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/single-module/docker-compose-eventuate-local-mysql-unified-cdc-update.yml b/single-module/docker-compose-eventuate-local-mysql-unified-cdc-update.yml index bf8cf33..a1d1d44 100644 --- a/single-module/docker-compose-eventuate-local-mysql-unified-cdc-update.yml +++ b/single-module/docker-compose-eventuate-local-mysql-unified-cdc-update.yml @@ -1,5 +1,5 @@ cdcservice: - image: eventuateio/eventuateio-local-new-cdc-service:0.30.0.M7 + image: test-eventuate-local-java-new-cdc-mysql-service ports: - "8099:8080" links: @@ -15,5 +15,6 @@ cdcservice: EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181 EVENTUATELOCAL_CDC_DB_USER_NAME: root EVENTUATELOCAL_CDC_DB_PASSWORD: rootpassword - EVENTUATELOCAL_CDC_OLD_DEBEZIUM_DB_HISTORY_TOPIC_NAME: eventuate.local.cdc.my-sql-connector.offset.storage + EVENTUATELOCAL_CDC_OLD_DEBEZIUM_DB_OFFSET_STORAGE_TOPIC_NAME: eventuate.local.cdc.my-sql-connector.offset.storage + EVENTUATELOCAL_CDC_MY_SQL_BIN_LOG_CLIENT_NAME: MySqlBinlog EVENTUATELOCAL_CDC_BINLOG_CLIENT_ID: 1 diff --git a/single-module/docker-compose-eventuate-local-postgres-polling-unified-cdc-update.yml b/single-module/docker-compose-eventuate-local-postgres-polling-unified-cdc-update.yml index a929dbd..341ea13 100644 --- a/single-module/docker-compose-eventuate-local-postgres-polling-unified-cdc-update.yml +++ b/single-module/docker-compose-eventuate-local-postgres-polling-unified-cdc-update.yml @@ -1,5 +1,5 @@ cdcservice: - image: eventuateio/eventuateio-local-new-cdc-service:0.30.0.M7 + image: test-eventuate-local-java-new-cdc-mysql-service ports: - "8099:8080" links: @@ -19,6 +19,6 @@ cdcservice: EVENTUATELOCAL_CDC_MAX_EVENTS_PER_POLLING: 1000 EVENTUATELOCAL_CDC_MAX_ATTEMPTS_FOR_POLLING: 100 EVENTUATELOCAL_CDC_POLLING_RETRY_INTERVAL_IN_MILLISECONDS: 500 - EVENTUATELOCAL_CDC_OLD_DEBEZIUM_DB_HISTORY_TOPIC_NAME: none + EVENTUATELOCAL_CDC_OLD_DEBEZIUM_DB_OFFSET_STORAGE_TOPIC_NAME: none EVENTUATELOCAL_CDC_BINLOG_CLIENT_ID: 1 SPRING_PROFILES_ACTIVE: EventuatePolling diff --git a/single-module/docker-compose-eventuate-local-postgres-wal-unified-cdc-update.yml b/single-module/docker-compose-eventuate-local-postgres-wal-unified-cdc-update.yml index b73c338..c6638a4 100644 --- a/single-module/docker-compose-eventuate-local-postgres-wal-unified-cdc-update.yml +++ b/single-module/docker-compose-eventuate-local-postgres-wal-unified-cdc-update.yml @@ -1,5 +1,5 @@ cdcservice: - image: eventuateio/eventuateio-local-new-cdc-service:0.20.1.RELEASE + image: test-eventuate-local-java-new-cdc-mysql-service ports: - "8099:8080" links: @@ -15,6 +15,6 @@ cdcservice: SPRING_DATASOURCE_DRIVER_CLASS_NAME: org.postgresql.Driver EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:9092 EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181 - EVENTUATELOCAL_CDC_OLD_DEBEZIUM_DB_HISTORY_TOPIC_NAME: none + EVENTUATELOCAL_CDC_OLD_DEBEZIUM_DB_OFFSET_STORAGE_TOPIC_NAME: none EVENTUATELOCAL_CDC_BINLOG_CLIENT_ID: 1 SPRING_PROFILES_ACTIVE: PostgresWal \ No newline at end of file From 3667134e3bb0a3ed4bd44487bef730c2f1cf5add Mon Sep 17 00:00:00 2001 From: "Artem.Sidorkin" Date: Thu, 24 Jan 2019 18:12:29 +0300 Subject: [PATCH 3/5] Replaced unified cdc services to release version. --- .../docker-compose-eventuate-local-mysql-unified-cdc-update.yml | 2 +- ...pose-eventuate-local-postgres-polling-unified-cdc-update.yml | 2 +- ...-compose-eventuate-local-postgres-wal-unified-cdc-update.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/single-module/docker-compose-eventuate-local-mysql-unified-cdc-update.yml b/single-module/docker-compose-eventuate-local-mysql-unified-cdc-update.yml index a1d1d44..ebd0233 100644 --- a/single-module/docker-compose-eventuate-local-mysql-unified-cdc-update.yml +++ b/single-module/docker-compose-eventuate-local-mysql-unified-cdc-update.yml @@ -1,5 +1,5 @@ cdcservice: - image: test-eventuate-local-java-new-cdc-mysql-service + image: eventuateio/eventuateio-local-new-cdc-service:0.30.0.M10 ports: - "8099:8080" links: diff --git a/single-module/docker-compose-eventuate-local-postgres-polling-unified-cdc-update.yml b/single-module/docker-compose-eventuate-local-postgres-polling-unified-cdc-update.yml index 341ea13..dbf8235 100644 --- a/single-module/docker-compose-eventuate-local-postgres-polling-unified-cdc-update.yml +++ b/single-module/docker-compose-eventuate-local-postgres-polling-unified-cdc-update.yml @@ -1,5 +1,5 @@ cdcservice: - image: test-eventuate-local-java-new-cdc-mysql-service + image: eventuateio/eventuateio-local-new-cdc-service:0.30.0.M10 ports: - "8099:8080" links: diff --git a/single-module/docker-compose-eventuate-local-postgres-wal-unified-cdc-update.yml b/single-module/docker-compose-eventuate-local-postgres-wal-unified-cdc-update.yml index c6638a4..68a17c2 100644 --- a/single-module/docker-compose-eventuate-local-postgres-wal-unified-cdc-update.yml +++ b/single-module/docker-compose-eventuate-local-postgres-wal-unified-cdc-update.yml @@ -1,5 +1,5 @@ cdcservice: - image: test-eventuate-local-java-new-cdc-mysql-service + image: eventuateio/eventuateio-local-new-cdc-service:0.30.0.M10 ports: - "8099:8080" links: From 92fb3744a79a8a0b7c5cf9558d4d686982002a9b Mon Sep 17 00:00:00 2001 From: Artem Sidorkin Date: Thu, 16 May 2019 19:46:27 +0300 Subject: [PATCH 4/5] Updated eventuate local --- ...-compose-eventuate-local-mysql-unified-cdc-update.yml | 9 +++++---- ...entuate-local-postgres-polling-unified-cdc-update.yml | 5 ++--- ...e-eventuate-local-postgres-wal-unified-cdc-update.yml | 7 +++---- single-module/update-mysql.sql | 2 +- single-module/update-postgres.sql | 2 +- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/single-module/docker-compose-eventuate-local-mysql-unified-cdc-update.yml b/single-module/docker-compose-eventuate-local-mysql-unified-cdc-update.yml index ebd0233..08ddd7d 100644 --- a/single-module/docker-compose-eventuate-local-mysql-unified-cdc-update.yml +++ b/single-module/docker-compose-eventuate-local-mysql-unified-cdc-update.yml @@ -1,5 +1,5 @@ cdcservice: - image: eventuateio/eventuateio-local-new-cdc-service:0.30.0.M10 + image: eventuateio/eventuateio-local-cdc-service:0.30.1.RELEASE ports: - "8099:8080" links: @@ -15,6 +15,7 @@ cdcservice: EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181 EVENTUATELOCAL_CDC_DB_USER_NAME: root EVENTUATELOCAL_CDC_DB_PASSWORD: rootpassword - EVENTUATELOCAL_CDC_OLD_DEBEZIUM_DB_OFFSET_STORAGE_TOPIC_NAME: eventuate.local.cdc.my-sql-connector.offset.storage - EVENTUATELOCAL_CDC_MY_SQL_BIN_LOG_CLIENT_NAME: MySqlBinlog - EVENTUATELOCAL_CDC_BINLOG_CLIENT_ID: 1 + EVENTUATELOCAL_CDC_READ_OLD_DEBEZIUM_DB_OFFSET_STORAGE_TOPIC: "false" + EVENTUATELOCAL_CDC_READER_NAME: MySqlReader + EVENTUATELOCAL_CDC_OFFSET_STORE_KEY: MySqlBinlog + EVENTUATELOCAL_CDC_MYSQL_BINLOG_CLIENT_UNIQUE_ID: 1234567890 diff --git a/single-module/docker-compose-eventuate-local-postgres-polling-unified-cdc-update.yml b/single-module/docker-compose-eventuate-local-postgres-polling-unified-cdc-update.yml index dbf8235..9f031c9 100644 --- a/single-module/docker-compose-eventuate-local-postgres-polling-unified-cdc-update.yml +++ b/single-module/docker-compose-eventuate-local-postgres-polling-unified-cdc-update.yml @@ -1,5 +1,5 @@ cdcservice: - image: eventuateio/eventuateio-local-new-cdc-service:0.30.0.M10 + image: eventuateio/eventuateio-local-cdc-service:0.30.1.RELEASE ports: - "8099:8080" links: @@ -19,6 +19,5 @@ cdcservice: EVENTUATELOCAL_CDC_MAX_EVENTS_PER_POLLING: 1000 EVENTUATELOCAL_CDC_MAX_ATTEMPTS_FOR_POLLING: 100 EVENTUATELOCAL_CDC_POLLING_RETRY_INTERVAL_IN_MILLISECONDS: 500 - EVENTUATELOCAL_CDC_OLD_DEBEZIUM_DB_OFFSET_STORAGE_TOPIC_NAME: none - EVENTUATELOCAL_CDC_BINLOG_CLIENT_ID: 1 SPRING_PROFILES_ACTIVE: EventuatePolling + EVENTUATELOCAL_CDC_READER_NAME: PostgresPollingReader \ No newline at end of file diff --git a/single-module/docker-compose-eventuate-local-postgres-wal-unified-cdc-update.yml b/single-module/docker-compose-eventuate-local-postgres-wal-unified-cdc-update.yml index 68a17c2..83840fd 100644 --- a/single-module/docker-compose-eventuate-local-postgres-wal-unified-cdc-update.yml +++ b/single-module/docker-compose-eventuate-local-postgres-wal-unified-cdc-update.yml @@ -1,5 +1,5 @@ cdcservice: - image: eventuateio/eventuateio-local-new-cdc-service:0.30.0.M10 + image: eventuateio/eventuateio-local-cdc-service:0.30.1.RELEASE ports: - "8099:8080" links: @@ -15,6 +15,5 @@ cdcservice: SPRING_DATASOURCE_DRIVER_CLASS_NAME: org.postgresql.Driver EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:9092 EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181 - EVENTUATELOCAL_CDC_OLD_DEBEZIUM_DB_OFFSET_STORAGE_TOPIC_NAME: none - EVENTUATELOCAL_CDC_BINLOG_CLIENT_ID: 1 - SPRING_PROFILES_ACTIVE: PostgresWal \ No newline at end of file + SPRING_PROFILES_ACTIVE: PostgresWal + EVENTUATELOCAL_CDC_READER_NAME: PostgresWalReader \ No newline at end of file diff --git a/single-module/update-mysql.sql b/single-module/update-mysql.sql index e2ccb1d..5bb5394 100755 --- a/single-module/update-mysql.sql +++ b/single-module/update-mysql.sql @@ -1,3 +1,3 @@ USE eventuate; -create table cdc_monitoring (reader_id BIGINT PRIMARY KEY, last_time BIGINT); +create table cdc_monitoring (reader_id VARCHAR(1000) PRIMARY KEY, last_time BIGINT); \ No newline at end of file diff --git a/single-module/update-postgres.sql b/single-module/update-postgres.sql index 2eb24cd..e5bb51e 100755 --- a/single-module/update-postgres.sql +++ b/single-module/update-postgres.sql @@ -1 +1 @@ -CREATE TABLE eventuate.cdc_monitoring (reader_id BIGINT PRIMARY KEY, last_time BIGINT); \ No newline at end of file +CREATE TABLE cdc_monitoring (reader_id VARCHAR(1000) PRIMARY KEY, last_time BIGINT); \ No newline at end of file From f5d9a0303be08323d2942968eaee938c8cbc0549 Mon Sep 17 00:00:00 2001 From: Artem Sidorkin Date: Thu, 30 May 2019 17:18:14 +0300 Subject: [PATCH 5/5] Updated eventuate local --- .../docker-compose-eventuate-local-mysql-unified-cdc-update.yml | 2 +- ...pose-eventuate-local-postgres-polling-unified-cdc-update.yml | 2 +- ...-compose-eventuate-local-postgres-wal-unified-cdc-update.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/single-module/docker-compose-eventuate-local-mysql-unified-cdc-update.yml b/single-module/docker-compose-eventuate-local-mysql-unified-cdc-update.yml index 08ddd7d..53d466b 100644 --- a/single-module/docker-compose-eventuate-local-mysql-unified-cdc-update.yml +++ b/single-module/docker-compose-eventuate-local-mysql-unified-cdc-update.yml @@ -1,5 +1,5 @@ cdcservice: - image: eventuateio/eventuateio-local-cdc-service:0.30.1.RELEASE + image: eventuateio/eventuateio-local-cdc-service:0.30.2.RELEASE ports: - "8099:8080" links: diff --git a/single-module/docker-compose-eventuate-local-postgres-polling-unified-cdc-update.yml b/single-module/docker-compose-eventuate-local-postgres-polling-unified-cdc-update.yml index 9f031c9..d0a8319 100644 --- a/single-module/docker-compose-eventuate-local-postgres-polling-unified-cdc-update.yml +++ b/single-module/docker-compose-eventuate-local-postgres-polling-unified-cdc-update.yml @@ -1,5 +1,5 @@ cdcservice: - image: eventuateio/eventuateio-local-cdc-service:0.30.1.RELEASE + image: eventuateio/eventuateio-local-cdc-service:0.30.2.RELEASE ports: - "8099:8080" links: diff --git a/single-module/docker-compose-eventuate-local-postgres-wal-unified-cdc-update.yml b/single-module/docker-compose-eventuate-local-postgres-wal-unified-cdc-update.yml index 83840fd..c01fefb 100644 --- a/single-module/docker-compose-eventuate-local-postgres-wal-unified-cdc-update.yml +++ b/single-module/docker-compose-eventuate-local-postgres-wal-unified-cdc-update.yml @@ -1,5 +1,5 @@ cdcservice: - image: eventuateio/eventuateio-local-cdc-service:0.30.1.RELEASE + image: eventuateio/eventuateio-local-cdc-service:0.30.2.RELEASE ports: - "8099:8080" links: