Commit Graph

2359 Commits

Author SHA1 Message Date
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
Eli Collins d2bdd7b66e HDFS-3208. svn merge -c 1310138 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310140 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 00:24:26 +00:00
Eli Collins 879c0ec2b0 HDFS-3210. svn merge -c 1310135 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310137 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 00:14:32 +00:00
Robert Joseph Evans 401d4b3584 svn merge -c 1310056 from trunk. FIXES: MAPREDUCE-4073. CS assigns multiple off-switch containers when using multi-level-queues (Siddharth Seth via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310057 13f79535-47bb-0310-9956-ffa450edef68
2012-04-05 20:29:01 +00:00
Thomas Graves 0d388cd1f4 merge -r 1310042:1310043 from trunk. FIXES: MAPREDUCE-3621
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310045 13f79535-47bb-0310-9956-ffa450edef68
2012-04-05 20:13:11 +00:00
Thomas Graves 53c866784b merge -r 1310035:1310036 from trunk. FIXES: HADOOP-8180
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310037 13f79535-47bb-0310-9956-ffa450edef68
2012-04-05 19:40:04 +00:00
Robert Joseph Evans 5932e06047 Moved HADOOP-6963 into 0.23.3
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310021 13f79535-47bb-0310-9956-ffa450edef68
2012-04-05 19:17:09 +00:00
Tsz-wo Sze 9658ad4f49 svn merge -c 1309994 from trunk for HADOOP-6963.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309997 13f79535-47bb-0310-9956-ffa450edef68
2012-04-05 18:30:24 +00:00
Suresh Srinivas 6e9eb85f22 HDFS-3109. Merging change r1309971 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309974 13f79535-47bb-0310-9956-ffa450edef68
2012-04-05 17:47:52 +00:00
Aaron Myers d13cb8a1d4 HDFS-3202. NamespaceInfo PB translation drops build version. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309957 13f79535-47bb-0310-9956-ffa450edef68
2012-04-05 17:22:20 +00:00
Eli Collins 3a981de558 HDFS-3199. svn merge -c 1309641 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309642 13f79535-47bb-0310-9956-ffa450edef68
2012-04-05 03:33:43 +00:00
Eli Collins 6896eea01b HDFS-3050. svn merge -c 1309629 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309630 13f79535-47bb-0310-9956-ffa450edef68
2012-04-05 00:03:58 +00:00
Alejandro Abdelnur 98f0abb721 Merge -r 1309582:1309583 from trunk to branch. FIXES: MAPREDUCE-4097
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309584 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 20:25:18 +00:00
Aaron Myers 929989e0d3 HDFS-3102. Add CLI tool to initialize the shared-edits dir. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309582 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 20:19:54 +00:00
Robert Joseph Evans 764453c81f svn merge -c 1309572 from trunk. FIXES HADOOP-8179. risk of NPE in CopyCommands processArguments() (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309573 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 19:54:14 +00:00
Todd Lipcon 3c7d74132b MAPREDUCE-4103. Fix HA docs for changes to shell command fencer args. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309535 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 18:46:28 +00:00
Todd Lipcon e5990c53e8 HDFS-3084. FenceMethod.tryFence() and ShellCommandFencer should pass namenodeId as well as host:port. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309529 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 18:43:10 +00:00
Aaron Myers 4f720e23ca HDFS-3000. Add a public API for setting quotas. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309490 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 16:47:46 +00:00
Eli Collins ed22c28058 Merge HDFS-2564 (Cleanup unnecessary exceptions thrown and unnecessary casts)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309487 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 16:40:04 +00:00