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 f8637e7043..19b0d7cfdf 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 @@ private String attemptsTableInit() { .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") 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 e2f12dc4d1..96485279db 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 @@ private String tasksTableInit() { .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]") diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 747c729012..98820743f9 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) 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 81786f4c53..9abfdac7e0 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 list = Lists.newArrayList(); @@ -82,8 +82,9 @@ protected void render(Block html) { initProgressBars(list); if (!list.isEmpty()) { - html.script().$type("text/javascript")._("$(function() {") - ._(list.toArray())._("});")._(); + html. + script().$type("text/javascript"). + _("$(function() {")._(list.toArray())._("});")._(); } } 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 8d781d6c65..0000000000 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 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 a08297db9a..c7fe318955 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 @@ protected Class content() { 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(); } 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 c0e1394ae6..50dcd9665e 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 @@ protected Class content() { 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]") 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 49fcc58b2a..1e0886f36c 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 @@ 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.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; @@ -88,21 +87,6 @@ public void testView() throws Exception { WebAppTests.flushOutput(injector); } - @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 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 = @@ -133,22 +117,6 @@ public void testAppPage() throws Exception { WebAppTests.flushOutput(injector); } - @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 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 = @@ -167,21 +135,6 @@ public void testAppAttemptPage() throws Exception { WebAppTests.flushOutput(injector); } - @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 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 = @@ -242,4 +195,5 @@ protected ApplicationHistoryStore createApplicationHistoryStore( return store; } }; + } 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 a07baa2366..d51c632c4d 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 @@ private static String getAppsTableColumnDefs( 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 static String attemptsTableInit() { 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 static String containersTableInit() { 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(); } 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 d32b271e46..9a227430a9 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 @@ private String appsTableInit() { // 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 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 24b85753b1..1bbb945d87 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 content() { return AllContainersBlock.class; 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 edf3b3ff6e..0290421706 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 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 void configure(Binder binder) { YarnApplicationState.RUNNING.toString())); rmViewInstance.render(); WebAppTests.flushOutput(injector); - Map moreParams = - rmViewInstance.context().requestContext().moreParams(); - String appsTableColumnsMeta = moreParams.get("ui.dataTables.apps.init"); - Assert.assertTrue(appsTableColumnsMeta.indexOf("natural") != -1); } @Test public void testNodesPage() {