Skip to content

YARN-10014. Refactor boolean flag based approach in SchedConfCLI#run. #1746

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 3 commits into
base: trunk
Choose a base branch
from
+32 −49
Open

YARN-10014. Refactor boolean flag based approach in SchedConfCLI#run. #1746

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
19e1d49
YARN-10014. Refactor boolean flag based approach in SchedConfCLI#run.
Dec 9, 2019
c1d3ff5
Fix code style.
Dec 9, 2019
efeb1e7
Refactor with if-else-if
olegbonar Jan 2, 2020
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
81 changes: 32 additions & 49 deletions ...yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/SchedConfCLI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,60 +128,43 @@ public int run(String[] args) throws Exception {
if (parsedCli.hasOption(HELP_CMD)) {
printUsage();
return 0;
}

boolean hasOption = false;
boolean format = false;
boolean getConf = false;
SchedConfUpdateInfo updateInfo = new SchedConfUpdateInfo();
try {
if (parsedCli.hasOption(ADD_QUEUES_OPTION)) {
hasOption = true;
addQueues(parsedCli.getOptionValue(ADD_QUEUES_OPTION), updateInfo);
}
if (parsedCli.hasOption(REMOVE_QUEUES_OPTION)) {
hasOption = true;
removeQueues(parsedCli.getOptionValue(REMOVE_QUEUES_OPTION),
updateInfo);
}
if (parsedCli.hasOption(UPDATE_QUEUES_OPTION)) {
hasOption = true;
updateQueues(parsedCli.getOptionValue(UPDATE_QUEUES_OPTION),
updateInfo);
}
if (parsedCli.hasOption(GLOBAL_OPTIONS)) {
hasOption = true;
globalUpdates(parsedCli.getOptionValue(GLOBAL_OPTIONS), updateInfo);
}
if (parsedCli.hasOption((FORMAT_CONF))) {
hasOption = true;
format = true;
}
if (parsedCli.hasOption(GET_SCHEDULER_CONF)) {
hasOption = true;
getConf = true;
} else if (parsedCli.hasOption(FORMAT_CONF)) {
return WebAppUtils.execOnActiveRM(getConf(), this::formatSchedulerConf,
null);
} else if (parsedCli.hasOption(GET_SCHEDULER_CONF)) {
return WebAppUtils.execOnActiveRM(getConf(), this::getSchedulerConf,
null);
} else if (parsedCli.hasOption(ADD_QUEUES_OPTION)
|| parsedCli.hasOption(REMOVE_QUEUES_OPTION)
|| parsedCli.hasOption(UPDATE_QUEUES_OPTION)
|| parsedCli.hasOption(GLOBAL_OPTIONS)) {
SchedConfUpdateInfo updateInfo = new SchedConfUpdateInfo();
try {
if (parsedCli.hasOption(ADD_QUEUES_OPTION)) {
addQueues(parsedCli.getOptionValue(ADD_QUEUES_OPTION), updateInfo);
}
if (parsedCli.hasOption(REMOVE_QUEUES_OPTION)) {
removeQueues(parsedCli.getOptionValue(REMOVE_QUEUES_OPTION),
updateInfo);
}
if (parsedCli.hasOption(UPDATE_QUEUES_OPTION)) {
updateQueues(parsedCli.getOptionValue(UPDATE_QUEUES_OPTION),
updateInfo);
}
if (parsedCli.hasOption(GLOBAL_OPTIONS)) {
globalUpdates(parsedCli.getOptionValue(GLOBAL_OPTIONS), updateInfo);
}
return WebAppUtils.execOnActiveRM(getConf(),
this::updateSchedulerConfOnRMNode, updateInfo);
} catch (IllegalArgumentException e) {
System.err.println(e.getMessage());
return -1;
}

} catch (IllegalArgumentException e) {
System.err.println(e.getMessage());
return -1;
}

if (!hasOption) {
} else {
System.err.println("Invalid Command Usage: ");
printUsage();
return -1;
}

Configuration conf = getConf();
if (format) {
return WebAppUtils.execOnActiveRM(conf, this::formatSchedulerConf, null);
} else if (getConf) {
return WebAppUtils.execOnActiveRM(conf, this::getSchedulerConf, null);
} else {
return WebAppUtils.execOnActiveRM(conf,
this::updateSchedulerConfOnRMNode, updateInfo);
}
}

private static void prettyFormatWithIndent(String input, int indent)
Expand Down