From b20f68ddaa4c50741fd3a5a1261d254d280b53eb Mon Sep 17 00:00:00 2001 From: Billie Rinaldi Date: Fri, 27 Apr 2018 06:10:32 -0700 Subject: [PATCH] YARN-8208. Add log statement for Docker client configuration file at INFO level. Contributed by Yesha Vora (cherry picked from commit 914d6b5cb143f4f9cadd9d689ea4e278383a6779) --- .../apache/hadoop/yarn/service/utils/ServiceApiUtil.java | 1 + .../apache/hadoop/yarn/util/DockerClientConfigHandler.java | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ServiceApiUtil.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ServiceApiUtil.java index 33919baf91b..a4e5c0d7d16 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ServiceApiUtil.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ServiceApiUtil.java @@ -232,6 +232,7 @@ private static void validateDockerClientConfiguration(Service service, if (!StringUtils.isEmpty(dockerClientConfig)) { Path dockerClientConfigPath = new Path(dockerClientConfig); FileSystem fs = dockerClientConfigPath.getFileSystem(conf); + LOG.info("The supplied Docker client config is " + dockerClientConfig); if (!fs.exists(dockerClientConfigPath)) { throw new IOException( "The supplied Docker client config does not exist: " diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/DockerClientConfigHandler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/DockerClientConfigHandler.java index 98be93b4470..5522cf4f6f2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/DockerClientConfigHandler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/DockerClientConfigHandler.java @@ -118,10 +118,8 @@ public static Credentials readCredentialsFromConfigFile(Path configFile, tokenId.getKind(), new Text(registryUrl)); credentials.addToken( new Text(registryUrl + "-" + applicationId), token); - if (LOG.isDebugEnabled()) { - LOG.debug("Token read from Docker client configuration file: " - + token.toString()); - } + LOG.info("Token read from Docker client configuration file: " + + token.toString()); } } return credentials;