[FLINK-15789][kubernetes] Do not wrap the InterruptedException and th…

…row a different one in ActionWatcher.await This closes apache#10970.
spotify · Feb 3, 2020 · bab25ae · bab25ae
1 parent aff098b
commit bab25ae
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/...bernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/Fabric8FlinkKubeClient.java b/...bernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/Fabric8FlinkKubeClient.java
@@ -37,6 +37,7 @@
 import org.apache.flink.kubernetes.kubeclient.resources.KubernetesService;
 import org.apache.flink.kubernetes.utils.Constants;
 import org.apache.flink.util.TimeUtils;
+import org.apache.flink.util.function.FunctionUtils;
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.Pod;
@@ -314,12 +315,13 @@ private CompletableFuture<KubernetesService> createService(
  final Duration timeout = TimeUtils.parseDuration(
  flinkConfig.get(KubernetesConfigOptions.SERVICE_CREATE_TIMEOUT));
 
- return CompletableFuture.supplyAsync(() -> {
- final Service createdService = watcher.await(timeout.toMillis(), TimeUnit.MILLISECONDS);
- watchConnectionManager.close();
+ return CompletableFuture.supplyAsync(
+ FunctionUtils.uncheckedSupplier(() -> {
+ final Service createdService = watcher.await(timeout.toMillis(), TimeUnit.MILLISECONDS);
+ watchConnectionManager.close();
 
- return new KubernetesService(this.flinkConfig, createdService);
- });
+  return new KubernetesService(this.flinkConfig, createdService);
+  }));
  }
 
  private KubernetesService getService(String serviceName) {

diff --git a/...ernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/resources/ActionWatcher.java b/...ernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/resources/ActionWatcher.java
@@ -53,14 +53,10 @@ public void eventReceived(Action action, T resource) {
  public void onClose(KubernetesClientException e) {
  }
 
- public T await(long amount, TimeUnit timeUnit) {
- try {
- if (this.latch.await(amount, timeUnit)) {
- return this.reference.get();
- } else {
- throw new KubernetesClientTimeoutException(this.resource, amount, timeUnit);
- }
- } catch (InterruptedException var5) {
+ public T await(long amount, TimeUnit timeUnit) throws InterruptedException {
+ if (this.latch.await(amount, timeUnit)) {
+ return this.reference.get();
+ } else {
  throw new KubernetesClientTimeoutException(this.resource, amount, timeUnit);
  }
  }