Commit Graph

2273 Commits

Author SHA1 Message Date
Eli Collins b7ccfa6faa HDFS-3171. svn merge -c 1308014 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308015 13f79535-47bb-0310-9956-ffa450edef68
2012-04-01 03:47:34 +00:00
Eli Collins c482113730 HADOOP-8211. svn merge -c 1308006 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308007 13f79535-47bb-0310-9956-ffa450edef68
2012-04-01 02:54:25 +00:00
Eli Collins 5fc21be8a9 HDFS-3164. svn merge -c 1307890 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1307891 13f79535-47bb-0310-9956-ffa450edef68
2012-03-31 20:02:09 +00:00
Eli Collins 8a1110cc99 HDFS-3172. svn merge -c 1307888 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1307889 13f79535-47bb-0310-9956-ffa450edef68
2012-03-31 19:57:18 +00:00
Aaron Myers 87e83f4a17 HDFS-3070. HDFS balancer doesn't ensure that hdfs-site.xml is loaded. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1307842 13f79535-47bb-0310-9956-ffa450edef68
2012-03-31 16:22:58 +00:00
Alejandro Abdelnur c1ccd60f74 Merge -r 1307622:1307623 from trunk to branch. FIXES: MAPREDUCE-4091
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1307624 13f79535-47bb-0310-9956-ffa450edef68
2012-03-30 21:31:34 +00:00
Eli Collins aa9e43ef08 HDFS-3138. svn merge -c 1307553 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1307555 13f79535-47bb-0310-9956-ffa450edef68
2012-03-30 17:52:39 +00:00
Alejandro Abdelnur cf5dc702c9 Merge -r 1307412:1307413 from trunk to branch. FIXES: MAPREDUCE-3916
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1307414 13f79535-47bb-0310-9956-ffa450edef68
2012-03-30 13:41:40 +00:00
Eli Collins 2c04152f30 HDFS-3137. svn merge -c 1307173 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1307175 13f79535-47bb-0310-9956-ffa450edef68
2012-03-30 00:14:13 +00:00
Aaron Myers 07aead07d6 HDFS-3142. TestHDFSCLI.testAll is failing. Contributed by Brandon Li.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1307136 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 22:02:05 +00:00
Alejandro Abdelnur 4805df8366 Merge -r 1307123:1307124 from trunk to branch. FIXES: MAPREDUCE-4082
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1307129 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 21:50:30 +00:00
Eli Collins 0e04044931 HADOOP-8149. svn merge -c 1307106 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1307107 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 21:01:09 +00:00
Eli Collins 55d9276dd9 MAPREDUCE-3989. svn merge -c 1307102 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1307103 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 20:55:21 +00:00
Eli Collins 9e6390ee19 HDFS-3066. svn merge -c 1307100 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1307101 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 20:51:53 +00:00
Eli Collins 46a46e53b9 HADOOP-8208. svn merge -c 1306935 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306936 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 15:49:36 +00:00
Robert Joseph Evans 581f9b4ca2 svn merge -c 1306901 from trunk to branch-2 FIXES: MAPREDUCE-4081. TestMROutputFormat.java does not compile (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306905 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 15:20:06 +00:00
Arun Murthy 96d4812433 Merge -c 1306736 from trunk to branch-2 to fix MAPREDUCE-3377. Added a unit test to ensure OutputCommitter.checkOutputSpecs is called prior to copying job.xml.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306737 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 07:47:55 +00:00
Siddharth Seth 55639bea52 Merge MAPREDUCE-3955 from trunk. Change MR to use ProtobufRpcEngine from hadoop-common instead of ProtoOverHadoopRpcEngine. (Contributed by Jitendra Nath Pandey)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306690 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 02:04:21 +00:00
Eli Collins ed41b8dfe3 HDFS-3160. svn merge -c 1306665 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306666 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 01:16:26 +00:00
Aaron Myers 979839eb2b HDFS-3158. LiveNodes member of NameNodeMXBean should list non-DFS used space and capacity per DN. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306637 13f79535-47bb-0310-9956-ffa450edef68
2012-03-28 23:02:19 +00:00
Tsz-wo Sze b29fbb0855 svn merge -c 1306582 from trunk for HDFS-3155. Clean up FSDataset implemenation related code.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306585 13f79535-47bb-0310-9956-ffa450edef68
2012-03-28 20:38:44 +00:00
Eli Collins ee241b9987 HDFS-3139. svn merge -c 1306549 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306553 13f79535-47bb-0310-9956-ffa450edef68
2012-03-28 19:36:10 +00:00
Aaron Myers 5384914aa8 HDFS-3143. TestGetBlocks.testGetBlocks is failing. Contributed by Arpit Gupta.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306544 13f79535-47bb-0310-9956-ffa450edef68
2012-03-28 19:05:36 +00:00
Aaron Myers 196f63c2b0 HDFS-3156. TestDFSHAAdmin is failing post HADOOP-8202. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306513 13f79535-47bb-0310-9956-ffa450edef68
2012-03-28 17:53:08 +00:00
Arun Murthy 111c4a4bb5 Fixed CHANGES.txt to track Release 2.0.0.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306197 13f79535-47bb-0310-9956-ffa450edef68
2012-03-28 07:30:01 +00:00
Arun Murthy 3e8925aa92 Changed version in branch-2 to 2.0.0-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306193 13f79535-47bb-0310-9956-ffa450edef68
2012-03-28 07:25:51 +00:00
Arun Murthy a7143a9025 Rename branch-0.23 to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306187 13f79535-47bb-0310-9956-ffa450edef68
2012-03-28 07:06:22 +00:00
Todd Lipcon ddef0a75bd HADOOP-8218. RPC.closeProxy shouldn't throw error when closing a mock. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1306160 13f79535-47bb-0310-9956-ffa450edef68
2012-03-28 04:52:51 +00:00
Eli Collins 0e3be7e01e HADOOP-8216. svn merge -c 1305891 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1305892 13f79535-47bb-0310-9956-ffa450edef68
2012-03-27 16:34:13 +00:00
Suresh Srinivas 2f20f8d140 HDFS-8202. Merging change 1305704 from trunk to 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1305723 13f79535-47bb-0310-9956-ffa450edef68
2012-03-27 03:38:37 +00:00
Todd Lipcon 1340df3b0b HADOOP-8206. Common portion of a ZK-based failover controller. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1305672 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 23:37:25 +00:00
Tsz-wo Sze 28c307519a svn merge -c 1305632 from trunk for HDFS-2413. Add an API DistributedFileSystem.isInSafeMode() and change DistributedFileSystem to @InterfaceAudience.LimitedPrivate.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1305633 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 22:19:30 +00:00
Eli Collins 1cbb18d3e0 svn merge -c 1305628 HDFS-3129 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1305630 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 22:13:39 +00:00
Robert Joseph Evans e7ec8a44b6 svn merge -c 1305607 trunk to branch-0.23 FIXES: MAPREDUCE-4061. RM only has 1 AM launcher thread (tgraves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1305608 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 21:25:16 +00:00
Tsz-wo Sze 6fc0b02fd4 svn merge -c 1305603 from trunk for HDFS-3089. Move FSDatasetInterface and the related classes to a package.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1305606 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 21:19:51 +00:00
Tsz-wo Sze e6e96aa2f0 Revert 1305594 for HDFS-3089.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1305600 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 21:10:29 +00:00
Tsz-wo Sze 4ce47fbbf8 svn merge -c 1305590 from trunk for HDFS-3089. Move FSDatasetInterface and the related classes to a package.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1305594 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 21:04:07 +00:00
Todd Lipcon 63cecaa405 HADOOP-8212. Improve ActiveStandbyElector's behavior when session expires. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1305509 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 19:31:32 +00:00
Arun Murthy debf11cc3f MAPREDUCE-3353. Fixed commit msg to point to right jira.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1305458 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 17:30:55 +00:00
Aaron Myers 7fb62a08e8 HDFS-2941. Add an administrative command to download a copy of the fsimage from the NN. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1305450 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 17:08:16 +00:00
Harsh J 92f06cb446 svn merge -c 1305343. Merge MAPREDUCE-4066 into branch-0.23 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1305348 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 13:31:08 +00:00
Arun Murthy efe3382159 Merge -c 1305230 from trunk to branch-0.23 to fix MAPREDUCE-3533. Add a channel between RM and AM to get information on nodes. Contributed by Bikas Saha.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1305231 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 05:46:55 +00:00
Todd Lipcon bf39110389 HADOOP-8204. TestHealthMonitor fails occasionally. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1305198 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 01:56:54 +00:00
Todd Lipcon fe16f40289 HADOOP-8193. Refactor FailoverController/HAAdmin code to add an abstract class for "target" services. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1305196 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 01:54:22 +00:00
Todd Lipcon 81878db486 Revert HADOOP-8193 from r1304968. Patch introduced some NPEs in a test case.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1305151 13f79535-47bb-0310-9956-ffa450edef68
2012-03-25 21:38:28 +00:00
Todd Lipcon 00796d4cf4 HADOOP-8193. Refactor FailoverController/HAAdmin code to add an abstract class for "target" services. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1304968 13f79535-47bb-0310-9956-ffa450edef68
2012-03-24 23:48:17 +00:00
Todd Lipcon 8309c8f182 HDFS-3132. Fix findbugs warning on HDFS trunk. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1304682 13f79535-47bb-0310-9956-ffa450edef68
2012-03-24 00:21:58 +00:00
Todd Lipcon 97c17afccc HADOOP-8163. Improve ActiveStandbyElector to provide hooks for fencing old active. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1304676 13f79535-47bb-0310-9956-ffa450edef68
2012-03-24 00:05:40 +00:00
Thomas White cb7add5de2 Merge -r 1304596:1304597 from trunk to branch-0.23. Fixes: HADOOP-7030
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1304599 13f79535-47bb-0310-9956-ffa450edef68
2012-03-23 21:06:47 +00:00
Robert Joseph Evans 1f3e5ebc0b svn merge -c 1304587 from trunk to branch-0.23 FIXES: MAPREDUCE-4043. Secret keys set in Credentials are not seen by tasks (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1304593 13f79535-47bb-0310-9956-ffa450edef68
2012-03-23 20:52:42 +00:00