From e77aec001fcfb39ff0629887b001056866a9a865 Mon Sep 17 00:00:00 2001 From: Jason Darrell Lowe Date: Mon, 18 Nov 2013 19:24:05 +0000 Subject: [PATCH 01/13] YARN-1419. TestFifoScheduler.testAppAttemptMetrics fails intermittently under jdk7. Contributed by Jonathan Eagles git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1543117 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../resourcemanager/scheduler/fifo/TestFifoScheduler.java | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 16587c07631..4ccdccf8750 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -139,6 +139,9 @@ Release 2.3.0 - UNRELEASED YARN-1411. HA config shouldn't affect NodeManager RPC addresses (Karthik Kambatla via bikas) + YARN-1419. TestFifoScheduler.testAppAttemptMetrics fails intermittently + under jdk7 (Jonathan Eagles via jlowe) + Release 2.2.1 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java index 238459097e7..00cb71ebe49 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java @@ -141,6 +141,8 @@ public class TestFifoScheduler { FifoScheduler schedular = new FifoScheduler(); schedular.reinitialize(new Configuration(), rmContext); + QueueMetrics metrics = schedular.getRootQueueMetrics(); + int beforeAppsSubmitted = metrics.getAppsSubmitted(); ApplicationId appId = BuilderUtils.newApplicationId(200, 1); ApplicationAttemptId appAttemptId = BuilderUtils.newApplicationAttemptId( @@ -155,8 +157,8 @@ public class TestFifoScheduler { event = new AppAddedSchedulerEvent(appAttemptId, "queue", "user"); schedular.handle(event); - QueueMetrics metrics = schedular.getRootQueueMetrics(); - Assert.assertEquals(1, metrics.getAppsSubmitted()); + int afterAppsSubmitted = metrics.getAppsSubmitted(); + Assert.assertEquals(1, afterAppsSubmitted - beforeAppsSubmitted); } @Test(timeout=2000) From 9bb905115db7baef35c23109aa608fc018dc6d1b Mon Sep 17 00:00:00 2001 From: Arpit Agarwal Date: Mon, 18 Nov 2013 22:11:11 +0000 Subject: [PATCH 02/13] HADOOP-10110. hadoop-auth has a build break due to missing dependency. (Contributed by Chuan Liu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1543190 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-auth/pom.xml | 5 +++++ hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ 2 files changed, 8 insertions(+) diff --git a/hadoop-common-project/hadoop-auth/pom.xml b/hadoop-common-project/hadoop-auth/pom.xml index e2beb0d49e7..dc841e5d527 100644 --- a/hadoop-common-project/hadoop-auth/pom.xml +++ b/hadoop-common-project/hadoop-auth/pom.xml @@ -52,6 +52,11 @@ mockito-all test + + org.mortbay.jetty + jetty-util + test + org.mortbay.jetty jetty diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 76e4abe0ef0..8bb5f084345 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -491,6 +491,9 @@ Release 2.2.1 - UNRELEASED HADOOP-10078. KerberosAuthenticator always does SPNEGO. (rkanter via tucu) + HADOOP-10110. hadoop-auth has a build break due to missing dependency. + (Chuan Liu via arp) + Release 2.2.0 - 2013-10-13 INCOMPATIBLE CHANGES From e68e3e429d9da5e02509060536cfe088cd905bfc Mon Sep 17 00:00:00 2001 From: Jing Zhao Date: Tue, 19 Nov 2013 00:37:54 +0000 Subject: [PATCH 03/13] HDFS-5393. Serve bootstrap and jQuery locally. Contributed by Haohui Mai. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1543248 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 + hadoop-hdfs-project/hadoop-hdfs/pom.xml | 2 + .../src/main/webapps/hdfs/dfshealth.html | 6 +- .../src/main/webapps/hdfs/explorer.html | 6 +- .../bootstrap-3.0.2/css/bootstrap.min.css | 9 + .../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20290 bytes .../fonts/glyphicons-halflings-regular.svg | 229 ++++++++++++++++++ .../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 41236 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23292 bytes .../bootstrap-3.0.2/js/bootstrap.min.js | 9 + .../main/webapps/static/jquery-1.10.2.min.js | 6 + 11 files changed, 263 insertions(+), 6 deletions(-) create mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/bootstrap-3.0.2/css/bootstrap.min.css create mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/bootstrap-3.0.2/fonts/glyphicons-halflings-regular.eot create mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/bootstrap-3.0.2/fonts/glyphicons-halflings-regular.svg create mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/bootstrap-3.0.2/fonts/glyphicons-halflings-regular.ttf create mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/bootstrap-3.0.2/fonts/glyphicons-halflings-regular.woff create mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/bootstrap-3.0.2/js/bootstrap.min.js create mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index cf935694cff..25df81fa8d6 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -496,6 +496,8 @@ Release 2.3.0 - UNRELEASED HDFS-5489. Use TokenAspect in WebHDFSFileSystem. (Haohui Mai via jing9) + HDFS-5393. Serve bootstrap and jQuery locally. (Haohui Mai via jing9) + OPTIMIZATIONS HDFS-5239. Allow FSNamesystem lock fairness to be configurable (daryn) diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml index 4fa7213746b..3c92933c01b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml @@ -547,8 +547,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> src/main/docs/releasenotes.html src/contrib/** src/site/resources/images/* + src/main/webapps/static/bootstrap-3.0.2/** src/main/webapps/static/dust-full-2.0.0.min.js src/main/webapps/static/dust-helpers-1.1.1.min.js + src/main/webapps/static/jquery-1.10.2.min.js src/main/webapps/hdfs/dfshealth.dust.html src/main/webapps/hdfs/explorer-block-info.dust.html src/main/webapps/hdfs/explorer.dust.html diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html index 1bda48e78a8..0ee78739208 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html @@ -18,7 +18,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + Namenode information @@ -36,8 +36,8 @@ -