Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-8208. Add log statement for Docker client configuration file at INFO level. Contributed by Yesha Vora 

(cherry picked from commit 914d6b5cb1)
This commit is contained in:
Billie Rinaldi 2018-04-27 06:10:32 -07:00
parent 386c39cd84
commit b20f68ddaa
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
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
View File

@ -232,6 +232,7 @@ public class ServiceApiUtil {
if (!StringUtils.isEmpty(dockerClientConfig)) { if (!StringUtils.isEmpty(dockerClientConfig)) {
Path dockerClientConfigPath = new Path(dockerClientConfig); Path dockerClientConfigPath = new Path(dockerClientConfig);
FileSystem fs = dockerClientConfigPath.getFileSystem(conf); FileSystem fs = dockerClientConfigPath.getFileSystem(conf);
LOG.info("The supplied Docker client config is " + dockerClientConfig);
if (!fs.exists(dockerClientConfigPath)) { if (!fs.exists(dockerClientConfigPath)) {
throw new IOException( throw new IOException(
"The supplied Docker client config does not exist: " "The supplied Docker client config does not exist: "

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/DockerClientConfigHandler.java
View File

@ -118,12 +118,10 @@ public final class DockerClientConfigHandler {
tokenId.getKind(), new Text(registryUrl)); tokenId.getKind(), new Text(registryUrl));
credentials.addToken( credentials.addToken(
new Text(registryUrl + "-" + applicationId), token); new Text(registryUrl + "-" + applicationId), token);
if (LOG.isDebugEnabled()) { LOG.info("Token read from Docker client configuration file: "
LOG.debug("Token read from Docker client configuration file: "
+ token.toString()); + token.toString());
} }
} }
}
return credentials; return credentials;
} }