YARN-7940. Fixed a bug in ServiceAM ZooKeeper initialization.

(Contributed by Billie Rinaldi)
This commit is contained in:
Eric Yang 2018-02-20 14:12:58 -05:00
parent 8896d20b91
commit 7280c5af82
2 changed files with 5 additions and 0 deletions

View File

@ -288,6 +288,9 @@ private CuratorFramework createCurator() throws IOException {
registrySecurity.applySecurityEnvironment(builder); registrySecurity.applySecurityEnvironment(builder);
//log them //log them
securityConnectionDiagnostics = buildSecurityDiagnostics(); securityConnectionDiagnostics = buildSecurityDiagnostics();
if (LOG.isDebugEnabled()) {
LOG.debug(securityConnectionDiagnostics);
}
framework = builder.build(); framework = builder.build();
framework.start(); framework.start();
} }

View File

@ -762,6 +762,8 @@ public void applySecurityEnvironment(CuratorFrameworkFactory.Builder builder) {
LOG.info( LOG.info(
"Enabling ZK sasl client: jaasClientEntry = " + jaasClientEntry "Enabling ZK sasl client: jaasClientEntry = " + jaasClientEntry
+ ", principal = " + principal + ", keytab = " + keytab); + ", principal = " + principal + ", keytab = " + keytab);
break;
default: default:
clearZKSaslClientProperties(); clearZKSaslClientProperties();
break; break;