Commit Graph

2377 Commits

Author SHA1 Message Date
Aaron Myers 5e1ce633a2 HDFS-2983. Relax the build version check to permit rolling upgrades within a release. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325113 13f79535-47bb-0310-9956-ffa450edef68
2012-04-12 03:55:51 +00:00
Eli Collins d64a8d3e2c svn merge -c 1325069 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325070 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 23:59:20 +00:00
Thomas Graves d31abfe3f8 merge -r 1325009:1325010 from trunk. FIXES: MAPREDUCE-4107
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325011 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 21:14:55 +00:00
Siddharth Seth 462f9a5249 MAPREDUCE-3932. Fix the TaskAttempt state machine to handle CONTIANER_LAUNCHED and CONTIANER_LAUNCH_FAILED events in additional states. (Contributed by Robert Joseph Evans)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1324903 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 18:20:08 +00:00
Tsz-wo Sze 415e7fecb1 svn merge -c 1324892 from trunk for HDFS-3179. Improve the exception message thrown by DataStreamer when it failed to add a datanode.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1324894 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 17:52:44 +00:00
Siddharth Seth 50c13a44af merge MAPREDUCE-4099 amendment from trunk. ApplicationMaster will remove staging directory after the history service is stopped. (Contributed by Jason Lowe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1324868 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 17:11:34 +00:00
Eli Collins fac3cadf08 HDFS-3254. Branch-2 build broken due to wrong version number in fuse-dfs' pom.xml. Contributed by Anupam Seth
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1324856 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 16:39:22 +00:00
Todd Lipcon 3272a1c2f8 HDFS-3249. Use ToolRunner.confirmPrompt in NameNode. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1324563 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 05:28:51 +00:00
Todd Lipcon f47d418e07 HDFS-3247. Improve bootstrapStandby behavior when original NN is not active. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1324559 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 05:16:28 +00:00
Siddharth Seth 40497a9d04 merge MAPREDUCE-4040 from trunk. History links should use hostname rather than IP address. (Contributed by Bhallamudi Venkata Siva Kamesh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1312077 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 02:52:13 +00:00
Eli Collins e9180d1e5b HDFS-2696. svn merge -c 1312068 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1312069 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 01:56:32 +00:00
Eli Collins a9ae92eb76 HDFS-3244. svn merge -c 1312061 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1312065 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 01:20:08 +00:00
Todd Lipcon e78aaef526 HDFS-3248. bootstrapStandby repeated twice in hdfs namenode usage message. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1312027 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 22:28:12 +00:00
Todd Lipcon bb7bf7ab6c HDFS-3094. add -nonInteractive and -force option to namenode -format command. Contributed by Arpit Gupta.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1312024 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 22:22:29 +00:00
Thomas Graves 15d3d52f1b merge -r 1312017:1312018 from trunk. FIXES: MAPREDUCE-4108
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1312020 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 22:10:34 +00:00
Robert Joseph Evans 3cf79f4c7e svn merge -c 1312003 from trunk. FIXES: MAPREDUCE-4076. Stream job fails with ZipException when use yarn jar command (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1312004 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 21:31:41 +00:00
Robert Joseph Evans b04f23fc96 svn merge -c 1311972 from trunk. FIXES: MAPREDUCE-4017. Add jobname to jobsummary log (tgraves and Koji Noguchi via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311973 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 20:37:13 +00:00
Tsz-wo Sze b46380e463 svn merge -c 1311959 from trunk for MAPREDUCE-4057.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311960 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 19:50:09 +00:00
Robert Joseph Evans 07321a677c svn merge -c 1311926 from trunk. FIXES: MAPREDUCE-4099. ApplicationMaster may fail to remove staging directory (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311927 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 18:59:03 +00:00
Thomas Graves ce9bdceac7 merge -r 1311895:1311896 from trunk. FIXES: MAPREDUCE-4059
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311897 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 18:13:09 +00:00
Robert Joseph Evans a2c86e8e3d MAPREDUCE-3983. TestTTResourceReporting can fail, and should just be deleted
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311823 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 16:14:59 +00:00
Eli Collins 73f775f865 HDFS-3238. svn merge -c 1311774 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311775 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 15:06:00 +00:00
Robert Joseph Evans e3901a1e5f svn merge -c 1311738 from trunk. FIXES HADOOP-8264. Remove irritating double double quotes in front of hostname (Bernd Fondermann via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311741 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 14:13:03 +00:00
Todd Lipcon 8c1026b4c5 HDFS-3240. Drop log level of "heartbeat: ..." in BPServiceActor to DEBUG. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311576 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 05:11:53 +00:00
Aaron Myers e10e3c0c20 HDFS-3236. NameNode does not initialize generic conf keys when started with -initializeSharedEditsDir. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311555 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 02:20:07 +00:00
Todd Lipcon 72c44aa50e HADOOP-8263. Stringification of IPC calls not useful. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311542 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 01:02:00 +00:00
Todd Lipcon 5293bf2910 HDFS-3234. Accidentally left log message in GetConf after HDFS-3226. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311540 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 00:59:17 +00:00
Siddharth Seth 5f535af454 Merge MAPREDUCE-3869 from trunk. Fix classpath for DistributedShell application. (Contributed by Devaraj K)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311524 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 00:02:57 +00:00
Thomas White de5069a6a1 Merge -r 1311519:1311520 from trunk to branch-2. Fixes MAPREDUCE-4105.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311521 13f79535-47bb-0310-9956-ffa450edef68
2012-04-09 23:35:21 +00:00
Robert Joseph Evans f9e39d057e svn merge -c 1311479 from trunk. FIXES: MAPREDUCE-4117. mapred job -status throws NullPointerException (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311480 13f79535-47bb-0310-9956-ffa450edef68
2012-04-09 21:54:22 +00:00
Eli Collins 70142209b9 HDFS-3004. svn merge -c 1311394 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311401 13f79535-47bb-0310-9956-ffa450edef68
2012-04-09 19:47:08 +00:00
Uma Maheswara Rao G 75f105d0b4 HDFS-3119. Overreplicated block is not deleted even after the replication factor is reduced after sync follwed by closing that file. Contributed by Ashish Singhi.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311391 13f79535-47bb-0310-9956-ffa450edef68
2012-04-09 19:28:32 +00:00
Aaron Myers 8d6142756c HADOOP-8261. Har file system doesn't deal with FS URIs with a host but no port. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311134 13f79535-47bb-0310-9956-ffa450edef68
2012-04-09 06:02:26 +00:00
Todd Lipcon 78b3f4493a HDFS-3214. InterDatanodeProtocolServerSideTranslatorPB doesn't handle null response from initReplicaRecovery. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311124 13f79535-47bb-0310-9956-ffa450edef68
2012-04-09 03:22:33 +00:00
Todd Lipcon e98b53b370 HDFS-3226. Allow GetConf tool to print arbitrary keys. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310647 13f79535-47bb-0310-9956-ffa450edef68
2012-04-07 00:15:16 +00:00
Tsz-wo Sze 95ab2e4cc4 svn merge -c 1310522 from trunk for HDFS-2505. Add a test to verify getFileChecksum(..) with ViewFS.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310570 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 20:16:10 +00:00
Robert Joseph Evans 906589c912 HADOOP-8014. ViewFileSystem does not correctly implement getDefaultBlockSize, getDefaultReplication, getContentSummary
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310556 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 19:16:47 +00:00
Robert Joseph Evans ea165d6e91 svn merge -c 1310546 FIXES: MAPREDUCE-4110. Fix tests in TestMiniMRClasspath & TestMiniMRWithDFSWithDistinctUsers (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310547 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 18:57:44 +00:00
Arun Murthy 9562831e74 Added toString to ContainerToken. Contributed by Jason Lowe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310538 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 18:41:51 +00:00
Robert Joseph Evans 34ed535299 svn merge -c 1310528 from trunk. FIXES: MAPREDUCE-4051. Remove the empty hadoop-mapreduce-project/assembly/all.xml file (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310529 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 18:10:11 +00:00
Robert Joseph Evans 4d7187cd1d svn merge -c 1310507 from trunk. FIXES: HADOOP-8014. ViewFileSystem does not correctly implement getDefaultBlockSize, getDefaultReplication, getContentSummary (John George via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310510 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 17:56:41 +00:00
Suresh Srinivas 089f6ca742 HDFS-3136. Merge r1310476 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310477 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 16:51:15 +00:00
Suresh Srinivas 38a8b52eba HDFS-3023. Merging change r1310134 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310473 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 16:47:31 +00:00
Robert Joseph Evans 6514ecce13 svn merge -c 1310431 from trunk. FIXES: MAPREDUCE-4111. Fix tests in org.apache.hadoop.mapred.TestJobName (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310432 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 16:05:36 +00:00
Robert Joseph Evans cbbddcb3ca svn merge -c 1310418 from trunk. FIXES: MAPREDUCE-4112. Fix tests org.apache.hadoop.mapred.TestClusterMapReduceTestCase (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310421 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 15:58:36 +00:00
Robert Joseph Evans 7c087c4a9b svn merge -c 1310409 from trunk. FIXES: MAPREDUCE-4113. Fix tests org.apache.hadoop.mapred.TestClusterMRNotification (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310412 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 15:51:07 +00:00
Alejandro Abdelnur fbe5e35742 Merge -r 1310234:1310235 from trunk to branch. FIXES: HADOOP-8249
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310238 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 08:48:09 +00:00
Alejandro Abdelnur a6dd605132 Merge -r 1310232:1310233 from trunk to branch. FIXES: HADOOP-8086
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310236 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 08:47:07 +00:00
Todd Lipcon 65cca13ec4 HADOOP-8077. HA: fencing method should be able to be configured on a per-NN or per-NS basis. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310172 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 04:56:16 +00:00
Todd Lipcon 37c3d51954 HADOOP-8251. Fix SecurityUtil.fetchServiceTicket after HADOOP-6941. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310167 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 04:46:59 +00:00