svn commit: r1541566 - in /hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src: main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
Author: jlowe
Date: Wed Nov 13 15:49:29 2013
New Revision: 1541566
URL: http://svn.apache.org/r1541566
Log:
MAPREDUCE-5610. TestSleepJob fails in jdk7. Contributed by Jonathan Eagles
Modified:
hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
Modified:
hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java?rev=1541566r1=1541565r2=1541566view=diff
==
---
hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
(original)
+++
hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
Wed Nov 13 15:49:29 2013
@@ -63,8 +63,8 @@ public enum JobCreator {
Configuration conf, long submissionMillis, JobStory jobdesc, Path
outRoot,
UserGroupInformation ugi, int seq) throws IOException {
int numLocations = conf.getInt(SLEEPJOB_RANDOM_LOCATIONS, 0);
- if (numLocations 0) numLocations=0;
- if ((numLocations 0) (hosts == null)) {
+ if (numLocations 0) numLocations = 0;
+ if (hosts == null) {
final JobClient client = new JobClient(new JobConf(conf));
ClusterStatus stat = client.getClusterStatus(true);
final int nTrackers = stat.getTaskTrackers();
Modified:
hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java?rev=1541566r1=1541565r2=1541566view=diff
==
---
hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
(original)
+++
hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
Wed Nov 13 15:49:29 2013
@@ -58,17 +58,6 @@ public class TestSleepJob extends Common
}
- /*
- * test RandomLocation
- */
- @Test
- public void testRandomLocation() throws Exception {
-UserGroupInformation ugi = UserGroupInformation.getLoginUser();
-
-testRandomLocation(1, 10, ugi);
-testRandomLocation(2, 10, ugi);
- }
-
@Test
public void testMapTasksOnlySleepJobs() throws Exception {
Configuration configuration = GridmixTestUtils.mrvl.getConfig();
@@ -90,6 +79,17 @@ public class TestSleepJob extends Common
assertEquals(6, seq);
}
+ /*
+ * test RandomLocation
+ */
+ @Test
+ public void testRandomLocation() throws Exception {
+UserGroupInformation ugi = UserGroupInformation.getLoginUser();
+
+testRandomLocation(1, 10, ugi);
+testRandomLocation(2, 10, ugi);
+ }
+
// test Serial submit
@Test
public void testSerialSubmit() throws Exception {
svn commit: r1541583 - in /hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src: main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java test/java/org/apache/hadoop/mapred/gridmix/TestSl
Author: jlowe
Date: Wed Nov 13 16:19:21 2013
New Revision: 1541583
URL: http://svn.apache.org/r1541583
Log:
svn merge -c 1541566 FIXES: MAPREDUCE-5610. TestSleepJob fails in jdk7.
Contributed by Jonathan Eagles
Modified:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
Modified:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java?rev=1541583r1=1541582r2=1541583view=diff
==
---
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
Wed Nov 13 16:19:21 2013
@@ -63,8 +63,8 @@ public enum JobCreator {
Configuration conf, long submissionMillis, JobStory jobdesc, Path
outRoot,
UserGroupInformation ugi, int seq) throws IOException {
int numLocations = conf.getInt(SLEEPJOB_RANDOM_LOCATIONS, 0);
- if (numLocations 0) numLocations=0;
- if ((numLocations 0) (hosts == null)) {
+ if (numLocations 0) numLocations = 0;
+ if (hosts == null) {
final JobClient client = new JobClient(new JobConf(conf));
ClusterStatus stat = client.getClusterStatus(true);
final int nTrackers = stat.getTaskTrackers();
Modified:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java?rev=1541583r1=1541582r2=1541583view=diff
==
---
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
Wed Nov 13 16:19:21 2013
@@ -58,17 +58,6 @@ public class TestSleepJob extends Common
}
- /*
- * test RandomLocation
- */
- @Test (timeout=60)
- public void testRandomLocation() throws Exception {
-UserGroupInformation ugi = UserGroupInformation.getLoginUser();
-
-testRandomLocation(1, 10, ugi);
-testRandomLocation(2, 10, ugi);
- }
-
@Test (timeout=60)
public void testMapTasksOnlySleepJobs() throws Exception {
Configuration configuration = GridmixTestUtils.mrvl.getConfig();
@@ -90,6 +79,17 @@ public class TestSleepJob extends Common
assertEquals(6, seq);
}
+ /*
+ * test RandomLocation
+ */
+ @Test (timeout=60)
+ public void testRandomLocation() throws Exception {
+UserGroupInformation ugi = UserGroupInformation.getLoginUser();
+
+testRandomLocation(1, 10, ugi);
+testRandomLocation(2, 10, ugi);
+ }
+
// test Serial submit
@Test (timeout=60)
public void testSerialSubmit() throws Exception {
svn commit: r1541590 - in /hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/src: main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java test/java/org/apache/hadoop/mapred/gridmix/Tes
Author: jlowe
Date: Wed Nov 13 16:26:06 2013
New Revision: 1541590
URL: http://svn.apache.org/r1541590
Log:
svn merge -c 1541566 FIXES: MAPREDUCE-5610. TestSleepJob fails in jdk7.
Contributed by Jonathan Eagles
Modified:
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java?rev=1541590r1=1541589r2=1541590view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
Wed Nov 13 16:26:06 2013
@@ -63,8 +63,8 @@ public enum JobCreator {
Configuration conf, long submissionMillis, JobStory jobdesc, Path
outRoot,
UserGroupInformation ugi, int seq) throws IOException {
int numLocations = conf.getInt(SLEEPJOB_RANDOM_LOCATIONS, 0);
- if (numLocations 0) numLocations=0;
- if ((numLocations 0) (hosts == null)) {
+ if (numLocations 0) numLocations = 0;
+ if (hosts == null) {
final JobClient client = new JobClient(new JobConf(conf));
ClusterStatus stat = client.getClusterStatus(true);
final int nTrackers = stat.getTaskTrackers();
Modified:
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java?rev=1541590r1=1541589r2=1541590view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
Wed Nov 13 16:26:06 2013
@@ -58,17 +58,6 @@ public class TestSleepJob extends Common
}
- /*
- * test RandomLocation
- */
- @Test (timeout=10)
- public void testRandomLocation() throws Exception {
-UserGroupInformation ugi = UserGroupInformation.getLoginUser();
-
-testRandomLocation(1, 10, ugi);
-testRandomLocation(2, 10, ugi);
- }
-
@Test (timeout=50)
public void testMapTasksOnlySleepJobs() throws Exception {
Configuration configuration = GridmixTestUtils.mrvl.getConfig();
@@ -90,6 +79,17 @@ public class TestSleepJob extends Common
assertEquals(6, seq);
}
+ /*
+ * test RandomLocation
+ */
+ @Test (timeout=10)
+ public void testRandomLocation() throws Exception {
+UserGroupInformation ugi = UserGroupInformation.getLoginUser();
+
+testRandomLocation(1, 10, ugi);
+testRandomLocation(2, 10, ugi);
+ }
+
// test Serial submit
@Test (timeout=50)
public void testSerialSubmit() throws Exception {
svn commit: r1541620 - in /hadoop/common/branches/HDFS-2832: ./ hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java hadoop-tools/hadoop-gridmix/src/test/java/org
Author: arp
Date: Wed Nov 13 17:15:36 2013
New Revision: 1541620
URL: http://svn.apache.org/r1541620
Log:
Merging r1541342 through r1541617 from trunk to branch HDFS-2832
Modified:
hadoop/common/branches/HDFS-2832/ (props changed)
hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
Propchange: hadoop/common/branches/HDFS-2832/
--
Merged /hadoop/common/trunk:r1541342-1541617
Modified:
hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java?rev=1541620r1=1541619r2=1541620view=diff
==
---
hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
(original)
+++
hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
Wed Nov 13 17:15:36 2013
@@ -63,8 +63,8 @@ public enum JobCreator {
Configuration conf, long submissionMillis, JobStory jobdesc, Path
outRoot,
UserGroupInformation ugi, int seq) throws IOException {
int numLocations = conf.getInt(SLEEPJOB_RANDOM_LOCATIONS, 0);
- if (numLocations 0) numLocations=0;
- if ((numLocations 0) (hosts == null)) {
+ if (numLocations 0) numLocations = 0;
+ if (hosts == null) {
final JobClient client = new JobClient(new JobConf(conf));
ClusterStatus stat = client.getClusterStatus(true);
final int nTrackers = stat.getTaskTrackers();
Modified:
hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java?rev=1541620r1=1541619r2=1541620view=diff
==
---
hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
(original)
+++
hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
Wed Nov 13 17:15:36 2013
@@ -58,17 +58,6 @@ public class TestSleepJob extends Common
}
- /*
- * test RandomLocation
- */
- @Test
- public void testRandomLocation() throws Exception {
-UserGroupInformation ugi = UserGroupInformation.getLoginUser();
-
-testRandomLocation(1, 10, ugi);
-testRandomLocation(2, 10, ugi);
- }
-
@Test
public void testMapTasksOnlySleepJobs() throws Exception {
Configuration configuration = GridmixTestUtils.mrvl.getConfig();
@@ -90,6 +79,17 @@ public class TestSleepJob extends Common
assertEquals(6, seq);
}
+ /*
+ * test RandomLocation
+ */
+ @Test
+ public void testRandomLocation() throws Exception {
+UserGroupInformation ugi = UserGroupInformation.getLoginUser();
+
+testRandomLocation(1, 10, ugi);
+testRandomLocation(2, 10, ugi);
+ }
+
// test Serial submit
@Test
public void testSerialSubmit() throws Exception {
svn commit: r1541620 - in /hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common: CHANGES.txt src/main/conf/hadoop-env.cmd
Author: arp Date: Wed Nov 13 17:15:36 2013 New Revision: 1541620 URL: http://svn.apache.org/r1541620 Log: Merging r1541342 through r1541617 from trunk to branch HDFS-2832 Modified: hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/CHANGES.txt (contents, props changed) hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd Modified: hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1541620r1=1541619r2=1541620view=diff == --- hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/CHANGES.txt Wed Nov 13 17:15:36 2013 @@ -423,6 +423,9 @@ Release 2.3.0 - UNRELEASED HADOOP-10088. copy-nativedistlibs.sh needs to quote snappy lib dir. (Raja Aluri via cnauroth) +HADOOP-10093. hadoop-env.cmd sets HADOOP_CLIENT_OPTS with a max heap size +that is too small. (Shanyu Zhao via cnauroth) + Release 2.2.1 - UNRELEASED INCOMPATIBLE CHANGES Propchange: hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/CHANGES.txt -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1541342-1541617 Modified: hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd?rev=1541620r1=1541619r2=1541620view=diff == --- hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd (original) +++ hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd Wed Nov 13 17:15:36 2013 @@ -58,7 +58,7 @@ set HADOOP_DATANODE_OPTS=-Dhadoop.securi set HADOOP_SECONDARYNAMENODE_OPTS=-Dhadoop.security.logger=%HADOOP_SECURITY_LOGGER% -Dhdfs.audit.logger=%HDFS_AUDIT_LOGGER% %HADOOP_SECONDARYNAMENODE_OPTS% @rem The following applies to multiple commands (fs, dfs, fsck, distcp etc) -set HADOOP_CLIENT_OPTS=-Xmx128m %HADOOP_CLIENT_OPTS% +set HADOOP_CLIENT_OPTS=-Xmx512m %HADOOP_CLIENT_OPTS% @rem set HADOOP_JAVA_PLATFORM_OPTS=-XX:-UsePerfData %HADOOP_JAVA_PLATFORM_OPTS% @rem On secure datanodes, user to run the datanode as after dropping privileges
svn commit: r1541647 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/NativeIO.java
Author: cmccabe
Date: Wed Nov 13 18:18:37 2013
New Revision: 1541647
URL: http://svn.apache.org/r1541647
Log:
HDFS-5366. recaching improvements (cmccabe)
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/NativeIO.java
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/NativeIO.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/NativeIO.java?rev=1541647r1=1541646r2=1541647view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/NativeIO.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/NativeIO.java
Wed Nov 13 18:18:37 2013
@@ -114,7 +114,17 @@ public class NativeIO {
public static interface CacheTracker {
public void fadvise(String identifier, long offset, long len, int flags);
}
-
+
+public static CacheManipulator cacheManipulator = new CacheManipulator();
+
+@VisibleForTesting
+public static class CacheManipulator {
+ public void mlock(String identifier, ByteBuffer buffer,
+ long len) throws IOException {
+POSIX.mlock(buffer, len);
+ }
+}
+
static {
if (NativeCodeLoader.isNativeCodeLoaded()) {
try {
@@ -249,7 +259,7 @@ public class NativeIO {
*
* @throws NativeIOException
*/
-public static void mlock(ByteBuffer buffer, long len)
+static void mlock(ByteBuffer buffer, long len)
throws IOException {
assertCodeLoaded();
if (!buffer.isDirect()) {
svn commit: r1541667 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: pom.xml src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
Author: stevel Date: Wed Nov 13 19:29:56 2013 New Revision: 1541667 URL: http://svn.apache.org/r1541667 Log: HADOOP-9594 commons-math Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml?rev=1541667r1=1541666r2=1541667view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml Wed Nov 13 19:29:56 2013 @@ -53,7 +53,7 @@ /dependency dependency groupIdorg.apache.commons/groupId - artifactIdcommons-math/artifactId + artifactIdcommons-math3/artifactId scopecompile/scope /dependency dependency Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java?rev=1541667r1=1541666r2=1541667view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java Wed Nov 13 19:29:56 2013 @@ -38,7 +38,7 @@ import static com.google.common.base.Pre import org.apache.commons.configuration.PropertiesConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.commons.math.util.MathUtils; +import org.apache.commons.math3.util.ArithmeticUtils; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.metrics2.MetricsInfo; import org.apache.hadoop.metrics2.MetricsCollector; @@ -460,7 +460,7 @@ public class MetricsSystemImpl extends M MetricsConfig conf = entry.getValue(); int sinkPeriod = conf.getInt(PERIOD_KEY, PERIOD_DEFAULT); confPeriod = confPeriod == 0 ? sinkPeriod - : MathUtils.gcd(confPeriod, sinkPeriod); + : ArithmeticUtils.gcd(confPeriod, sinkPeriod); String clsName = conf.getClassName(); if (clsName == null) continue; // sink can be registered later on String sinkName = entry.getKey();
svn commit: r1541668 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Author: stevel Date: Wed Nov 13 19:30:21 2013 New Revision: 1541668 URL: http://svn.apache.org/r1541668 Log: HADOOP-9594 commons-math Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1541668r1=1541667r2=1541668view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Wed Nov 13 19:30:21 2013 @@ -85,6 +85,9 @@ Release 2.3.0 - UNRELEASED HADOOP-10064. Upgrade to maven antrun plugin version 1.7 (Arpit Agarwal via jeagles) +HADOOP-9594. Update apache commons math dependency (Timothy St. Clair via +stevel) + OPTIMIZATIONS HADOOP-9748. Reduce blocking on UGI.ensureInitialized (daryn)
svn commit: r1541667 - /hadoop/common/branches/branch-2/hadoop-project/pom.xml
Author: stevel Date: Wed Nov 13 19:29:56 2013 New Revision: 1541667 URL: http://svn.apache.org/r1541667 Log: HADOOP-9594 commons-math Modified: hadoop/common/branches/branch-2/hadoop-project/pom.xml Modified: hadoop/common/branches/branch-2/hadoop-project/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-project/pom.xml?rev=1541667r1=1541666r2=1541667view=diff == --- hadoop/common/branches/branch-2/hadoop-project/pom.xml (original) +++ hadoop/common/branches/branch-2/hadoop-project/pom.xml Wed Nov 13 19:29:56 2013 @@ -323,8 +323,8 @@ /dependency dependency groupIdorg.apache.commons/groupId -artifactIdcommons-math/artifactId -version2.1/version +artifactIdcommons-math3/artifactId +version3.1.1/version /dependency dependency groupIdorg.apache.commons/groupId
svn commit: r1541672 - in /hadoop/common/trunk: ./ hadoop-project/pom.xml
Author: stevel Date: Wed Nov 13 19:36:54 2013 New Revision: 1541672 URL: http://svn.apache.org/r1541672 Log: HADOOP-9594 commons-math Modified: hadoop/common/trunk/ (props changed) hadoop/common/trunk/hadoop-project/pom.xml Propchange: hadoop/common/trunk/ -- Merged /hadoop/common/branches/branch-2:r1541667 Modified: hadoop/common/trunk/hadoop-project/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-project/pom.xml?rev=1541672r1=1541671r2=1541672view=diff == --- hadoop/common/trunk/hadoop-project/pom.xml (original) +++ hadoop/common/trunk/hadoop-project/pom.xml Wed Nov 13 19:36:54 2013 @@ -324,8 +324,8 @@ /dependency dependency groupIdorg.apache.commons/groupId -artifactIdcommons-math/artifactId -version2.1/version +artifactIdcommons-math3/artifactId +version3.1.1/version /dependency dependency groupIdorg.apache.commons/groupId
svn commit: r1541680 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml
Author: stevel Date: Wed Nov 13 19:50:17 2013 New Revision: 1541680 URL: http://svn.apache.org/r1541680 Log: MAPREDUCE-5431 Missing pom dependency in MR-client Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml?rev=1541680r1=1541679r2=1541680view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml Wed Nov 13 19:50:17 2013 @@ -82,6 +82,11 @@ scopecompile/scope /dependency dependency + groupIdcommons-collections/groupId + artifactIdcommons-collections/artifactId + scopecompile/scope +/dependency +dependency groupIdjavax.servlet/groupId artifactIdservlet-api/artifactId scopecompile/scope
svn commit: r1541682 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml
Author: stevel Date: Wed Nov 13 19:52:43 2013 New Revision: 1541682 URL: http://svn.apache.org/r1541682 Log: MAPREDUCE-5431 Missing pom dependency in MR-client Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml?rev=1541682r1=1541681r2=1541682view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml Wed Nov 13 19:52:43 2013 @@ -84,6 +84,11 @@ scopecompile/scope /dependency dependency + groupIdcommons-collections/groupId + artifactIdcommons-collections/artifactId + scopecompile/scope +/dependency +dependency groupIdjavax.servlet/groupId artifactIdservlet-api/artifactId scopecompile/scope
svn commit: r1541682 - /hadoop/common/trunk/
Author: stevel Date: Wed Nov 13 19:52:43 2013 New Revision: 1541682 URL: http://svn.apache.org/r1541682 Log: MAPREDUCE-5431 Missing pom dependency in MR-client Modified: hadoop/common/trunk/ (props changed) Propchange: hadoop/common/trunk/ -- Merged /hadoop/common/branches/branch-2:r1541680
svn commit: r1541692 - /hadoop/common/trunk/
Author: stevel Date: Wed Nov 13 20:19:41 2013 New Revision: 1541692 URL: http://svn.apache.org/r1541692 Log: HDFS-5075 httpfs-config.sh calls out incorrect env script name Modified: hadoop/common/trunk/ (props changed) Propchange: hadoop/common/trunk/ -- Merged /hadoop/common/branches/branch-2:r1541687
svn commit: r1541699 - in /hadoop/common/branches/branch-2/hadoop-tools: hadoop-archives/pom.xml hadoop-datajoin/pom.xml hadoop-distcp/pom.xml hadoop-extras/pom.xml hadoop-gridmix/pom.xml hadoop-rumen
Author: stevel Date: Wed Nov 13 20:43:04 2013 New Revision: 1541699 URL: http://svn.apache.org/r1541699 Log: MAPREDUCE-6524 Move grizzly-test and junit dependencies to test scope Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-archives/pom.xml hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/pom.xml hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/pom.xml hadoop/common/branches/branch-2/hadoop-tools/hadoop-extras/pom.xml hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/pom.xml hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/pom.xml hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/pom.xml Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-archives/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-archives/pom.xml?rev=1541699r1=1541698r2=1541699view=diff == --- hadoop/common/branches/branch-2/hadoop-tools/hadoop-archives/pom.xml (original) +++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-archives/pom.xml Wed Nov 13 20:43:04 2013 @@ -36,6 +36,11 @@ dependencies dependency + groupIdjunit/groupId + artifactIdjunit/artifactId + scopetest/scope +/dependency +dependency groupIdorg.apache.hadoop/groupId artifactIdhadoop-annotations/artifactId scopeprovided/scope Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/pom.xml?rev=1541699r1=1541698r2=1541699view=diff == --- hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/pom.xml (original) +++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/pom.xml Wed Nov 13 20:43:04 2013 @@ -33,6 +33,11 @@ dependencies dependency + groupIdjunit/groupId + artifactIdjunit/artifactId + scopetest/scope +/dependency +dependency groupIdorg.apache.hadoop/groupId artifactIdhadoop-annotations/artifactId scopeprovided/scope Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/pom.xml?rev=1541699r1=1541698r2=1541699view=diff == --- hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/pom.xml (original) +++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/pom.xml Wed Nov 13 20:43:04 2013 @@ -38,6 +38,11 @@ dependencies dependency + groupIdjunit/groupId + artifactIdjunit/artifactId + scopetest/scope +/dependency +dependency groupIdorg.apache.hadoop/groupId artifactIdhadoop-common/artifactId scopeprovided/scope Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-extras/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-extras/pom.xml?rev=1541699r1=1541698r2=1541699view=diff == --- hadoop/common/branches/branch-2/hadoop-tools/hadoop-extras/pom.xml (original) +++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-extras/pom.xml Wed Nov 13 20:43:04 2013 @@ -36,6 +36,11 @@ dependencies dependency + groupIdjunit/groupId + artifactIdjunit/artifactId + scopetest/scope +/dependency +dependency groupIdorg.apache.hadoop/groupId artifactIdhadoop-annotations/artifactId scopeprovided/scope Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/pom.xml?rev=1541699r1=1541698r2=1541699view=diff == --- hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/pom.xml (original) +++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/pom.xml Wed Nov 13 20:43:04 2013 @@ -33,6 +33,11 @@ dependencies dependency + groupIdjunit/groupId + artifactIdjunit/artifactId + scopetest/scope +/dependency +dependency groupIdorg.apache.hadoop/groupId artifactIdhadoop-annotations/artifactId scopeprovided/scope Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/pom.xml?rev=1541699r1=1541698r2=1541699view=diff == --- hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/pom.xml (original) +++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/pom.xml Wed Nov 13
svn commit: r1541702 - in /hadoop/common/trunk: ./ hadoop-tools/hadoop-archives/ hadoop-tools/hadoop-datajoin/ hadoop-tools/hadoop-distcp/ hadoop-tools/hadoop-extras/ hadoop-tools/hadoop-gridmix/ hado
Author: stevel Date: Wed Nov 13 20:46:54 2013 New Revision: 1541702 URL: http://svn.apache.org/r1541702 Log: MAPREDUCE-5624 Move grizzly-test and junit dependencies to test scope Modified: hadoop/common/trunk/ (props changed) hadoop/common/trunk/hadoop-tools/hadoop-archives/pom.xml hadoop/common/trunk/hadoop-tools/hadoop-datajoin/pom.xml hadoop/common/trunk/hadoop-tools/hadoop-distcp/pom.xml hadoop/common/trunk/hadoop-tools/hadoop-extras/pom.xml hadoop/common/trunk/hadoop-tools/hadoop-gridmix/pom.xml hadoop/common/trunk/hadoop-tools/hadoop-rumen/pom.xml hadoop/common/trunk/hadoop-tools/hadoop-streaming/pom.xml Propchange: hadoop/common/trunk/ -- Merged /hadoop/common/branches/branch-2:r1541699 Modified: hadoop/common/trunk/hadoop-tools/hadoop-archives/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-archives/pom.xml?rev=1541702r1=1541701r2=1541702view=diff == --- hadoop/common/trunk/hadoop-tools/hadoop-archives/pom.xml (original) +++ hadoop/common/trunk/hadoop-tools/hadoop-archives/pom.xml Wed Nov 13 20:46:54 2013 @@ -36,6 +36,11 @@ dependencies dependency + groupIdjunit/groupId + artifactIdjunit/artifactId + scopetest/scope +/dependency +dependency groupIdorg.apache.hadoop/groupId artifactIdhadoop-annotations/artifactId scopeprovided/scope Modified: hadoop/common/trunk/hadoop-tools/hadoop-datajoin/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-datajoin/pom.xml?rev=1541702r1=1541701r2=1541702view=diff == --- hadoop/common/trunk/hadoop-tools/hadoop-datajoin/pom.xml (original) +++ hadoop/common/trunk/hadoop-tools/hadoop-datajoin/pom.xml Wed Nov 13 20:46:54 2013 @@ -33,6 +33,11 @@ dependencies dependency + groupIdjunit/groupId + artifactIdjunit/artifactId + scopetest/scope +/dependency +dependency groupIdorg.apache.hadoop/groupId artifactIdhadoop-annotations/artifactId scopeprovided/scope Modified: hadoop/common/trunk/hadoop-tools/hadoop-distcp/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-distcp/pom.xml?rev=1541702r1=1541701r2=1541702view=diff == --- hadoop/common/trunk/hadoop-tools/hadoop-distcp/pom.xml (original) +++ hadoop/common/trunk/hadoop-tools/hadoop-distcp/pom.xml Wed Nov 13 20:46:54 2013 @@ -38,6 +38,11 @@ dependencies dependency + groupIdjunit/groupId + artifactIdjunit/artifactId + scopetest/scope +/dependency +dependency groupIdorg.apache.hadoop/groupId artifactIdhadoop-common/artifactId scopeprovided/scope Modified: hadoop/common/trunk/hadoop-tools/hadoop-extras/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-extras/pom.xml?rev=1541702r1=1541701r2=1541702view=diff == --- hadoop/common/trunk/hadoop-tools/hadoop-extras/pom.xml (original) +++ hadoop/common/trunk/hadoop-tools/hadoop-extras/pom.xml Wed Nov 13 20:46:54 2013 @@ -36,6 +36,11 @@ dependencies dependency + groupIdjunit/groupId + artifactIdjunit/artifactId + scopetest/scope +/dependency +dependency groupIdorg.apache.hadoop/groupId artifactIdhadoop-annotations/artifactId scopeprovided/scope Modified: hadoop/common/trunk/hadoop-tools/hadoop-gridmix/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-gridmix/pom.xml?rev=1541702r1=1541701r2=1541702view=diff == --- hadoop/common/trunk/hadoop-tools/hadoop-gridmix/pom.xml (original) +++ hadoop/common/trunk/hadoop-tools/hadoop-gridmix/pom.xml Wed Nov 13 20:46:54 2013 @@ -33,6 +33,11 @@ dependencies dependency + groupIdjunit/groupId + artifactIdjunit/artifactId + scopetest/scope +/dependency +dependency groupIdorg.apache.hadoop/groupId artifactIdhadoop-annotations/artifactId scopeprovided/scope Modified: hadoop/common/trunk/hadoop-tools/hadoop-rumen/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-rumen/pom.xml?rev=1541702r1=1541701r2=1541702view=diff == --- hadoop/common/trunk/hadoop-tools/hadoop-rumen/pom.xml (original) +++ hadoop/common/trunk/hadoop-tools/hadoop-rumen/pom.xml Wed Nov 13 20:46:54 2013 @@ -36,6 +36,11 @@ dependencies dependency + groupIdjunit/groupId + artifactIdjunit/artifactId + scopetest/scope +/dependency +
svn commit: r1541720 - in /hadoop/common/trunk/hadoop-common-project: hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/ hadoop-auth/src/test/java/org/apache/hadoop/security/a
Author: tucu
Date: Wed Nov 13 21:11:35 2013
New Revision: 1541720
URL: http://svn.apache.org/r1541720
Log:
HADOOP-10078. KerberosAuthenticator always does SPNEGO. (rkanter via tucu)
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java
hadoop/common/trunk/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/AuthenticatorTestCase.java
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java?rev=1541720r1=1541719r2=1541720view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java
Wed Nov 13 21:11:35 2013
@@ -185,7 +185,7 @@ public class KerberosAuthenticator imple
conn.setRequestMethod(AUTH_HTTP_METHOD);
conn.connect();
- if (conn.getRequestProperty(AUTHORIZATION) != null
conn.getResponseCode() == HttpURLConnection.HTTP_OK) {
+ if (conn.getResponseCode() == HttpURLConnection.HTTP_OK) {
LOG.debug(JDK performed authentication on our behalf.);
// If the JDK already did the SPNEGO back-and-forth for
// us, just pull out the token.
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/AuthenticatorTestCase.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/AuthenticatorTestCase.java?rev=1541720r1=1541719r2=1541720view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/AuthenticatorTestCase.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/AuthenticatorTestCase.java
Wed Nov 13 21:11:35 2013
@@ -136,7 +136,6 @@ public class AuthenticatorTestCase {
TestConnectionConfigurator connConf = new TestConnectionConfigurator();
AuthenticatedURL aUrl = new AuthenticatedURL(authenticator, connConf);
HttpURLConnection conn = aUrl.openConnection(url, token);
- Assert.assertTrue(token.isSet());
Assert.assertTrue(connConf.invoked);
String tokenStr = token.toString();
if (doPost) {
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1541720r1=1541719r2=1541720view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Wed Nov
13 21:11:35 2013
@@ -479,6 +479,8 @@ Release 2.2.1 - UNRELEASED
as [-Dkey, value] which breaks GenericsOptionParser.
(Enis Soztutar via cnauroth)
+HADOOP-10078. KerberosAuthenticator always does SPNEGO. (rkanter via tucu)
+
Release 2.2.0 - 2013-10-13
INCOMPATIBLE CHANGES
svn commit: r1541721 - in /hadoop/common/branches/branch-2/hadoop-common-project: hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/ hadoop-auth/src/test/java/org/apache/hadoo
Author: tucu
Date: Wed Nov 13 21:13:18 2013
New Revision: 1541721
URL: http://svn.apache.org/r1541721
Log:
HADOOP-10078. KerberosAuthenticator always does SPNEGO. (rkanter via tucu)
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/AuthenticatorTestCase.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java?rev=1541721r1=1541720r2=1541721view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java
Wed Nov 13 21:13:18 2013
@@ -185,7 +185,7 @@ public class KerberosAuthenticator imple
conn.setRequestMethod(AUTH_HTTP_METHOD);
conn.connect();
- if (conn.getRequestProperty(AUTHORIZATION) != null
conn.getResponseCode() == HttpURLConnection.HTTP_OK) {
+ if (conn.getResponseCode() == HttpURLConnection.HTTP_OK) {
LOG.debug(JDK performed authentication on our behalf.);
// If the JDK already did the SPNEGO back-and-forth for
// us, just pull out the token.
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/AuthenticatorTestCase.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/AuthenticatorTestCase.java?rev=1541721r1=1541720r2=1541721view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/AuthenticatorTestCase.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/AuthenticatorTestCase.java
Wed Nov 13 21:13:18 2013
@@ -136,7 +136,6 @@ public class AuthenticatorTestCase {
TestConnectionConfigurator connConf = new TestConnectionConfigurator();
AuthenticatedURL aUrl = new AuthenticatedURL(authenticator, connConf);
HttpURLConnection conn = aUrl.openConnection(url, token);
- Assert.assertTrue(token.isSet());
Assert.assertTrue(connConf.invoked);
String tokenStr = token.toString();
if (doPost) {
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1541721r1=1541720r2=1541721view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Wed Nov 13 21:13:18 2013
@@ -188,6 +188,8 @@ Release 2.2.1 - UNRELEASED
as [-Dkey, value] which breaks GenericsOptionParser.
(Enis Soztutar via cnauroth)
+HADOOP-10078. KerberosAuthenticator always does SPNEGO. (rkanter via tucu)
+
Release 2.2.0 - 2013-10-13
INCOMPATIBLE CHANGES
svn commit: r1541723 - in /hadoop/common/branches/branch-2.2/hadoop-common-project: hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/ hadoop-auth/src/test/java/org/apache/had
Author: tucu
Date: Wed Nov 13 21:15:13 2013
New Revision: 1541723
URL: http://svn.apache.org/r1541723
Log:
HADOOP-10078. KerberosAuthenticator always does SPNEGO. (rkanter via tucu)
Modified:
hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java
hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/AuthenticatorTestCase.java
hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/CHANGES.txt
Modified:
hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java?rev=1541723r1=1541722r2=1541723view=diff
==
---
hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java
(original)
+++
hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java
Wed Nov 13 21:15:13 2013
@@ -185,7 +185,7 @@ public class KerberosAuthenticator imple
conn.setRequestMethod(AUTH_HTTP_METHOD);
conn.connect();
- if (conn.getRequestProperty(AUTHORIZATION) != null
conn.getResponseCode() == HttpURLConnection.HTTP_OK) {
+ if (conn.getResponseCode() == HttpURLConnection.HTTP_OK) {
LOG.debug(JDK performed authentication on our behalf.);
// If the JDK already did the SPNEGO back-and-forth for
// us, just pull out the token.
Modified:
hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/AuthenticatorTestCase.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/AuthenticatorTestCase.java?rev=1541723r1=1541722r2=1541723view=diff
==
---
hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/AuthenticatorTestCase.java
(original)
+++
hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/AuthenticatorTestCase.java
Wed Nov 13 21:15:13 2013
@@ -138,7 +138,6 @@ public abstract class AuthenticatorTestC
TestConnectionConfigurator connConf = new TestConnectionConfigurator();
AuthenticatedURL aUrl = new AuthenticatedURL(authenticator, connConf);
HttpURLConnection conn = aUrl.openConnection(url, token);
- Assert.assertTrue(token.isSet());
Assert.assertTrue(connConf.invoked);
String tokenStr = token.toString();
if (doPost) {
Modified:
hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1541723r1=1541722r2=1541723view=diff
==
---
hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/CHANGES.txt
Wed Nov 13 21:15:13 2013
@@ -53,6 +53,8 @@ Release 2.2.1 - UNRELEASED
as [-Dkey, value] which breaks GenericsOptionParser.
(Enis Soztutar via cnauroth)
+HADOOP-10078. KerberosAuthenticator always does SPNEGO. (rkanter via tucu)
+
Release 2.2.0 - 2013-10-13
INCOMPATIBLE CHANGES
svn commit: r1541736 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: ./ src/main/java/org/apache/hadoop/fs/ src/main/java/org/apache/hadoop/ipc/ src/test/java/org/apache/hadoop/ipc/
Author: daryn
Date: Wed Nov 13 21:37:21 2013
New Revision: 1541736
URL: http://svn.apache.org/r1541736
Log:
HADOOP-9956. RPC listener inefficiently assigns connections to readers (daryn)
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1541736r1=1541735r2=1541736view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Wed Nov
13 21:37:21 2013
@@ -284,7 +284,9 @@ Trunk (Unreleased)
HADOOP-7761. Improve the performance of raw comparisons. (todd)
-HADOOP-8589 ViewFs tests fail when tests and home dirs are nested (sanjay
Radia)
+HADOOP-8589. ViewFs tests fail when tests and home dirs are nested (sanjay
Radia)
+
+HADOOP-9956. RPC listener inefficiently assigns connections to readers
(daryn)
Release 2.3.0 - UNRELEASED
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java?rev=1541736r1=1541735r2=1541736view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
Wed Nov 13 21:37:21 2013
@@ -65,6 +65,13 @@ public class CommonConfigurationKeys ext
/** Default value for IPC_SERVER_RPC_READ_THREADS_KEY */
public static final int IPC_SERVER_RPC_READ_THREADS_DEFAULT = 1;
+ /** Number of pending connections that may be queued per socket reader */
+ public static final String IPC_SERVER_RPC_READ_CONNECTION_QUEUE_SIZE_KEY =
+ ipc.server.read.connection-queue.size;
+ /** Default value for IPC_SERVER_RPC_READ_CONNECTION_QUEUE_SIZE */
+ public static final int IPC_SERVER_RPC_READ_CONNECTION_QUEUE_SIZE_DEFAULT =
+ 100;
+
public static final String IPC_MAXIMUM_DATA_LENGTH =
ipc.maximum.data.length;
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java?rev=1541736r1=1541735r2=1541736view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
Wed Nov 13 21:37:21 2013
@@ -345,6 +345,7 @@ public abstract class Server {
private int port; // port we listen on
private int handlerCount; // number of handler threads
private int readThreads;// number of read threads
+ private int readerPendingConnectionQueue; // number of connections
to queue per read thread
private Class? extends Writable rpcRequestClass; // class used for
deserializing the rpc request
private int maxIdleTime;// the maximum idle time
after
// which a client may be
disconnected
@@ -553,12 +554,14 @@ public abstract class Server {
}
private class Reader extends Thread {
- private volatile boolean adding = false;
+ final private BlockingQueueConnection pendingConnections;
private final Selector readSelector;
Reader(String name) throws IOException {
super(name);
+this.pendingConnections =
+new LinkedBlockingQueueConnection(readerPendingConnectionQueue);
this.readSelector = Selector.open();
}
@@ -580,10 +583,14 @@ public abstract class Server {
while (running) {
SelectionKey key = null;
try {
+// consume as many connections as currently queued to avoid
+// unbridled acceptance of connections that starves the select
+int size = pendingConnections.size();
svn commit: r1541740 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
Author: daryn Date: Wed Nov 13 21:41:51 2013 New Revision: 1541740 URL: http://svn.apache.org/r1541740 Log: Move HADOOP-9956 to correct release in CHANGES.txt Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1541740r1=1541739r2=1541740view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Wed Nov 13 21:41:51 2013 @@ -286,8 +286,6 @@ Trunk (Unreleased) HADOOP-8589. ViewFs tests fail when tests and home dirs are nested (sanjay Radia) -HADOOP-9956. RPC listener inefficiently assigns connections to readers (daryn) - Release 2.3.0 - UNRELEASED INCOMPATIBLE CHANGES @@ -2305,6 +2303,8 @@ Release 0.23.10 - UNRELEASED OPTIMIZATIONS +HADOOP-9956. RPC listener inefficiently assigns connections to readers (daryn) + BUG FIXES Release 0.23.9 - 2013-07-08
svn commit: r1541743 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: ./ src/main/java/org/apache/hadoop/fs/ src/main/java/org/apache/hadoop/ipc/ src/test/java/org/apache/had
Author: daryn
Date: Wed Nov 13 21:48:21 2013
New Revision: 1541743
URL: http://svn.apache.org/r1541743
Log:
svn merge -c 1541736 FIXES: HADOOP-9956. RPC listener inefficiently assigns
connections to readers (daryn)
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1541743r1=1541742r2=1541743view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Wed Nov 13 21:48:21 2013
@@ -2038,6 +2038,8 @@ Release 0.23.10 - UNRELEASED
OPTIMIZATIONS
+HADOOP-9956. RPC listener inefficiently assigns connections to readers
(daryn)
+
BUG FIXES
Release 0.23.9 - 2013-07-08
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java?rev=1541743r1=1541742r2=1541743view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
Wed Nov 13 21:48:21 2013
@@ -65,6 +65,13 @@ public class CommonConfigurationKeys ext
/** Default value for IPC_SERVER_RPC_READ_THREADS_KEY */
public static final int IPC_SERVER_RPC_READ_THREADS_DEFAULT = 1;
+ /** Number of pending connections that may be queued per socket reader */
+ public static final String IPC_SERVER_RPC_READ_CONNECTION_QUEUE_SIZE_KEY =
+ ipc.server.read.connection-queue.size;
+ /** Default value for IPC_SERVER_RPC_READ_CONNECTION_QUEUE_SIZE */
+ public static final int IPC_SERVER_RPC_READ_CONNECTION_QUEUE_SIZE_DEFAULT =
+ 100;
+
public static final String IPC_MAXIMUM_DATA_LENGTH =
ipc.maximum.data.length;
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java?rev=1541743r1=1541742r2=1541743view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
Wed Nov 13 21:48:21 2013
@@ -342,6 +342,7 @@ public abstract class Server {
private int port; // port we listen on
private int handlerCount; // number of handler threads
private int readThreads;// number of read threads
+ private int readerPendingConnectionQueue; // number of connections
to queue per read thread
private Class? extends Writable rpcRequestClass; // class used for
deserializing the rpc request
private int maxIdleTime;// the maximum idle time
after
// which a client may be
disconnected
@@ -550,12 +551,14 @@ public abstract class Server {
}
private class Reader extends Thread {
- private volatile boolean adding = false;
+ final private BlockingQueueConnection pendingConnections;
private final Selector readSelector;
Reader(String name) throws IOException {
super(name);
+this.pendingConnections =
+new LinkedBlockingQueueConnection(readerPendingConnectionQueue);
this.readSelector = Selector.open();
}
@@ -577,10 +580,14 @@ public abstract class Server {
while (running) {
SelectionKey key = null;
try {
+// consume as many connections as currently queued to avoid
+// unbridled acceptance of connections that starves the select
+int size =
svn commit: r1541742 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: ./ src/main/java/org/apache/hadoop/fs/ src/main/java/org/apache/hadoop/ipc/ src/test/java/org/apache/
Author: daryn
Date: Wed Nov 13 21:47:36 2013
New Revision: 1541742
URL: http://svn.apache.org/r1541742
Log:
HADOOP-9956. RPC listener inefficiently assigns connections to readers (daryn)
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1541742r1=1541741r2=1541742view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
Wed Nov 13 21:47:36 2013
@@ -20,6 +20,8 @@ Release 0.23.10 - UNRELEASED
HADOOP-9476. Some test cases in TestUserGroupInformation fail if ran after
testSetLoginUser. (Robert Parker via kihwal)
+HADOOP-9956. RPC listener inefficiently assigns connections to readers
(daryn)
+
BUG FIXES
HADOOP-9757. Har metadata cache can grow without limit (Cristina Abad via
daryn)
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java?rev=1541742r1=1541741r2=1541742view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
Wed Nov 13 21:47:36 2013
@@ -67,6 +67,12 @@ public class CommonConfigurationKeys ext
ipc.server.read.threadpool.size;
/** Default value for IPC_SERVER_RPC_READ_THREADS_KEY */
public static final int IPC_SERVER_RPC_READ_THREADS_DEFAULT = 1;
+ /** Number of pending connections that may be queued per socket reader */
+ public static final String IPC_SERVER_RPC_READ_CONNECTION_QUEUE_SIZE_KEY =
+ ipc.server.read.connection-queue.size;
+ /** Default value for IPC_SERVER_RPC_READ_CONNECTION_QUEUE_SIZE */
+ public static final int IPC_SERVER_RPC_READ_CONNECTION_QUEUE_SIZE_DEFAULT =
+ 100;
/** How many calls per handler are allowed in the queue. */
public static final String IPC_SERVER_HANDLER_QUEUE_SIZE_KEY =
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java?rev=1541742r1=1541741r2=1541742view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
Wed Nov 13 21:47:36 2013
@@ -225,6 +225,7 @@ public abstract class Server {
private int port; // port we listen on
private int handlerCount; // number of handler threads
private int readThreads;// number of read threads
+ private int readerPendingConnectionQueue; // number of connections to
queue per read thread
private Class? extends Writable paramClass; // class of call parameters
private int maxIdleTime;// the maximum idle time
after
// which a client may be
disconnected
@@ -410,12 +411,14 @@ public abstract class Server {
}
private class Reader extends Thread {
- private volatile boolean adding = false;
+ final private BlockingQueueConnection pendingConnections;
private final Selector readSelector;
Reader(String name) throws IOException {
super(name);
+this.pendingConnections =
+new LinkedBlockingQueueConnection(readerPendingConnectionQueue);
this.readSelector = Selector.open();
}
@@ -436,10 +439,14 @@ public abstract class Server {
while (running) {
svn commit: r1541750 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/io/compress/CodecPool.java
Author: szetszwo
Date: Wed Nov 13 22:50:58 2013
New Revision: 1541750
URL: http://svn.apache.org/r1541750
Log:
HADOOP-10095. In CodecPool, synchronize pool and codecList separately in order
to reduce lock contention. Contributed by Nicolas Liochon
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CodecPool.java
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1541750r1=1541749r2=1541750view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Wed Nov
13 22:50:58 2013
@@ -378,6 +378,9 @@ Release 2.3.0 - UNRELEASED
HADOOP-9594. Update apache commons math dependency (Timothy St. Clair via
stevel)
+HADOOP-10095. In CodecPool, synchronize pool and codecList separately in
+order to reduce lock contention. (Nicolas Liochon via szetszwo)
+
OPTIMIZATIONS
HADOOP-9748. Reduce blocking on UGI.ensureInitialized (daryn)
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CodecPool.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CodecPool.java?rev=1541750r1=1541749r2=1541750view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CodecPool.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CodecPool.java
Wed Nov 13 22:50:58 2013
@@ -85,16 +85,15 @@ public class CodecPool {
T codec = null;
// Check if an appropriate codec is available
+ListT codecList;
synchronized (pool) {
- if (pool.containsKey(codecClass)) {
-ListT codecList = pool.get(codecClass);
-
-if (codecList != null) {
- synchronized (codecList) {
-if (!codecList.isEmpty()) {
- codec = codecList.remove(codecList.size()-1);
-}
- }
+ codecList = pool.get(codecClass);
+}
+
+if (codecList != null) {
+ synchronized (codecList) {
+if (!codecList.isEmpty()) {
+ codec = codecList.remove(codecList.size() - 1);
}
}
}
@@ -105,15 +104,17 @@ public class CodecPool {
private static T void payback(MapClassT, ListT pool, T codec) {
if (codec != null) {
ClassT codecClass = ReflectionUtils.getClass(codec);
+ ListT codecList;
synchronized (pool) {
-if (!pool.containsKey(codecClass)) {
- pool.put(codecClass, new ArrayListT());
+codecList = pool.get(codecClass);
+if (codecList == null) {
+ codecList = new ArrayListT();
+ pool.put(codecClass, codecList);
}
+ }
-ListT codecList = pool.get(codecClass);
-synchronized (codecList) {
- codecList.add(codec);
-}
+ synchronized (codecList) {
+codecList.add(codec);
}
}
}
svn commit: r1541751 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: ./ CHANGES.txt src/ src/main/java/ src/main/java/org/apache/hadoop/io/compress/CodecPool.java
Author: szetszwo
Date: Wed Nov 13 22:51:43 2013
New Revision: 1541751
URL: http://svn.apache.org/r1541751
Log:
svn merge -c 1541750 from trunk for HADOOP-10095. In CodecPool, synchronize
pool and codecList separately in order to reduce lock contention.
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/
(props changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(contents, props changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/
(props changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/
(props changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CodecPool.java
Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/
--
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common:r1541750
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1541751r1=1541750r2=1541751view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Wed Nov 13 22:51:43 2013
@@ -88,6 +88,9 @@ Release 2.3.0 - UNRELEASED
HADOOP-9594. Update apache commons math dependency (Timothy St. Clair via
stevel)
+HADOOP-10095. In CodecPool, synchronize pool and codecList separately in
+order to reduce lock contention. (Nicolas Liochon via szetszwo)
+
OPTIMIZATIONS
HADOOP-9748. Reduce blocking on UGI.ensureInitialized (daryn)
Propchange:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
--
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1541750
Propchange:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/
--
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src:r1541750
Propchange:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/
--
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1541750
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CodecPool.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CodecPool.java?rev=1541751r1=1541750r2=1541751view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CodecPool.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CodecPool.java
Wed Nov 13 22:51:43 2013
@@ -85,16 +85,15 @@ public class CodecPool {
T codec = null;
// Check if an appropriate codec is available
+ListT codecList;
synchronized (pool) {
- if (pool.containsKey(codecClass)) {
-ListT codecList = pool.get(codecClass);
-
-if (codecList != null) {
- synchronized (codecList) {
-if (!codecList.isEmpty()) {
- codec = codecList.remove(codecList.size()-1);
-}
- }
+ codecList = pool.get(codecClass);
+}
+
+if (codecList != null) {
+ synchronized (codecList) {
+if (!codecList.isEmpty()) {
+ codec = codecList.remove(codecList.size() - 1);
}
}
}
@@ -105,15 +104,17 @@ public class CodecPool {
private static T void payback(MapClassT, ListT pool, T codec) {
if (codec != null) {
ClassT codecClass = ReflectionUtils.getClass(codec);
+ ListT codecList;
synchronized (pool) {
-if (!pool.containsKey(codecClass)) {
- pool.put(codecClass, new ArrayListT());
+codecList = pool.get(codecClass);
+if (codecList == null) {
+ codecList = new ArrayListT();
+ pool.put(codecClass, codecList);
}
+ }
-ListT codecList = pool.get(codecClass);
-synchronized (codecList) {
- codecList.add(codec);
-}
+ synchronized (codecList) {
+codecList.add(codec);
}
}
}
svn commit: r1541758 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: ./ src/main/java/org/apache/hadoop/fs/ src/test/java/org/apache/hadoop/fs/ src/test/resources/test.ha
Author: jlowe
Date: Wed Nov 13 23:23:00 2013
New Revision: 1541758
URL: http://svn.apache.org/r1541758
Log:
HADOOP-10091. Job with a har archive as input fails on 0.23. Contributed by
Jason Dere and Jason Lowe
Added:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/resources/test.har/
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/resources/test.har/.part-0.crc
(with props)
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/resources/test.har/_SUCCESS
(with props)
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/resources/test.har/_index
(with props)
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/resources/test.har/_masterindex
(with props)
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/resources/test.har/part-0
(with props)
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/pom.xml
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestHarFileSystemBasics.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1541758r1=1541757r2=1541758view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
Wed Nov 13 23:23:00 2013
@@ -26,6 +26,9 @@ Release 0.23.10 - UNRELEASED
HADOOP-9757. Har metadata cache can grow without limit (Cristina Abad via
daryn)
+HADOOP-10091. Job with a har archive as input fails on 0.23 (Jason Dere
+and Jason Lowe via jlowe)
+
Release 0.23.9 - 2013-07-08
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/pom.xml?rev=1541758r1=1541757r2=1541758view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/pom.xml
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/pom.xml
Wed Nov 13 23:23:00 2013
@@ -486,6 +486,10 @@
excludesrc/test/all-tests/exclude
excludesrc/test/resources/kdc/ldif/users.ldif/exclude
excludesrc/main/native/src/org/apache/hadoop/io/compress/lz4/lz4.c/exclude
+excludesrc/test/resources/test.har/_SUCCESS/exclude
+excludesrc/test/resources/test.har/_index/exclude
+excludesrc/test/resources/test.har/_masterindex/exclude
+excludesrc/test/resources/test.har/part-0/exclude
/excludes
/configuration
/plugin
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java?rev=1541758r1=1541757r2=1541758view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
Wed Nov 13 23:23:00 2013
@@ -1329,7 +1329,7 @@ public abstract class FileSystem extends
return new ContentSummary(summary[0], summary[1], summary[2]);
}
- final private static PathFilter DEFAULT_FILTER = new PathFilter() {
+ final protected static PathFilter DEFAULT_FILTER = new PathFilter() {
public boolean accept(Path file) {
return true;
}
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java?rev=1541758r1=1541757r2=1541758view=diff
==
---
