merge -r 1348122:1348123 from trunk. FIXES: MAPREDUCE-3842

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348126 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas Graves 2012-06-08 15:51:21 +00:00
parent 4757836b75
commit d1607ba557
8 changed files with 2 additions and 21 deletions

View File

@ -452,6 +452,8 @@ Release 0.23.3 - UNRELEASED
MAPREDUCE-3350. Per-app RM page should have the list of application-attempts
like on the app JHS page (Jonathon Eagles via tgraves)
MAPREDUCE-3842. Stop webpages from automatic refreshing (tgraves)
Release 0.23.2 - UNRELEASED
INCOMPATIBLE CHANGES

View File

@ -28,9 +28,6 @@ public class CountersPage extends AppView {
@Override protected void preHead(Page.HTML<_> html) {
commonPreHead(html);
// Counters page is a summary. Helps to refresh automatically.
html.meta_http("refresh", "10");
String tid = $(TASK_ID);
String activeNav = "3";
if(tid == null || tid.isEmpty()) {

View File

@ -33,9 +33,6 @@ public class JobPage extends AppView {
: join("MapReduce Job ", $(JOB_ID)));
commonPreHead(html);
// This is a job-summary page. Helps to refresh automatically.
html.meta_http("refresh", "10");
set(initID(ACCORDION, "nav"), "{autoHeight:false, active:2}");
}

View File

@ -126,10 +126,6 @@ public class TaskPage extends AppView {
@Override protected void preHead(Page.HTML<_> html) {
commonPreHead(html);
// This page is a list of all attempts which are limited in number. Okay to
// refresh automatically.
html.meta_http("refresh", "10");
set(initID(ACCORDION, "nav"), "{autoHeight:false, active:3}");
set(DATATABLES_ID, "attempts");
set(initID(DATATABLES, "attempts"), attemptsTableInit());

View File

@ -45,9 +45,6 @@ public class ApplicationPage extends NMView implements YarnWebParams {
@Override protected void preHead(Page.HTML<_> html) {
commonPreHead(html);
// Per-app information. Helps to refresh automatically.
html.meta_http("refresh", "10");
set(DATATABLES_ID, "containers");
set(initID(DATATABLES, "containers"), containersTableInit());
setTableStyles(html, "containers");

View File

@ -41,9 +41,6 @@ public class ContainerPage extends NMView implements YarnWebParams {
protected void preHead(Page.HTML<_> html) {
commonPreHead(html);
// Per-container information. Helps to refresh automatically.
html.meta_http("refresh", "10");
setTitle("Container " + $(CONTAINER_ID));
set(initID(ACCORDION, "nav"), "{autoHeight:false, active:0}");
}

View File

@ -42,9 +42,6 @@ public class NodePage extends NMView {
protected void commonPreHead(HTML<_> html) {
super.commonPreHead(html);
// Node summary page. Helps to refresh automatically.
html.meta_http("refresh", "10");
set(initID(ACCORDION, "nav"), "{autoHeight:false, active:0}");
}

View File

@ -24,8 +24,6 @@ public class AppPage extends RmView {
@Override protected void preHead(Page.HTML<_> html) {
commonPreHead(html);
// App page is per-app information. Helps to refresh automatically.
html.meta_http("refresh", "10");
}
@Override protected Class<? extends SubView> content() {