YARN-6992. Kill application button is visible even if the application is FINISHED in RM UI. Contributed by Suma Shivaprasad.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6f101e7d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6f101e7d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6f101e7d Branch: refs/heads/YARN-5972 Commit: 6f101e7df10d477cf7469f6979d0cb8269315a3e Parents: b6e7d13 Author: Sunil G <[email protected]> Authored: Thu Sep 7 13:16:20 2017 +0530 Committer: Sunil G <[email protected]> Committed: Thu Sep 7 13:16:20 2017 +0530 ---------------------------------------------------------------------- .../java/org/apache/hadoop/yarn/server/webapp/AppBlock.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6f101e7d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java index 693aa04..95bc0aa 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java @@ -144,7 +144,8 @@ public class AppBlock extends HtmlBlock { && webUiType.equals(YarnWebParams.RM_WEB_UI) && conf.getBoolean(YarnConfiguration.RM_WEBAPP_UI_ACTIONS_ENABLED, YarnConfiguration.DEFAULT_RM_WEBAPP_UI_ACTIONS_ENABLED) - && !unsecuredUIForSecuredCluster) { + && !unsecuredUIForSecuredCluster + && !isAppInFinalState(app)) { // Application Kill html.div() .button() @@ -419,4 +420,10 @@ public class AppBlock extends HtmlBlock { } return ret; } + + private boolean isAppInFinalState(AppInfo app) { + return app.getAppState() == YarnApplicationState.FINISHED + || app.getAppState() == YarnApplicationState.FAILED + || app.getAppState() == YarnApplicationState.KILLED; + } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
