Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Improve][CDC]Remove driver for cdc connector #4952

Merged
merged 12 commits into from
Jun 28, 2023
Merged

[Improve][CDC]Remove driver for cdc connector #4952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d1a9b99
remove mysql driver
Jun 20, 2023
c62e59b
remove mysql driver
Jun 20, 2023
60e9314
add driver
Jun 21, 2023
59310dd
Merge remote-tracking branch 'upstream/dev' into improve-7
liugddx Jun 25, 2023
f728c22
fix cdc can not get driver error
liugddx Jun 25, 2023
03705bf
fix cdc can not get driver error
liugddx Jun 26, 2023
93a1ac1
add driver
Jun 26, 2023
9c58ff0
add driver
Jun 26, 2023
c298da3
fix cdc can not get driver error
liugddx Jun 26, 2023
7d8fed3
fix cdc can not get driver error
liugddx Jun 26, 2023
5e97555
change log level to warn
liugddx Jun 26, 2023
194042b
change log level to warn
liugddx Jun 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions seatunnel-connectors-v2/connector-cdc/connector-cdc-mysql/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@
<dependency>
<groupId>io.debezium</groupId>
<artifactId>debezium-connector-mysql</artifactId>
<exclusions>
<exclusion>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.seatunnel</groupId>
Expand Down
6 changes: 6 additions & 0 deletions seatunnel-connectors-v2/connector-cdc/connector-cdc-sqlserver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@
<dependency>
<groupId>io.debezium</groupId>
<artifactId>debezium-connector-sqlserver</artifactId>
<exclusions>
<exclusion>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion seatunnel-connectors-v2/connector-jdbc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<name>SeaTunnel : Connectors V2 : Jdbc</name>

<properties>
<mysql.version>8.0.16</mysql.version>
<mysql.version>8.0.27</mysql.version>
<postgresql.version>42.4.3</postgresql.version>
<dm-jdbc.version>8.1.2.141</dm-jdbc.version>
<sqlserver.version>9.2.1.jre8</sqlserver.version>
Expand Down
18 changes: 18 additions & 0 deletions seatunnel-e2e/seatunnel-connector-v2-e2e/connector-cdc-mysql-e2e/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,18 @@
<artifactId>connector-cdc-mysql-e2e</artifactId>
<name>SeaTunnel : E2E : Connector V2 : CDC MySql</name>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.seatunnel</groupId>
<artifactId>connector-jdbc</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<!-- SeaTunnel connectors -->
<dependency>
Expand All @@ -47,5 +59,11 @@
<artifactId>mysql</artifactId>
<version>${testcontainer.version}</version>
</dependency>

<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
19 changes: 19 additions & 0 deletions ...sql-e2e/src/test/java/org/apache/seatunnel/connectors/seatunnel/cdc/mysql/MysqlCDCIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,17 @@
import org.apache.seatunnel.connectors.seatunnel.cdc.mysql.testutils.UniqueDatabase;
import org.apache.seatunnel.e2e.common.TestResource;
import org.apache.seatunnel.e2e.common.TestSuiteBase;
import org.apache.seatunnel.e2e.common.container.ContainerExtendedFactory;
import org.apache.seatunnel.e2e.common.container.EngineType;
import org.apache.seatunnel.e2e.common.container.TestContainer;
import org.apache.seatunnel.e2e.common.junit.DisabledOnContainer;
import org.apache.seatunnel.e2e.common.junit.TestContainerExtension;

import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.TestTemplate;
import org.testcontainers.containers.Container;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.lifecycle.Startables;
import org.testcontainers.utility.DockerLoggerFactory;
Expand Down Expand Up @@ -102,6 +105,22 @@ private static MySqlContainer createMySqlContainer(MySqlVersion version) {
return mySqlContainer;
}

private String driverUrl() {
return "https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/8.0.32/mysql-connector-j-8.0.32.jar";
}

@TestContainerExtension
protected final ContainerExtendedFactory extendedFactory =
container -> {
Container.ExecResult extraCommands =
container.execInContainer(
"bash",
"-c",
"mkdir -p /tmp/seatunnel/plugins/MySQL-CDC/lib && cd /tmp/seatunnel/plugins/MySQL-CDC/lib && wget "
+ driverUrl());
Assertions.assertEquals(0, extraCommands.getExitCode(), extraCommands.getStderr());
};

@BeforeAll
@Override
public void startUp() throws ClassNotFoundException, InterruptedException {
Expand Down
4 changes: 2 additions & 2 deletions ...tunnel-connector-v2-e2e/connector-cdc-mysql-e2e/src/test/resources/log4j2-test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
################################################################################

# Set root logger level to OFF to not flood build logs
# set manually to INFO for debugging purposes
rootLogger.level=INFO
# The amount of logs is too large to be suitable for troubleshooting, manually set to WARN.
rootLogger.level=WARN
rootLogger.appenderRef.test.ref = TestLogger

appender.testlogger.name = TestLogger
Expand Down
17 changes: 17 additions & 0 deletions seatunnel-e2e/seatunnel-connector-v2-e2e/connector-cdc-sqlserver-e2e/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,18 @@
<artifactId>connector-cdc-sqlserver-e2e</artifactId>
<name>SeaTunnel : E2E : Connector V2 : CDC SqlServer</name>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.seatunnel</groupId>
<artifactId>connector-jdbc</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<!-- SeaTunnel connectors -->
<dependency>
Expand Down Expand Up @@ -59,5 +71,10 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
</dependency>
</dependencies>
</project>
19 changes: 19 additions & 0 deletions ...er-e2e/src/test/java/org/apache/seatunnel/e2e/connector/cdc/sqlserver/SqlServerCDCIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,19 @@

import org.apache.seatunnel.e2e.common.TestResource;
import org.apache.seatunnel.e2e.common.TestSuiteBase;
import org.apache.seatunnel.e2e.common.container.ContainerExtendedFactory;
import org.apache.seatunnel.e2e.common.container.EngineType;
import org.apache.seatunnel.e2e.common.container.TestContainer;
import org.apache.seatunnel.e2e.common.junit.DisabledOnContainer;
import org.apache.seatunnel.e2e.common.junit.TestContainerExtension;

import org.awaitility.Awaitility;
import org.awaitility.core.ConditionTimeoutException;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.TestTemplate;
import org.testcontainers.containers.Container;
import org.testcontainers.containers.MSSQLServerContainer;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.lifecycle.Startables;
Expand Down Expand Up @@ -92,6 +95,22 @@ public class SqlServerCDCIT extends TestSuiteBase implements TestResource {
new Slf4jLogConsumer(
DockerLoggerFactory.getLogger("sqlserver-docker-image")));

private String driverUrl() {
return "https://repo1.maven.org/maven2/com/microsoft/sqlserver/mssql-jdbc/9.4.1.jre8/mssql-jdbc-9.4.1.jre8.jar";
}

@TestContainerExtension
protected final ContainerExtendedFactory extendedFactory =
container -> {
Container.ExecResult extraCommands =
container.execInContainer(
"bash",
"-c",
"mkdir -p /tmp/seatunnel/plugins/SqlServer-CDC/lib && cd /tmp/seatunnel/plugins/SqlServer-CDC/lib && wget "
+ driverUrl());
Assertions.assertEquals(0, extraCommands.getExitCode(), extraCommands.getStderr());
};

@Override
@BeforeAll
public void startUp() throws Exception {
Expand Down
20 changes: 16 additions & 4 deletions seatunnel-e2e/seatunnel-connector-v2-e2e/connector-kafka-e2e/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,17 @@
<artifactId>connector-kafka-e2e</artifactId>
<name>SeaTunnel : E2E : Connector V2 : Kafka</name>

<properties>
<postgresql.version>42.4.3</postgresql.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.seatunnel</groupId>
<artifactId>connector-jdbc</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
Expand Down Expand Up @@ -82,7 +90,6 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${postgresql.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -97,6 +104,11 @@
<version>${testcontainer.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

</project>
23 changes: 16 additions & 7 deletions seatunnel-e2e/seatunnel-connector-v2-e2e/connector-pulsar-e2e/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,17 @@
<artifactId>connector-pulsar-e2e</artifactId>
<name>SeaTunnel : E2E : Connector V2 : Pulsar</name>

<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<postgresql.version>42.4.3</postgresql.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.seatunnel</groupId>
<artifactId>connector-jdbc</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
Expand Down Expand Up @@ -93,7 +98,11 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${postgresql.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion seatunnel-e2e/seatunnel-e2e-common/src/test/resources/log4j2.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# limitations under the License.
################################################################################

rootLogger.level = INFO
rootLogger.level = WARN

rootLogger.appenderRef.consoleStdout.ref = consoleStdoutAppender
rootLogger.appenderRef.consoleStderr.ref = consoleStderrAppender
Expand Down
4 changes: 2 additions & 2 deletions ...atunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/resources/log4j2-test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
# limitations under the License.
################################################################################

rootLogger.level = INFO
rootLogger.level = WARN

rootLogger.appenderRef.consoleStdout.ref = consoleStdoutAppender
rootLogger.appenderRef.consoleStderr.ref = consoleStderrAppender

logger.zeta.name=org.apache.seatunnel.engine
logger.zeta.level=DEBUG
logger.zeta.level=WARN

appender.consoleStdout.name = consoleStdoutAppender
appender.consoleStdout.type = CONSOLE
Expand Down
4 changes: 2 additions & 2 deletions ...2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/resources/log4j2.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
# limitations under the License.
################################################################################

rootLogger.level = INFO
rootLogger.level = WARN

logger.zeta.name=org.apache.seatunnel.engine
logger.zeta.level=INFO
logger.zeta.level=WARN

logger.debezium.name=io.debezium.connector
logger.debezium.level=WARN
Expand Down