Repository: hadoop Updated Branches: refs/heads/trunk 84ecfe3ce -> 914d6b5cb
YARN-8208. Add log statement for Docker client configuration file at INFO level. Contributed by Yesha Vora Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/914d6b5c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/914d6b5c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/914d6b5c Branch: refs/heads/trunk Commit: 914d6b5cb143f4f9cadd9d689ea4e278383a6779 Parents: 84ecfe3 Author: Billie Rinaldi <bil...@apache.org> Authored: Fri Apr 27 06:10:32 2018 -0700 Committer: Billie Rinaldi <bil...@apache.org> Committed: Fri Apr 27 06:10:32 2018 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/yarn/service/utils/ServiceApiUtil.java | 1 + .../org/apache/hadoop/yarn/util/DockerClientConfigHandler.java | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/914d6b5c/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 ---------------------------------------------------------------------- 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 33919ba..a4e5c0d 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 @@ public class ServiceApiUtil { 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: " http://git-wip-us.apache.org/repos/asf/hadoop/blob/914d6b5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/DockerClientConfigHandler.java ---------------------------------------------------------------------- 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 98be93b..5522cf4 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 final class DockerClientConfigHandler { 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; --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
