big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-8221. RMWebServices also need to honor yarn.resourcemanager.display.per-user-apps. Contributed by Sunil G.

Browse Source
This commit is contained in:
Rohith Sharma K S 2018-04-27 22:58:10 +05:30
parent bff3d7b0cf
commit ef3ecc308d
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java
View File

@ -228,6 +228,7 @@ public class RMWebServices extends WebServices implements RMWebServiceProtocol {
@VisibleForTesting @VisibleForTesting
boolean isCentralizedNodeLabelConfiguration = true; boolean isCentralizedNodeLabelConfiguration = true;
private boolean displayPerUserApps = false;
public final static String DELEGATION_TOKEN_HEADER = public final static String DELEGATION_TOKEN_HEADER =
"Hadoop-YARN-RM-Delegation-Token"; "Hadoop-YARN-RM-Delegation-Token";
@ -240,6 +241,9 @@ public RMWebServices(final ResourceManager rm, Configuration conf) {
this.conf = conf; this.conf = conf;
isCentralizedNodeLabelConfiguration = isCentralizedNodeLabelConfiguration =
YarnConfiguration.isCentralizedNodeLabelConfiguration(conf); YarnConfiguration.isCentralizedNodeLabelConfiguration(conf);
this.displayPerUserApps = conf.getBoolean(
YarnConfiguration.DISPLAY_APPS_FOR_LOGGED_IN_USER,
YarnConfiguration.DEFAULT_DISPLAY_APPS_FOR_LOGGED_IN_USER);
} }
RMWebServices(ResourceManager rm, Configuration conf, RMWebServices(ResourceManager rm, Configuration conf,
@ -608,7 +612,14 @@ public AppsInfo getApps(@Context HttpServletRequest hsr,
DeSelectFields deSelectFields = new DeSelectFields(); DeSelectFields deSelectFields = new DeSelectFields();
deSelectFields.initFields(unselectedFields); deSelectFields.initFields(unselectedFields);
AppInfo app = new AppInfo(rm, rmapp, hasAccess(rmapp, hsr), boolean allowAccess = hasAccess(rmapp, hsr);
// Given RM is configured to display apps per user, skip apps to which
// this caller doesn't have access to view.
if (displayPerUserApps && !allowAccess) {
continue;
}
AppInfo app = new AppInfo(rm, rmapp, allowAccess,
WebAppUtils.getHttpSchemePrefix(conf), deSelectFields); WebAppUtils.getHttpSchemePrefix(conf), deSelectFields);
allApps.add(app); allApps.add(app);
} }