Unverified Commit e3de2731 authored by xiaoguaiguai's avatar xiaoguaiguai Committed by GitHub

Merge branch 'DataLinkDC:dev' into dev

parents 52138899 a6d8bbff
...@@ -54,6 +54,8 @@ import com.dlink.utils.LogUtil; ...@@ -54,6 +54,8 @@ import com.dlink.utils.LogUtil;
**/ **/
public abstract class YarnGateway extends AbstractGateway { public abstract class YarnGateway extends AbstractGateway {
public static final String HADOOP_CONFIG = "fs.hdfs.hadoopconf";
protected YarnConfiguration yarnConfiguration; protected YarnConfiguration yarnConfiguration;
protected YarnClient yarnClient; protected YarnClient yarnClient;
...@@ -83,6 +85,10 @@ public abstract class YarnGateway extends AbstractGateway { ...@@ -83,6 +85,10 @@ public abstract class YarnGateway extends AbstractGateway {
configuration.set(YarnConfigOptions.APPLICATION_NAME, config.getFlinkConfig().getJobName()); configuration.set(YarnConfigOptions.APPLICATION_NAME, config.getFlinkConfig().getJobName());
} }
if (Asserts.isNotNullString(config.getClusterConfig().getYarnConfigPath())) {
configuration.setString(HADOOP_CONFIG, config.getClusterConfig().getYarnConfigPath());
}
if (configuration.containsKey(SecurityOptions.KERBEROS_LOGIN_KEYTAB.key())) { if (configuration.containsKey(SecurityOptions.KERBEROS_LOGIN_KEYTAB.key())) {
try { try {
SecurityUtils.install(new SecurityConfiguration(configuration)); SecurityUtils.install(new SecurityConfiguration(configuration));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment