Revert "YARN-3840. Resource Manager web ui issue when sorting application by id
(with application having id > 9999) Contributed by Mohammad Shahid Khan"
This reverts commit 8fbea531d7f7b665f6f55af54c8ebf330118ff37.
Conflicts:
hadoop-yarn-project/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fcd78880
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fcd78880
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fcd78880
Branch: refs/heads/HDFS-7240
Commit: fcd7888029a8e07cb0b22d1f47f9e7df82c4a304
Parents: 621cbb4
Author: Jian He <[email protected]>
Authored: Mon Nov 16 20:18:21 2015 -0800
Committer: Jian He <[email protected]>
Committed: Mon Nov 16 20:18:44 2015 -0800
----------------------------------------------------------------------
.../mapreduce/v2/app/webapp/TaskPage.java | 2 +-
.../mapreduce/v2/app/webapp/TasksPage.java | 2 +-
hadoop-yarn-project/CHANGES.txt | 3 --
.../hadoop/yarn/webapp/view/JQueryUI.java | 21 ++++----
.../dt-plugin-1.10.7/sorting/natural.js.gz | Bin 1448 -> 0 bytes
.../webapp/AppAttemptPage.java | 2 +-
.../webapp/AppPage.java | 2 +-
.../webapp/TestAHSWebApp.java | 50 +------------------
.../hadoop/yarn/server/webapp/WebPageUtils.java | 6 +--
.../nodemanager/webapp/AllApplicationsPage.java | 9 +---
.../nodemanager/webapp/AllContainersPage.java | 8 +--
.../resourcemanager/webapp/TestRMWebApp.java | 5 --
12 files changed, 22 insertions(+), 88 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fcd78880/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TaskPage.java
----------------------------------------------------------------------
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TaskPage.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TaskPage.java
index f8637e7..19b0d7c 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TaskPage.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TaskPage.java
@@ -221,7 +221,7 @@ public class TaskPage extends AppView {
.append("\n{'aTargets': [ 5 ]")
.append(", 'bSearchable': false }")
- .append("\n, {'sType':'natural', 'aTargets': [ 0 ]")
+ .append("\n, {'sType':'string', 'aTargets': [ 0 ]")
.append(", 'mRender': parseHadoopID }")
.append("\n, {'sType':'numeric', 'aTargets': [ 6, 7")
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fcd78880/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TasksPage.java
----------------------------------------------------------------------
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TasksPage.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TasksPage.java
index e2f12dc..9648527 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TasksPage.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TasksPage.java
@@ -43,7 +43,7 @@ public class TasksPage extends AppView {
.append(", bProcessing: true")
.append("\n, aoColumnDefs: [\n")
- .append("{'sType':'natural', 'aTargets': [0]")
+ .append("{'sType':'string', 'aTargets': [0]")
.append(", 'mRender': parseHadoopID }")
.append("\n, {'sType':'numeric', bSearchable:false, 'aTargets': [1]")
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fcd78880/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 747c729..9882074 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -1050,9 +1050,6 @@ Release 2.8.0 - UNRELEASED
YARN-4326. Fix TestDistributedShell timeout as AHS in MiniYarnCluster no
longer
binds to default port 8188. (Meng Ding via wangda)
- YARN-3840. Resource Manager web ui issue when sorting application by id
(with
- application having id > 9999) (Mohammad Shahid Khan via jianhe)
-
YARN-4345. yarn rmadmin -updateNodeResource doesn't work (Junping Du via
jlowe)
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fcd78880/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java
----------------------------------------------------------------------
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java
index 81786f4..9abfdac 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java
@@ -65,14 +65,14 @@ public class JQueryUI extends HtmlBlock {
@Override
protected void render(Block html) {
- html.link(root_url("static/jquery/themes-1.9.1/base/jquery-ui.css"))
- .link(root_url("static/dt-1.9.4/css/jui-dt.css"))
- .script(root_url("static/jquery/jquery-1.8.2.min.js"))
- .script(root_url("static/jquery/jquery-ui-1.9.1.custom.min.js"))
- .script(root_url("static/dt-1.9.4/js/jquery.dataTables.min.js"))
- .script(root_url("static/yarn.dt.plugins.js"))
- .script(root_url("static/dt-plugin-1.10.7/sorting/natural.js"))
- .style("#jsnotice { padding: 0.2em; text-align: center; }",
+ html.
+ link(root_url("static/jquery/themes-1.9.1/base/jquery-ui.css")).
+ link(root_url("static/dt-1.9.4/css/jui-dt.css")).
+ script(root_url("static/jquery/jquery-1.8.2.min.js")).
+ script(root_url("static/jquery/jquery-ui-1.9.1.custom.min.js")).
+ script(root_url("static/dt-1.9.4/js/jquery.dataTables.min.js")).
+ script(root_url("static/yarn.dt.plugins.js")).
+ style("#jsnotice { padding: 0.2em; text-align: center; }",
".ui-progressbar { height: 1em; min-width: 5em }"); // required
List<String> list = Lists.newArrayList();
@@ -82,8 +82,9 @@ public class JQueryUI extends HtmlBlock {
initProgressBars(list);
if (!list.isEmpty()) {
- html.script().$type("text/javascript")._("$(function() {")
- ._(list.toArray())._("});")._();
+ html.
+ script().$type("text/javascript").
+ _("$(function() {")._(list.toArray())._("});")._();
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fcd78880/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/dt-plugin-1.10.7/sorting/natural.js.gz
----------------------------------------------------------------------
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/dt-plugin-1.10.7/sorting/natural.js.gz
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/dt-plugin-1.10.7/sorting/natural.js.gz
deleted file mode 100644
index 8d781d6..0000000
Binary files
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/dt-plugin-1.10.7/sorting/natural.js.gz
and /dev/null differ
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fcd78880/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AppAttemptPage.java
----------------------------------------------------------------------
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AppAttemptPage.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AppAttemptPage.java
index a08297d..c7fe318 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AppAttemptPage.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AppAttemptPage.java
@@ -53,7 +53,7 @@ public class AppAttemptPage extends AHSView {
protected String getContainersTableColumnDefs() {
StringBuilder sb = new StringBuilder();
- return sb.append("[\n").append("{'sType':'natural', 'aTargets': [0]")
+ return sb.append("[\n").append("{'sType':'string', 'aTargets': [0]")
.append(", 'mRender': parseHadoopID }]").toString();
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fcd78880/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AppPage.java
----------------------------------------------------------------------
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AppPage.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AppPage.java
index c0e1394..50dcd96 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AppPage.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AppPage.java
@@ -55,7 +55,7 @@ public class AppPage extends AHSView {
protected String getAttemptsTableColumnDefs() {
StringBuilder sb = new StringBuilder();
- return sb.append("[\n").append("{'sType':'natural', 'aTargets': [0]")
+ return sb.append("[\n").append("{'sType':'string', 'aTargets': [0]")
.append(", 'mRender': parseHadoopID }")
.append("\n, {'sType':'numeric', 'aTargets': [1]")
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fcd78880/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebApp.java
----------------------------------------------------------------------
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebApp.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebApp.java
index 49fcc58..1e0886f 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebApp.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebApp.java
@@ -21,7 +21,7 @@ package
org.apache.hadoop.yarn.server.applicationhistoryservice.webapp;
import static org.apache.hadoop.yarn.webapp.Params.TITLE;
import static org.mockito.Mockito.mock;
-import java.util.Map;
+import org.junit.Assert;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.yarn.api.ApplicationBaseProtocol;
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
@@ -38,7 +38,6 @@ import
org.apache.hadoop.yarn.server.applicationhistoryservice.MemoryApplication
import org.apache.hadoop.yarn.util.StringHelper;
import org.apache.hadoop.yarn.webapp.YarnWebParams;
import org.apache.hadoop.yarn.webapp.test.WebAppTests;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -89,21 +88,6 @@ public class TestAHSWebApp extends
ApplicationHistoryStoreTestUtils {
}
@Test
- public void testAPPViewNaturalSortType() throws Exception {
- Injector injector =
- WebAppTests.createMockInjector(ApplicationBaseProtocol.class,
- mockApplicationHistoryClientService(5, 1, 1));
- AHSView ahsViewInstance = injector.getInstance(AHSView.class);
-
- ahsViewInstance.render();
- WebAppTests.flushOutput(injector);
- Map<String, String> moreParams =
- ahsViewInstance.context().requestContext().moreParams();
- String appTableColumnsMeta = moreParams.get("ui.dataTables.apps.init");
- Assert.assertTrue(appTableColumnsMeta.indexOf("natural") != -1);
- }
-
- @Test
public void testAboutPage() throws Exception {
Injector injector =
WebAppTests.createMockInjector(ApplicationBaseProtocol.class,
@@ -134,22 +118,6 @@ public class TestAHSWebApp extends
ApplicationHistoryStoreTestUtils {
}
@Test
- public void testAppPageNaturalSortType() throws Exception {
- Injector injector =
- WebAppTests.createMockInjector(ApplicationBaseProtocol.class,
- mockApplicationHistoryClientService(1, 5, 1));
- AppPage appPageInstance = injector.getInstance(AppPage.class);
-
- appPageInstance.render();
- WebAppTests.flushOutput(injector);
- Map<String, String> moreParams =
- appPageInstance.context().requestContext().moreParams();
- String attemptsTableColumnsMeta =
- moreParams.get("ui.dataTables.attempts.init");
- Assert.assertTrue(attemptsTableColumnsMeta.indexOf("natural") != -1);
- }
-
- @Test
public void testAppAttemptPage() throws Exception {
Injector injector =
WebAppTests.createMockInjector(ApplicationBaseProtocol.class,
@@ -168,21 +136,6 @@ public class TestAHSWebApp extends
ApplicationHistoryStoreTestUtils {
}
@Test
- public void testAppAttemptPageNaturalSortType() throws Exception {
- Injector injector =
- WebAppTests.createMockInjector(ApplicationBaseProtocol.class,
- mockApplicationHistoryClientService(1, 1, 5));
- AppAttemptPage appAttemptPageInstance =
- injector.getInstance(AppAttemptPage.class);
- appAttemptPageInstance.render();
- WebAppTests.flushOutput(injector);
- Map<String, String> moreParams =
- appAttemptPageInstance.context().requestContext().moreParams();
- String tableColumnsMeta = moreParams.get("ui.dataTables.containers.init");
- Assert.assertTrue(tableColumnsMeta.indexOf("natural") != -1);
- }
-
- @Test
public void testContainerPage() throws Exception {
Injector injector =
WebAppTests.createMockInjector(ApplicationBaseProtocol.class,
@@ -242,4 +195,5 @@ public class TestAHSWebApp extends
ApplicationHistoryStoreTestUtils {
return store;
}
};
+
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fcd78880/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
----------------------------------------------------------------------
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
index a07baa2..d51c632 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
@@ -49,7 +49,7 @@ public class WebPageUtils {
boolean isFairSchedulerPage, boolean isResourceManager) {
StringBuilder sb = new StringBuilder();
sb.append("[\n")
- .append("{'sType':'natural', 'aTargets': [0]")
+ .append("{'sType':'string', 'aTargets': [0]")
.append(", 'mRender': parseHadoopID }")
.append("\n, {'sType':'numeric', 'aTargets': [6, 7]")
.append(", 'mRender': renderHadoopDate }")
@@ -75,7 +75,7 @@ public class WebPageUtils {
private static String getAttemptsTableColumnDefs() {
StringBuilder sb = new StringBuilder();
- return sb.append("[\n").append("{'sType':'natural', 'aTargets': [0]")
+ return sb.append("[\n").append("{'sType':'string', 'aTargets': [0]")
.append(", 'mRender': parseHadoopID }")
.append("\n, {'sType':'numeric', 'aTargets': [1]")
.append(", 'mRender': renderHadoopDate }]").toString();
@@ -91,7 +91,7 @@ public class WebPageUtils {
private static String getContainersTableColumnDefs() {
StringBuilder sb = new StringBuilder();
- return sb.append("[\n").append("{'sType':'natural', 'aTargets': [0]")
+ return sb.append("[\n").append("{'sType':'string', 'aTargets': [0]")
.append(", 'mRender': parseHadoopID }]").toString();
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fcd78880/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/AllApplicationsPage.java
----------------------------------------------------------------------
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/AllApplicationsPage.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/AllApplicationsPage.java
index d32b271..9a22743 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/AllApplicationsPage.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/AllApplicationsPage.java
@@ -54,14 +54,7 @@ public class AllApplicationsPage extends NMView {
// Sort by id upon page load
append(", aaSorting: [[0, 'asc']]").
// applicationid, applicationstate
- append(", aoColumns:[").append(getApplicationsIdColumnDefs())
- .append(", null]} ").toString();
- }
-
- private String getApplicationsIdColumnDefs() {
- StringBuilder sb = new StringBuilder();
- return sb.append("{'sType':'natural', 'aTargets': [0]")
- .append(", 'mRender': parseHadoopID }").toString();
+ append(", aoColumns:[null, null]} ").toString();
}
@Override
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fcd78880/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/AllContainersPage.java
----------------------------------------------------------------------
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/AllContainersPage.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/AllContainersPage.java
index 24b8575..1bbb945 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/AllContainersPage.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/AllContainersPage.java
@@ -52,15 +52,9 @@ public class AllContainersPage extends NMView {
private String containersTableInit() {
return tableInit().
// containerid, containerid, log-url
- append(", aoColumns:[").append(getContainersIdColumnDefs())
- .append(", null, {bSearchable:false}]} ").toString();
+ append(", aoColumns:[null, null, {bSearchable:false}]} ").toString();
}
- private String getContainersIdColumnDefs() {
- StringBuilder sb = new StringBuilder();
- return sb.append("{'sType':'natural', 'aTargets': [0]")
- .append(", 'mRender': parseHadoopID }").toString();
- }
@Override
protected Class<? extends SubView> content() {
return AllContainersBlock.class;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fcd78880/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebApp.java
----------------------------------------------------------------------
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebApp.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebApp.java
index edf3b3f..0290421 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebApp.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebApp.java
@@ -28,7 +28,6 @@ import static org.mockito.Mockito.when;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
import java.util.concurrent.ConcurrentMap;
import org.apache.hadoop.conf.Configuration;
@@ -120,10 +119,6 @@ public class TestRMWebApp {
YarnApplicationState.RUNNING.toString()));
rmViewInstance.render();
WebAppTests.flushOutput(injector);
- Map<String, String> moreParams =
- rmViewInstance.context().requestContext().moreParams();
- String appsTableColumnsMeta = moreParams.get("ui.dataTables.apps.init");
- Assert.assertTrue(appsTableColumnsMeta.indexOf("natural") != -1);
}
@Test public void testNodesPage() {
