This is an automated email from the ASF dual-hosted git repository.
prabhujoseph pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 9224568 YARN-10156. Destroy Jersey Client in TimelineConnector.
9224568 is described below
commit 9224568b0ea9c97071d45e1c26241c64efdd2926
Author: Prabhu Joseph <[email protected]>
AuthorDate: Wed Apr 15 19:54:30 2020 +0530
YARN-10156. Destroy Jersey Client in TimelineConnector.
Contributed by Tanu Ajmera.
---
.../hadoop/yarn/client/api/impl/TimelineConnector.java | 5 ++++-
.../hadoop/yarn/client/api/impl/TestTimelineClient.java | 13 +++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
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 ca0f307..2e87861 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
@@ -78,7 +78,7 @@ public class TimelineConnector extends AbstractService {
public final static int DEFAULT_SOCKET_TIMEOUT = 1 * 60 * 1000; // 1 minute
private SSLFactory sslFactory;
- private Client client;
+ Client client;
private ConnectionConfigurator connConfigurator;
private DelegationTokenAuthenticator authenticator;
private DelegationTokenAuthenticatedURL.Token token;
@@ -200,6 +200,9 @@ public class TimelineConnector extends AbstractService {
}
protected void serviceStop() {
+ if (this.client != null) {
+ this.client.destroy();
+ }
if (this.sslFactory != null) {
this.sslFactory.destroy();
}
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestTimelineClient.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestTimelineClient.java
index 6c2efb3..d95ee77 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestTimelineClient.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestTimelineClient.java
@@ -24,6 +24,8 @@ import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.times;
import java.io.IOException;
import java.net.ConnectException;
@@ -492,6 +494,17 @@ public class TestTimelineClient {
Assert.assertFalse("Reloader is still alive", reloaderStillAlive);
}
+ @Test
+ public void testTimelineConnectorDestroy() {
+ YarnConfiguration conf = new YarnConfiguration();
+ conf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, true);
+ TimelineClientImpl client = createTimelineClient(conf);
+ Client mockJerseyClient = mock(Client.class);
+ client.connector.client = mockJerseyClient;
+ client.stop();
+ verify(mockJerseyClient, times(1)).destroy();
+ }
+
private void setupSSLConfig(YarnConfiguration conf) throws Exception {
keystoresDir = TestGenericTestUtils.getTestDir().getAbsolutePath();
sslConfDir =
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
