Skip to content

YARN-11433. Router's main() should support generic options. #6012

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

Merged
goiri merged 5 commits into from
Sep 12, 2023
Merged

YARN-11433. Router's main() should support generic options. #6012

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bacb4df
YARN-11433. Router's main() should support generic options.
slfan1989 Aug 31, 2023
79eef2e
YARN-11433. Router's main() should support generic options.
slfan1989 Sep 5, 2023
636c01d
YARN-11433. Fix CheckStyle.
slfan1989 Sep 6, 2023
9c4e9ac
Merge branch 'trunk' into YARN-11433-V2
slfan1989 Sep 8, 2023
0ea47b1
YARN-11433. Fix CheckStyle.
slfan1989 Sep 11, 2023
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
5 changes: 4 additions & 1 deletion .../main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/GlobalPolicyGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.apache.hadoop.security.HttpCrossOriginFilterInitializer;
import org.apache.hadoop.security.SecurityUtil;
import org.apache.hadoop.service.CompositeService;
import org.apache.hadoop.util.GenericOptionsParser;
import org.apache.hadoop.util.JvmPauseMonitor;
import org.apache.hadoop.util.ShutdownHookManager;
import org.apache.hadoop.util.StringUtils;
Expand Down Expand Up @@ -290,7 +291,9 @@ private String getHostName(Configuration config)

public static void main(String[] argv) {
try {
startGPG(argv, new YarnConfiguration());
YarnConfiguration conf = new YarnConfiguration();
new GenericOptionsParser(conf, argv);
Copy link
Member

@goiri goiri Aug 31, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not familiar with this but this use looks not complete.
Most other places use the getRemainingArgs().

Copy link
Contributor Author

@slfan1989 slfan1989 Aug 31, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you very much for helping review the code! When I first saw YARN-11433, my thoughts were aligned with yours, and I also had concerns about whether such an implementation was necessary.

I noticed YARN-3255, where RM, NM, JobHistoryServer, and WebAppProxyServer's main() should support generic options. Other components in YARN, such as RM, NM, and JobHistoryServer, have implemented similar logic. I believe Router and GPG should be able to implement this logic as well.

hadoop/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java

Lines 1051 to 1058 in b6d06c8

public static void main(String[] args) throws IOException {
Thread.setDefaultUncaughtExceptionHandler(new YarnUncaughtExceptionHandler());
StringUtils.startupShutdownMessage(NodeManager.class, args, LOG);
@SuppressWarnings("resource")
NodeManager nodeManager = new NodeManager();
Configuration conf = new YarnConfiguration();
new GenericOptionsParser(conf, args);
nodeManager.initAndStartNodeManager(conf, false);

startGPG(argv, conf);
} catch (Throwable t) {
LOG.error("Error starting global policy generator", t);
System.exit(-1);
Expand Down
3 changes: 3 additions & 0 deletions .../hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/Router.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.apache.hadoop.security.HttpCrossOriginFilterInitializer;
import org.apache.hadoop.security.SecurityUtil;
import org.apache.hadoop.service.CompositeService;
import org.apache.hadoop.util.GenericOptionsParser;
import org.apache.hadoop.util.JvmPauseMonitor;
import org.apache.hadoop.util.ShutdownHookManager;
import org.apache.hadoop.util.StringUtils;
Expand Down Expand Up @@ -246,6 +247,8 @@ public static void main(String[] argv) {
Router router = new Router();
try {

new GenericOptionsParser(conf, argv);

// Remove the old hook if we are rebooting.
if (null != routerShutdownHook) {
ShutdownHookManager.get().removeShutdownHook(routerShutdownHook);
Expand Down