Commit Graph

2588 Commits

Author SHA1 Message Date
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
Robert Joseph Evans eee35a6972 svn merge -c 1309481 FIXES: MAPREDUCE-3650. testGetTokensForHftpFS() fails (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309482 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 16:24:38 +00:00
Robert Joseph Evans 954327f770 svn merge -c 1309453 from trunk FIXES: MAPREDUCE-3082. Archive command take wrong path for input file with current directory (John George via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309454 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 15:30:03 +00:00
Thomas Graves 378ed9b673 merge -r 1309439:1309440 from trunk. FIXES: MAPREDUCE-3682
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309446 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 15:12:24 +00:00
Robert Joseph Evans 03debdda38 moved HADOOP-8088 to 0.23.3
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309435 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 14:57:57 +00:00
Alejandro Abdelnur 4bdf14f6c9 Merge -r 1309431:1309432 from trunk to branch. FIXES: MAPREDUCE-4098
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309434 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 14:57:41 +00:00
Thomas Graves 93af1a43be merge -r 1309400:1309401 from trunk. FIXES: MAPREDUCE-3672
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309403 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 14:18:55 +00:00
Todd Lipcon a32553b31c HADOOP-8007. Use substitution tokens for fencing argument. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309284 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 08:27:09 +00:00
Tsz-wo Sze 785e5f08cc svn merge -c 1309218 from trunk for HDFS-3168. Remove unnecessary "throw IOException" and change fields to final in FSNamesystem and BlockManager.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309219 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 02:59:00 +00:00
Todd Lipcon 98cb813248 HDFS-3187. Upgrade guava to 11.0.2. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309182 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 22:30:38 +00:00
Todd Lipcon 8429acbdb7 HADOOP-8243. Security support broken in CLI (manual) failover controller. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309136 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 20:41:36 +00:00
Thomas Graves 4a3e9514c3 merge -r 1309132:1309133 from trunk. FIXES: MAPREDUCE-4020
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309134 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 20:41:22 +00:00
Tsz-wo Sze 40a8dfa3c6 svn merge -c 1309114 from trunk for HDFS-3176. Use MD5MD5CRC32FileChecksum.readFields() in JsonUtil .
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309116 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 19:47:42 +00:00
Robert Joseph Evans 18a6e47b98 svn merge -c 1309108 from trunk. FIXES MAPREDUCE-3999. Tracking link gives an error if the AppMaster hasn't started yet (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309110 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 19:38:43 +00:00
Tsz-wo Sze e53d39489c svn merge -c 1309103 from trunk for HDFS-3166. Add timeout to Hftp connections.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309104 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 19:28:47 +00:00
Robert Joseph Evans 8b39213000 svn merge -c 1309086 from trunk. FIXES MAPREDUCE-3988. mapreduce.job.local.dir doesn't point to a single directory on a node. (Eric Payne via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309087 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 18:30:38 +00:00
Robert Joseph Evans e76f7b7330 svn merge -c 1309077 from trunk. FIXES MAPREDUCE-4072. User set java.library.path seems to overwrite default creating problems native lib loading (Anupam Seth via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309079 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 18:03:18 +00:00
Robert Joseph Evans c6c7055c83 MAPREDUCE-4062. AM Launcher thread can hang forever (tgraves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309044 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 17:03:53 +00:00
Thomas Graves ef5ca103f6 merge -r 1308975:1308976 from trunk. FIXES: MAPREDUCE-4012
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308985 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 15:39:35 +00:00
Robert Joseph Evans 463a8ca9a5 svn merge -c 1308957 from trunk. FIXES MAPREDUCE-3983. TestTTResourceReporting can fail, and should just be deleted (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308958 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 14:49:01 +00:00
Robert Joseph Evans 8e3046a391 svn merge -c 1308925 from trunk. FIXES MAPREDUCE-4060. Multiple SLF4J binding warning (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308930 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 14:21:02 +00:00
Eli Collins 53227f7c36 HDFS-3148. svn merge -c 1308617 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308620 13f79535-47bb-0310-9956-ffa450edef68
2012-04-02 23:24:09 +00:00