This is an automated email from the ASF dual-hosted git repository. hexiaoqiao pushed a commit to branch branch-3.2.2 in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit afbdf5c079f1d468c73423de8def8ffcf0282480 Author: Ahmed Hussein <[email protected]> AuthorDate: Mon Nov 16 14:55:40 2020 -0600 YARN-10485. TimelineConnector swallows InterruptedException (#2450). Contributed by Ahmed Hussein (cherry picked from commit 0b2510ee1fb2c92d3b7d2b2183e532b7637d93b9) --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml | 1 - .../org/apache/hadoop/yarn/client/api/impl/TimelineConnector.java | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml index 89446c6..261943c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml @@ -45,7 +45,6 @@ <artifactId>hadoop-hdfs-client</artifactId> </dependency> - <!-- 'mvn dependency:analyze' fails to detect use of this dependency --> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineConnector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineConnector.java index 9d084d7..2b43b6c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineConnector.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineConnector.java @@ -19,6 +19,7 @@ package org.apache.hadoop.yarn.client.api.impl; import java.io.IOException; +import java.io.InterruptedIOException; import java.lang.reflect.UndeclaredThrowableException; import java.net.ConnectException; import java.net.HttpURLConnection; @@ -351,7 +352,8 @@ public class TimelineConnector extends AbstractService { // sleep for the given time interval Thread.sleep(retryInterval); } catch (InterruptedException ie) { - LOG.warn("Client retry sleep interrupted! "); + Thread.currentThread().interrupt(); + throw new InterruptedIOException("Client retry sleep interrupted!"); } } throw new RuntimeException("Failed to connect to timeline server. " --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
