[FLINK-19158][e2e] Fix wget timeout mechanism and cache config

This closes apache#14694
deepfield · Jan 20, 2021 · c96c395 · c96c395
1 parent c6b3799
commit c96c395
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/...end-to-end-tests-common/src/main/java/org/apache/flink/tests/util/CommandLineWrapper.java b/...end-to-end-tests-common/src/main/java/org/apache/flink/tests/util/CommandLineWrapper.java
@@ -19,6 +19,7 @@
 package org.apache.flink.tests.util;
 
 import java.nio.file.Path;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -35,6 +36,7 @@ public static final class WGetBuilder {
 
  private final String url;
  private Path targetDir;
+ private long timeoutSecs;
 
  WGetBuilder(String url) {
  this.url = url;
@@ -45,6 +47,11 @@ public WGetBuilder targetDir(Path dir) {
  return this;
  }
 
+ public WGetBuilder timeoutSecs(Duration timeout) {
+ this.timeoutSecs = timeout.getSeconds();
+ return this;
+ }
+
  public String[] build() {
  final List<String> commandsList = new ArrayList<>(5);
  commandsList.add("wget");
@@ -54,6 +61,10 @@ public String[] build() {
  commandsList.add("-P");
  commandsList.add(targetDir.toAbsolutePath().toString());
  }
+ if (timeoutSecs > 0) {
+ commandsList.add("--timeout");
+ commandsList.add(Long.toString(timeoutSecs));
+ }
  commandsList.add(url);
  return commandsList.toArray(new String[commandsList.size()]);
  }

diff --git a/...d-tests-common/src/main/java/org/apache/flink/tests/util/cache/AbstractDownloadCache.java b/...d-tests-common/src/main/java/org/apache/flink/tests/util/cache/AbstractDownloadCache.java
@@ -128,7 +128,10 @@ public Path getOrDownload(final String url, final Path targetDir) throws IOExcep
  Files.createDirectories(scopedDownloadDir);
  log.info("Downloading {}.", url);
  AutoClosableProcess.create(
- CommandLineWrapper.wget(url).targetDir(scopedDownloadDir).build())
+ CommandLineWrapper.wget(url)
+ .targetDir(scopedDownloadDir)
+ .timeoutSecs(downloadAttemptTimeout)
+ .build())
  .runBlockingWithRetry(
  downloadMaxRetries, downloadAttemptTimeout, downloadGlobalTimeout);
 

diff --git a/...tests-common/src/main/java/org/apache/flink/tests/util/cache/PersistingDownloadCache.java b/...tests-common/src/main/java/org/apache/flink/tests/util/cache/PersistingDownloadCache.java
@@ -51,6 +51,7 @@ public final class PersistingDownloadCache extends AbstractDownloadCache {
  public PersistingDownloadCache(final Path path, final Period ttl) {
  super(path);
  this.ttl = ttl;
+ log.info("Using PersistingDownloadCache with path {} and ttl {}", path, ttl);
  }
 
  @Override