Commit Graph

3307 Commits

Author SHA1 Message Date
Siddharth Seth 243966374b merge YARN-179 from trunk. Fix some unit test failures. (Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401482 13f79535-47bb-0310-9956-ffa450edef68
2012-10-23 21:07:42 +00:00
Siddharth Seth 5d200b2ab3 merge MAPREDUCE-4637 from trunk. Handle TaskAttempt diagnostic updates while in the NEW and UNASSIGNED states. (Contributed by Mayank Bansal)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401475 13f79535-47bb-0310-9956-ffa450edef68
2012-10-23 21:03:17 +00:00
Robert Joseph Evans 36d9f192be svn merge -c 1401325 FIXES: HADOOP-8962. RawLocalFileSystem.listStatus fails when a child filename contains a colon (jlowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401326 13f79535-47bb-0310-9956-ffa450edef68
2012-10-23 15:48:26 +00:00
Robert Joseph Evans a85371a85f svn merge -c 1401321 FIXES: HADOOP-8811. Compile hadoop native library in FreeBSD (Radim Kolar via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401323 13f79535-47bb-0310-9956-ffa450edef68
2012-10-23 15:37:38 +00:00
Daryn Sharp 96cc1ad304 svn merge -c 1401309 FIXES: HDFS-4090. getFileChecksum() result incompatible when called against zero-byte files. (Kihwal Lee via daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401315 13f79535-47bb-0310-9956-ffa450edef68
2012-10-23 15:12:43 +00:00
Suresh Srinivas 3445356801 HADOOP-8900. Changing the contributor to Andy Isaacson. Merging 1401144 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401145 13f79535-47bb-0310-9956-ffa450edef68
2012-10-23 02:44:21 +00:00
Vinod Kumar Vavilapalli 9c70dfcf25 YARN-174. Modify NodeManager to pass the user's configuration even when rebooting. Contributed by Vinod Kumar Vavilapalli.
svn merge --ignore-ancestry -c 1401086 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401088 13f79535-47bb-0310-9956-ffa450edef68
2012-10-22 21:25:56 +00:00
Jason Darrell Lowe 43159cc20d svn merge -c 1401054 FIXES: MAPREDUCE-4740. only .jars can be added to the Distributed Cache classpath. Contributed by Robert Joseph Evans
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401058 13f79535-47bb-0310-9956-ffa450edef68
2012-10-22 19:58:01 +00:00
Tsz-wo Sze 35bd16ad62 svn merge -c 1400986 from trunk for HDFS-4099. Clean up replication code and add more javadoc.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400987 13f79535-47bb-0310-9956-ffa450edef68
2012-10-22 18:32:48 +00:00
Suresh Srinivas 31fc8c504e HADOOP-8951. Merge 1400921 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400926 13f79535-47bb-0310-9956-ffa450edef68
2012-10-22 16:01:58 +00:00
Uma Maheswara Rao G c1b6cc54ab Merge (r1400578) from trunk HDFS-4022. Replication not happening for appended block. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400581 13f79535-47bb-0310-9956-ffa450edef68
2012-10-21 06:41:44 +00:00
Suresh Srinivas 697229786f Merge 1400552 from trunk to change incorrect jira number HADOOP-8923 to HADOOP-8932 introduced in commit r1398883.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400553 13f79535-47bb-0310-9956-ffa450edef68
2012-10-21 01:49:42 +00:00
Tsz-wo Sze a84f9970fa svn merge -c 1400347 from trunk for adding target, .classpath, .project and .settings to svn:ignore.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400348 13f79535-47bb-0310-9956-ffa450edef68
2012-10-20 00:21:54 +00:00
Tsz-wo Sze 01557d0464 svn merge -c 1400345 from trunk for HDFS-4088. Remove "throws QuotaExceededException" from an INodeDirectoryWithQuota constructor.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400346 13f79535-47bb-0310-9956-ffa450edef68
2012-10-20 00:08:14 +00:00
Alejandro Abdelnur e0ced0a835 YARN-140. Add capacity-scheduler-default.xml to provide a default set of configurations for the capacity scheduler. (ahmed via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400337 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 23:18:00 +00:00
Suresh Srinivas 65a52c8e7c HDFS-8948. Merging change 1400324 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400327 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 22:55:20 +00:00
Siddharth Seth aafad662be merge YARN-136 from trunk. Make ClientToAMTokenSecretManager part of RMContext (Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400279 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 20:39:41 +00:00
Vinod Kumar Vavilapalli 3d8fa1d6c4 MAPREDUCE-4733. Reducer can fail to make progress during shuffle if too many reducers complete consecutively. Contributed by Jason Lowe.
svn merge --ignore-ancestry -c 1400264 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400266 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 20:20:03 +00:00
Robert Joseph Evans edd3bc5cc2 svn merge -c 1400192 FIXES: MAPREDUCE-4479. Fix parameter order in assertEquals() in TestCombineInputFileFormat.java (Mariappan Asokan via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400194 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 17:53:18 +00:00
Robert Joseph Evans 767897d631 svn merge -c 1400189 FIXES: YARN-163. Retrieving container log via NM webapp can hang with multibyte characters in log (jlowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400190 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 17:36:26 +00:00
Vinod Kumar Vavilapalli 5944b1c703 MAPREDUCE-4596. Split StateMachine state from states seen by MRClientProtocol for Job, Task and TaskAttempt. Contributed by Siddarth Seth.
svn merge --ignore-ancestry -c 1399976 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399977 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 05:59:25 +00:00
Alejandro Abdelnur 60cd4f4c7a reverting commit 1399959 (HADOOP-8887 again)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399971 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 05:30:30 +00:00
Suresh Srinivas 887e8a22d5 HDFS-4072. Merging change 1399965 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399966 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 04:58:55 +00:00
Alejandro Abdelnur c6f60985a8 HADOOP-8887. Use a Maven plugin to build the native code using CMake. (cmccabe via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399959 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 03:59:39 +00:00
Suresh Srinivas a2b01168e2 HDFS-8887 reverting commit r1399904 due to build failure and other issues
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399949 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 02:22:24 +00:00
Alejandro Abdelnur 26e7aae08e HADOOP-8887. Use a Maven plugin to build the native code using CMake. (cmccabe via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399904 13f79535-47bb-0310-9956-ffa450edef68
2012-10-18 22:49:07 +00:00
Eli Collins a38d2b8c78 HADOOP-8925. Remove the packaging. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399901 13f79535-47bb-0310-9956-ffa450edef68
2012-10-18 22:43:35 +00:00
Tsz-wo Sze d75c1dd9cd svn merge -c 1399866 from trunk for HDFS-4074. Remove the unused default constructor from INode.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399869 13f79535-47bb-0310-9956-ffa450edef68
2012-10-18 21:30:33 +00:00
Tsz-wo Sze a0fb053e7b svn merge -c 1399861 from trunk for HDFS-4073. Two minor improvements to FSDirectory.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399862 13f79535-47bb-0310-9956-ffa450edef68
2012-10-18 21:22:04 +00:00
Vinod Kumar Vavilapalli 9b7e8c4274 YARN-32. Fix TestApplicationTokens to not depend on test order and thus pass on JDK7. Contributed by Vinod Kumar Vavilapali.
svn merge --ignore-ancestry -c 1399795 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399796 13f79535-47bb-0310-9956-ffa450edef68
2012-10-18 19:12:53 +00:00
Eli Collins cd89989aac HDFS-4068. DatanodeID and DatanodeInfo member should be private. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399444 13f79535-47bb-0310-9956-ffa450edef68
2012-10-17 21:38:03 +00:00
Robert Joseph Evans 6d97a5001d svn merge -c 1399426 FIXES: HADOOP-8930. Cumulative code coverage calculation (Andrey Klochkov via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399427 13f79535-47bb-0310-9956-ffa450edef68
2012-10-17 20:51:28 +00:00
Suresh Srinivas 0f49f79ceb HADOOP-8900. Merging change r1399377 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399393 13f79535-47bb-0310-9956-ffa450edef68
2012-10-17 19:01:30 +00:00
Suresh Srinivas 32b27ebec1 HFS-4059. Merging change r1398949 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399391 13f79535-47bb-0310-9956-ffa450edef68
2012-10-17 18:54:59 +00:00
Robert Joseph Evans 070ae0d73e svn merge -c 1399289 FIXES: MAPREDUCE-4721. Task startup time in JHS is same as job startup time. (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399291 13f79535-47bb-0310-9956-ffa450edef68
2012-10-17 15:01:10 +00:00
Eli Collins 7b10aa9f80 HDFS-4029. GenerationStamp should use an AtomicLong. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399097 13f79535-47bb-0310-9956-ffa450edef68
2012-10-17 05:00:04 +00:00
Eli Collins c21eece8d2 HDFS-4055. TestAuditLogs is flaky. Contributed by Binglin Chang
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399094 13f79535-47bb-0310-9956-ffa450edef68
2012-10-17 04:39:28 +00:00
Vinod Kumar Vavilapalli 32d3e4e9f5 YARN-43. Fix TestResourceTrackerService to not depend on test order and thus pass on JDK7. Contributed by Thomas Graves.
svn merge --ignore-ancestry -c 1399066 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399067 13f79535-47bb-0310-9956-ffa450edef68
2012-10-17 01:29:12 +00:00
Aaron Myers 6b11a5e94a HDFS-3997. OfflineImageViewer incorrectly passes value of imageVersion when visiting IS_COMPRESSED element. Contributed by Mithun Radhakrishnan.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399063 13f79535-47bb-0310-9956-ffa450edef68
2012-10-17 01:12:02 +00:00
Vinod Kumar Vavilapalli 7c550ccb09 YARN-161. Fix multiple compiler warnings for unchecked operations in YARN common. Contributed by Chris Nauroth.
svn merge --ignore-ancestry -c 1399056 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399057 13f79535-47bb-0310-9956-ffa450edef68
2012-10-17 00:32:37 +00:00
Eli Collins bd6c745418 HDFS-4061. TestBalancer and TestUnderReplicatedBlocks need timeouts. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399020 13f79535-47bb-0310-9956-ffa450edef68
2012-10-16 22:14:52 +00:00
Eli Collins b5e210f215 HADOOP-8931. Add Java version to startup message. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399015 13f79535-47bb-0310-9956-ffa450edef68
2012-10-16 22:04:26 +00:00
Robert Joseph Evans 0f4838ab6b svn merge -c 1399011. FIXES: MAPREDUCE-4521. mapreduce.user.classpath.first incompatibility with 0.20/1.x (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399012 13f79535-47bb-0310-9956-ffa450edef68
2012-10-16 22:00:51 +00:00
Robert Joseph Evans cad0525464 svn merge -c 1399005. FIXES: HADOOP-8926. hadoop.util.PureJavaCrc32 cache hit-ratio is low for static data (Gopal V via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399006 13f79535-47bb-0310-9956-ffa450edef68
2012-10-16 21:55:01 +00:00
Robert Joseph Evans dc154bd209 HADOOP-8922. Provide alternate JSONP output for JMXJsonServlet to allow javascript in browser (Damien Hardy via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399001 13f79535-47bb-0310-9956-ffa450edef68
2012-10-16 21:40:53 +00:00
Alejandro Abdelnur 4b27351435 HADOOP-8883. Anonymous fallback in KerberosAuthenticator is broken. (rkanter via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1398897 13f79535-47bb-0310-9956-ffa450edef68
2012-10-16 17:43:54 +00:00
Suresh Srinivas c86cccbf3d HADOOP-8932. Merging change 1398883 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1398885 13f79535-47bb-0310-9956-ffa450edef68
2012-10-16 16:57:23 +00:00
Eli Collins 20a5d16b2d HDFS-3985. Add timeouts to TestMulitipleNNDataBlockScanner. Contributed by Todd Lipcon
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1398875 13f79535-47bb-0310-9956-ffa450edef68
2012-10-16 16:29:40 +00:00
Todd Lipcon da255e41f4 HADOOP-8929. Add toString, other improvements for SampleQuantiles. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1398659 13f79535-47bb-0310-9956-ffa450edef68
2012-10-16 06:06:28 +00:00
Eli Collins 85bd8e0b72 HDFS-4058. DirectoryScanner may fail with IOOB if the directory scanning threads return out of volume order. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1398617 13f79535-47bb-0310-9956-ffa450edef68
2012-10-16 02:25:25 +00:00