Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-4047. ClientRMService getApplications has high scheduler lock contention. Contributed by Jason Lowe

This commit is contained in:
Jian He 2015-08-13 16:02:57 -07:00
parent 38aed1a94e
commit 7a445fcfab
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -766,6 +766,9 @@ Release 2.8.0 - UNRELEASED
YARN-4005. Completed container whose app is finished is possibly not YARN-4005. Completed container whose app is finished is possibly not
removed from NMStateStore. (Jun Gong via jianhe) removed from NMStateStore. (Jun Gong via jianhe)
YARN-4047. ClientRMService getApplications has high scheduler lock contention.
(Jason Lowe via jianhe)
Release 2.7.2 - UNRELEASED Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

11
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java
View File

@ -752,13 +752,9 @@ public class ClientRMService extends AbstractService implements
RMApp application = appsIter.next(); RMApp application = appsIter.next();
// Check if current application falls under the specified scope // Check if current application falls under the specified scope
boolean allowAccess = checkAccess(callerUGI, application.getUser(),
ApplicationAccessType.VIEW_APP, application);
if (scope == ApplicationsRequestScope.OWN && if (scope == ApplicationsRequestScope.OWN &&
!callerUGI.getUserName().equals(application.getUser())) { !callerUGI.getUserName().equals(application.getUser())) {
continue; continue;
} else if (scope == ApplicationsRequestScope.VIEWABLE && !allowAccess) {
continue;
} }
if (applicationTypes != null && !applicationTypes.isEmpty()) { if (applicationTypes != null && !applicationTypes.isEmpty()) {
@ -807,6 +803,13 @@ public class ClientRMService extends AbstractService implements
} }
} }
// checkAccess can grab the scheduler lock so call it last
boolean allowAccess = checkAccess(callerUGI, application.getUser(),
ApplicationAccessType.VIEW_APP, application);
if (scope == ApplicationsRequestScope.VIEWABLE && !allowAccess) {
continue;
}
reports.add(application.createAndGetApplicationReport( reports.add(application.createAndGetApplicationReport(
callerUGI.getUserName(), allowAccess)); callerUGI.getUserName(), allowAccess));
} }