Skip to content

YARN-11837. RM UI2 cannot show logs for non-MapReduce jobs with MR ACLs enabled. #7824

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
merged 2 commits into from
Jul 25, 2025
Merged

YARN-11837. RM UI2 cannot show logs for non-MapReduce jobs with MR ACLs enabled. #7824

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7b4555
YARN-11837: RM UI2 cannot show logs for non-MapReduce jobs with MR AC…
susheelgupta7 Jul 23, 2025
29d31c6
log nit
susheelgupta7 Jul 24, 2025
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
21 changes: 19 additions & 2 deletions ...educe-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsWebServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,14 @@
import org.apache.hadoop.yarn.webapp.NotFoundException;
import org.apache.hadoop.yarn.webapp.WebApp;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.VisibleForTesting;

@Singleton
@Path("/ws/v1/history")
public class HsWebServices extends WebServices {
private static final Logger LOG = LoggerFactory.getLogger(HsWebServices.class);
private final HistoryContext ctx;
private WebApp webapp;
private LogServlet logServlet;
Expand Down Expand Up @@ -127,8 +130,22 @@ private void checkAccess(Job job, HttpServletRequest request) {
}
}
private void checkAccess(String containerIdStr, HttpServletRequest hsr) {
if (mrAclsEnabled) {
checkAccess(AMWebServices.getJobFromContainerIdString(containerIdStr, ctx), hsr);
// Apply MR ACLs only if the container belongs to a MapReduce job.
// For non-MapReduce jobs, no corresponding Job will be found,
// so ACLs are not enforced.
if (mrAclsEnabled && isMRJobContainer(containerIdStr)) {
Job job = AMWebServices.getJobFromContainerIdString(containerIdStr, ctx);
checkAccess(job, hsr);
}
}

private boolean isMRJobContainer(String containerIdStr) {
try {
AMWebServices.getJobFromContainerIdString(containerIdStr, ctx);
return true;
} catch (NotFoundException e) {
LOG.trace("Container {} does not belong to a MapReduce job", containerIdStr);
return false;
}
}

Expand Down