Skip to content

[Improve][E2E] Reduce the times of copy connector jar to container #8095

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

Closed
Hisoka-X wants to merge 1 commit into from
Closed

[Improve][E2E] Reduce the times of copy connector jar to container #8095

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 31 additions & 11 deletions ...eatunnel-e2e-common/src/test/java/org/apache/seatunnel/e2e/common/util/ContainerUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,16 @@ public static void copyConnectorJarToContainer(
Set<String> connectorNames = getConnectors(jobConfig, connectors, "source");
connectorNames.addAll(getConnectors(jobConfig, connectors, "sink"));
File module = new File(PROJECT_ROOT_PATH + File.separator + connectorsRootPath);

List<File> connectorFiles = getConnectorFiles(module, connectorNames, connectorPrefix);
connectorFiles.forEach(
jar ->
container.copyFileToContainer(
MountableFile.forHostPath(jar.getAbsolutePath()),
Paths.get(seatunnelHome, "connectors", jar.getName()).toString()));
List<String> jars = getAlreadyInContainerConnectors(container, seatunnelHome);
connectorFiles.stream()
.filter(jar -> !jars.contains(jar.getName()))
.forEach(
jar ->
container.copyFileToContainer(
MountableFile.forHostPath(jar.getAbsolutePath()),
Paths.get(seatunnelHome, "connectors", jar.getName())
.toString()));
}

public static void copyAllConnectorJarToContainer(
Expand All @@ -126,11 +129,15 @@ public static void copyAllConnectorJarToContainer(
connectors.getConfig(pluginType.getType()))));
File module = new File(PROJECT_ROOT_PATH + File.separator + connectorsRootPath);
List<File> connectorFiles = getConnectorFiles(module, connectorNames, connectorPrefix);
connectorFiles.forEach(
jar ->
container.copyFileToContainer(
MountableFile.forHostPath(jar.getAbsolutePath()),
Paths.get(seatunnelHome, "connectors", jar.getName()).toString()));
List<String> jars = getAlreadyInContainerConnectors(container, seatunnelHome);
connectorFiles.stream()
.filter(jar -> !jars.contains(jar.getName()))
.forEach(
jar ->
container.copyFileToContainer(
MountableFile.forHostPath(jar.getAbsolutePath()),
Paths.get(seatunnelHome, "connectors", jar.getName())
.toString()));
}

public static Set<String> getConnectorNames(Config config) {
Expand All @@ -155,6 +162,19 @@ public static Set<String> getConnectorIdentifier(String connectorType, String pl
return treeSet;
}

private static List<String> getAlreadyInContainerConnectors(
GenericContainer<?> container, String seatunnelHome) {
try {
Container.ExecResult execResult =
container.execInContainer(
"ls", Paths.get(seatunnelHome, "connectors").toString());
String result = execResult.getStdout();
return Arrays.stream(result.split("\n")).collect(Collectors.toList());
} catch (Exception e) {
throw new RuntimeException(e);
}
}

public static String copyConfigFileToContainer(GenericContainer<?> container, String confFile) {
final String targetConfInContainer = Paths.get("/tmp", confFile).toString();
container.copyFileToContainer(
Expand Down