alexey.rassokhin/tet123
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

DBZ-3099 Make streaming MBean name configurable in tests

Browse Source
This commit is contained in:
Jiri Pechanec 2021-02-15 12:10:26 +01:00 committed by Gunnar Morling
parent 048530aeb8
commit 7394ecfd62
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/mysql-legacy-workflow.yml vendored
View File

@ -45,4 +45,4 @@ jobs:
restore-keys: |
${{ runner.os }}-maven-
- name: Check changes in Debezium Connector MYSQL
run: 'mvn clean install -B -pl debezium-connector-mysql -am -Passembly -Dformat.formatter.goal=validate -Dformat.imports.goal=check -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dtest.argline="-Dinternal.implementation=legacy"'
run: 'mvn clean install -B -pl debezium-connector-mysql -am -Passembly -Dformat.formatter.goal=validate -Dformat.imports.goal=check -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dtest.argline="-Dinternal.implementation=legacy -Dtest.streaming.metrics.namespace=binlog"'

6
debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlMetricsIT.java
View File

@ -271,11 +271,7 @@ private void waitForStreamingToStart() throws InterruptedException {
waitForStreamingRunning("mysql", SERVER_NAME, getStreamingNamespace());
}
private String getStreamingNamespace() {
return isLegacy() ? "binlog" : "streaming";
}
protected boolean isLegacy() {
protected static boolean isLegacy() {
return MySqlConnector.LEGACY_IMPLEMENTATION.equals(System.getProperty(MySqlConnector.IMPLEMENTATION_PROP, "new"));
}
}

10
debezium-embedded/src/test/java/io/debezium/embedded/AbstractConnectorTest.java
View File

@ -1052,7 +1052,7 @@ public static void waitForSnapshotToBeCompleted(String connector, String server)
}
public static void waitForStreamingRunning(String connector, String server) throws InterruptedException {
waitForStreamingRunning(connector, server, "streaming");
waitForStreamingRunning(connector, server, getStreamingNamespace());
}
public static void waitForStreamingRunning(String connector, String server, String contextName) {
@ -1072,7 +1072,7 @@ public static void waitForConnectorShutdown(String connector, String server) {
}
public static boolean isStreamingRunning(String connector, String server) {
return isStreamingRunning(connector, server, "streaming");
return isStreamingRunning(connector, server, getStreamingNamespace());
}
public static boolean isStreamingRunning(String connector, String server, String contextName) {
@ -1091,10 +1091,14 @@ public static ObjectName getSnapshotMetricsObjectName(String connector, String s
}
public static ObjectName getStreamingMetricsObjectName(String connector, String server) throws MalformedObjectNameException {
return getStreamingMetricsObjectName(connector, server, "streaming");
return getStreamingMetricsObjectName(connector, server, getStreamingNamespace());
}
public static ObjectName getStreamingMetricsObjectName(String connector, String server, String context) throws MalformedObjectNameException {
return new ObjectName("debezium." + connector + ":type=connector-metrics,context=" + context + ",server=" + server);
}
protected static String getStreamingNamespace() {
return System.getProperty("test.streaming.metrics.namespace", "streaming");
}
}