Skip to content

MYRIAD-247 Fail to fetch yarnConfiguration from Resourcemanager #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

MYRIAD-247 Fail to fetch yarnConfiguration from Resourcemanager #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions myriad-scheduler/src/main/java/org/apache/myriad/scheduler/ExecutorCommandLineGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ protected void appendDistroExtractionCommands(StringBuilder cmdLine) {
//config file to yarnConfiguration, It's an xml file with the parameters of yarn-site.xml, core-site.xml and hdfs.xml.
if (!myriadExecutorConfiguration.getConfigUri().isPresent()) {
appendSudo(cmdLine);
cmdLine.append(" cp yarnConfiguration ");
cmdLine.append(" cp conf ");
cmdLine.append(myriadConfiguration.getYarnEnvironment().get("YARN_HOME"));
cmdLine.append("/etc/hadoop/yarn-site.xml && ");
}
Expand Down Expand Up @@ -111,13 +111,13 @@ public String getConfigurationUrl() {
if (StringUtils.isEmpty(address)) {
address = yarnConfiguration.get(TaskFactory.YARN_RESOURCEMANAGER_HOSTNAME) + ":8090";
}
return "https://" + address + "/yarnConfiguration";
return "https://" + address + "/conf";
} else {
address = yarnConfiguration.get(TaskFactory.YARN_RESOURCEMANAGER_WEBAPP_ADDRESS);
if (StringUtils.isEmpty(address)) {
address = yarnConfiguration.get(TaskFactory.YARN_RESOURCEMANAGER_HOSTNAME) + ":8088";
}
return "http://" + address + "/yarnConfiguration";
return "http://" + address + "/conf";
}
}

Expand Down
4 changes: 2 additions & 2 deletions myriad-scheduler/src/test/java/org/apache/myriad/scheduler/TestServiceCommandLine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ public class TestServiceCommandLine extends BaseConfigurableTest {
+ System.lineSeparator() + "%s";
protected static final String CMD_FORMAT = "echo \"%1$s\" && %1$s";
static String toJHSCompare =
" sudo tar -zxpf hadoop-2.7.0.tar.gz && sudo cp yarnConfiguration /usr/local/hadoop/etc/hadoop/yarn-site.xml && " +
" sudo tar -zxpf hadoop-2.7.0.tar.gz && sudo cp conf /usr/local/hadoop/etc/hadoop/yarn-site.xml && " +
"sudo -E -u hduser -H bin/mapred historyserver";
static String toCompare =
" sudo tar -zxpf hadoop-2.7.0.tar.gz && sudo cp yarnConfiguration /usr/local/hadoop/etc/hadoop/yarn-site.xml && " +
" sudo tar -zxpf hadoop-2.7.0.tar.gz && sudo cp conf /usr/local/hadoop/etc/hadoop/yarn-site.xml && " +
"sudo -E -u hduser -H $YARN_HOME/bin/yarn nodemanager";

@Test
Expand Down