Browse Source

merge -r 1348125:1348126 from branch-2. FIXES: MAPREDUCE-3842

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1348129 13f79535-47bb-0310-9956-ffa450edef68
Thomas Graves 13 years ago
parent
commit
4b15e80a10

+ 2 - 0
hadoop-mapreduce-project/CHANGES.txt

@@ -226,6 +226,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

+ 0 - 3
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/CountersPage.java

@@ -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()) {

+ 0 - 3
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobPage.java

@@ -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}");
   }
 

+ 0 - 4
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TaskPage.java

@@ -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());

+ 0 - 3
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/ApplicationPage.java

@@ -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");

+ 0 - 3
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/ContainerPage.java

@@ -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}");
   }

+ 0 - 3
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NodePage.java

@@ -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}");
   }
 

+ 0 - 2
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppPage.java

@@ -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() {