diff --git a/myriad-scheduler/src/main/java/org/apache/myriad/configuration/MyriadConfiguration.java b/myriad-scheduler/src/main/java/org/apache/myriad/configuration/MyriadConfiguration.java index 67c82322..f0d2928c 100644 --- a/myriad-scheduler/src/main/java/org/apache/myriad/configuration/MyriadConfiguration.java +++ b/myriad-scheduler/src/main/java/org/apache/myriad/configuration/MyriadConfiguration.java @@ -156,6 +156,11 @@ public class MyriadConfiguration { @JsonProperty private String mesosAuthenticationSecretFilename; + @JsonProperty + private String yarnResourceManagerPortHTTPS; + + @JsonProperty + private String yarnResourceManagerPortHTTP; public MyriadConfiguration() { } @@ -252,4 +257,11 @@ public String getMesosAuthenticationPrincipal() { return mesosAuthenticationPrincipal; } + public String getYarnResourceManagerPortHTTPS() { + return yarnResourceManagerPortHTTPS; + } + + public String getYarnResourceManagerPortHTTP() { + return yarnResourceManagerPortHTTP; + } } diff --git a/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/NMExecutorCLGenImpl.java b/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/NMExecutorCLGenImpl.java index 19eda34b..9c49134b 100644 --- a/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/NMExecutorCLGenImpl.java +++ b/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/NMExecutorCLGenImpl.java @@ -164,13 +164,13 @@ public String getConfigurationUrl() { if (httpPolicy != null && httpPolicy.equals(TaskFactory.YARN_HTTP_POLICY_HTTPS_ONLY)) { String address = conf.get(TaskFactory.YARN_RESOURCEMANAGER_WEBAPP_HTTPS_ADDRESS); if (address == null || address.isEmpty()) { - address = conf.get(TaskFactory.YARN_RESOURCEMANAGER_HOSTNAME) + ":8090"; + address = conf.get(TaskFactory.YARN_RESOURCEMANAGER_HOSTNAME) + cfg.getYarnResourceManagerPortHTTPS(); } return "https://" + address + "/conf"; } else { String address = conf.get(TaskFactory.YARN_RESOURCEMANAGER_WEBAPP_ADDRESS); if (address == null || address.isEmpty()) { - address = conf.get(TaskFactory.YARN_RESOURCEMANAGER_HOSTNAME) + ":8088"; + address = conf.get(TaskFactory.YARN_RESOURCEMANAGER_HOSTNAME) + cfg.getYarnResourceManagerPortHTTP(); } return "http://" + address + "/conf"; } diff --git a/myriad-scheduler/src/main/resources/myriad-config-default.yml b/myriad-scheduler/src/main/resources/myriad-config-default.yml index ed4bef94..445a8e56 100644 --- a/myriad-scheduler/src/main/resources/myriad-config-default.yml +++ b/myriad-scheduler/src/main/resources/myriad-config-default.yml @@ -62,3 +62,5 @@ yarnEnvironment: #JAVA_HOME: /usr/lib/jvm/java-default #System dependent, but sometimes necessary mesosAuthenticationPrincipal: mesosAuthenticationSecretFilename: +yarnResourceManagerPortHTTPS: :8090 +yarnResourceManagerPortHTTP: :8088