MAPREDUCE-7097. MapReduce JHS should honor yarn.webapp.filter-entity-list-by-user. Contributed by Sunil Govindan.
This commit is contained in:
parent
d14e26b31f
commit
88cbe57c06
|
@ -27,6 +27,8 @@ import static org.apache.hadoop.yarn.webapp.view.JQueryUI._TH;
|
|||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import org.apache.hadoop.conf.Configuration;
|
||||
import org.apache.hadoop.mapreduce.JobACL;
|
||||
import org.apache.hadoop.mapreduce.TaskID;
|
||||
import org.apache.hadoop.mapreduce.v2.api.records.AMInfo;
|
||||
import org.apache.hadoop.mapreduce.v2.api.records.JobId;
|
||||
|
@ -39,8 +41,10 @@ import org.apache.hadoop.mapreduce.v2.hs.webapp.dao.JobInfo;
|
|||
import org.apache.hadoop.mapreduce.v2.jobhistory.JHAdminConfig;
|
||||
import org.apache.hadoop.mapreduce.v2.util.MRApps;
|
||||
import org.apache.hadoop.mapreduce.v2.util.MRApps.TaskAttemptStateUI;
|
||||
import org.apache.hadoop.security.UserGroupInformation;
|
||||
import org.apache.hadoop.mapreduce.v2.util.MRWebAppUtil;
|
||||
import org.apache.hadoop.util.StringUtils;
|
||||
import org.apache.hadoop.yarn.conf.YarnConfiguration;
|
||||
import org.apache.hadoop.yarn.util.Times;
|
||||
import org.apache.hadoop.yarn.webapp.ResponseInfo;
|
||||
import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet;
|
||||
|
@ -56,9 +60,14 @@ import com.google.inject.Inject;
|
|||
*/
|
||||
public class HsJobBlock extends HtmlBlock {
|
||||
final AppContext appContext;
|
||||
private UserGroupInformation ugi;
|
||||
private boolean isFilterAppListByUserEnabled;
|
||||
|
||||
@Inject HsJobBlock(AppContext appctx) {
|
||||
@Inject HsJobBlock(Configuration conf, AppContext appctx, ViewContext ctx) {
|
||||
super(ctx);
|
||||
appContext = appctx;
|
||||
isFilterAppListByUserEnabled = conf
|
||||
.getBoolean(YarnConfiguration.FILTER_ENTITY_LIST_BY_USER, false);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -78,6 +87,13 @@ public class HsJobBlock extends HtmlBlock {
|
|||
html.p().__("Sorry, ", jid, " not found.").__();
|
||||
return;
|
||||
}
|
||||
ugi = getCallerUGI();
|
||||
if (isFilterAppListByUserEnabled && ugi != null
|
||||
&& !j.checkAccess(ugi, JobACL.VIEW_JOB)) {
|
||||
html.p().__("Sorry, ", jid, " could not be viewed for '",
|
||||
ugi.getUserName(), "'.").__();
|
||||
return;
|
||||
}
|
||||
if(j instanceof UnparsedJob) {
|
||||
final int taskCount = j.getTotalMaps() + j.getTotalReduces();
|
||||
UnparsedJob oversizedJob = (UnparsedJob) j;
|
||||
|
|
|
@ -33,8 +33,10 @@ import org.apache.hadoop.mapreduce.v2.hs.UnparsedJob;
|
|||
import org.apache.hadoop.mapreduce.v2.jobhistory.JHAdminConfig;
|
||||
import org.apache.hadoop.yarn.api.records.ApplicationId;
|
||||
import org.apache.hadoop.yarn.util.StringHelper;
|
||||
import org.apache.hadoop.yarn.webapp.Controller;
|
||||
import org.apache.hadoop.yarn.webapp.ResponseInfo;
|
||||
import org.apache.hadoop.yarn.webapp.SubView;
|
||||
import org.apache.hadoop.yarn.webapp.View.ViewContext;
|
||||
import org.apache.hadoop.yarn.webapp.view.BlockForTest;
|
||||
import org.apache.hadoop.yarn.webapp.view.HtmlBlock;
|
||||
import org.apache.hadoop.yarn.webapp.view.HtmlBlockForTest;
|
||||
|
@ -49,6 +51,8 @@ import java.util.ArrayList;
|
|||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import static org.mockito.Matchers.any;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
@ -69,7 +73,13 @@ public class TestHsJobBlock {
|
|||
new JobHistoryStubWithAllOversizeJobs(maxAllowedTaskNum);
|
||||
jobHistory.init(config);
|
||||
|
||||
HsJobBlock jobBlock = new HsJobBlock(jobHistory) {
|
||||
Controller.RequestContext rc = mock(Controller.RequestContext.class);
|
||||
ViewContext view = mock(ViewContext.class);
|
||||
HttpServletRequest req =mock(HttpServletRequest.class);
|
||||
when(rc.getRequest()).thenReturn(req);
|
||||
when(view.requestContext()).thenReturn(rc);
|
||||
|
||||
HsJobBlock jobBlock = new HsJobBlock(config, jobHistory, view) {
|
||||
// override this so that job block can fetch a job id.
|
||||
@Override
|
||||
public Map<String, String> moreParams() {
|
||||
|
@ -101,7 +111,13 @@ public class TestHsJobBlock {
|
|||
JobHistory jobHistory = new JobHitoryStubWithAllNormalSizeJobs();
|
||||
jobHistory.init(config);
|
||||
|
||||
HsJobBlock jobBlock = new HsJobBlock(jobHistory) {
|
||||
Controller.RequestContext rc = mock(Controller.RequestContext.class);
|
||||
ViewContext view = mock(ViewContext.class);
|
||||
HttpServletRequest req =mock(HttpServletRequest.class);
|
||||
when(rc.getRequest()).thenReturn(req);
|
||||
when(view.requestContext()).thenReturn(rc);
|
||||
|
||||
HsJobBlock jobBlock = new HsJobBlock(config, jobHistory, view) {
|
||||
// override this so that the job block can fetch a job id.
|
||||
@Override
|
||||
public Map<String, String> moreParams() {
|
||||
|
|
|
@ -108,6 +108,10 @@ public abstract class Controller implements Params {
|
|||
}
|
||||
|
||||
public String prefix() { return prefix; }
|
||||
|
||||
public HttpServletRequest getRequest() {
|
||||
return request;
|
||||
}
|
||||
}
|
||||
|
||||
private RequestContext context;
|
||||
|
|
|
@ -96,28 +96,36 @@ public abstract class View implements Params {
|
|||
return vc;
|
||||
}
|
||||
|
||||
public Throwable error() { return context().rc.error; }
|
||||
public Throwable error() {
|
||||
return context().requestContext().error;
|
||||
}
|
||||
|
||||
public int status() { return context().rc.status; }
|
||||
public int status() {
|
||||
return context().requestContext().status;
|
||||
}
|
||||
|
||||
public boolean inDevMode() { return context().rc.devMode; }
|
||||
public boolean inDevMode() {
|
||||
return context().requestContext().devMode;
|
||||
}
|
||||
|
||||
public Injector injector() { return context().rc.injector; }
|
||||
public Injector injector() {
|
||||
return context().requestContext().injector;
|
||||
}
|
||||
|
||||
public <T> T getInstance(Class<T> cls) {
|
||||
return injector().getInstance(cls);
|
||||
}
|
||||
|
||||
public HttpServletRequest request() {
|
||||
return context().rc.request;
|
||||
return context().requestContext().getRequest();
|
||||
}
|
||||
|
||||
public HttpServletResponse response() {
|
||||
return context().rc.response;
|
||||
return context().requestContext().response;
|
||||
}
|
||||
|
||||
public Map<String, String> moreParams() {
|
||||
return context().rc.moreParams();
|
||||
return context().requestContext().moreParams();
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -125,7 +133,7 @@ public abstract class View implements Params {
|
|||
* @return the cookies map
|
||||
*/
|
||||
public Map<String, Cookie> cookies() {
|
||||
return context().rc.cookies();
|
||||
return context().requestContext().cookies();
|
||||
}
|
||||
|
||||
public ServletOutputStream outputStream() {
|
||||
|
|
Loading…
Reference in New Issue