Commit Graph

2476 Commits

Author SHA1 Message Date
Thomas Graves 1a17df6b21 merge -r 1332664:1332665 from trunk. FIXES: MAPREDUCE-4212
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332667 13f79535-47bb-0310-9956-ffa450edef68
2012-05-01 14:11:31 +00:00
Uma Maheswara Rao G e29d76663c merge HDFS-3286. When the threshold value for balancer is zero, unexpected output is displayed. Contributed by Ashish Singhi
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332532 13f79535-47bb-0310-9956-ffa450edef68
2012-05-01 06:51:56 +00:00
Uma Maheswara Rao G b2f524582c merge HDFS-3275
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332528 13f79535-47bb-0310-9956-ffa450edef68
2012-05-01 05:55:16 +00:00
Robert Joseph Evans 08f50ba33b svn merge -c 1332427. FIXES: HADOOP-8335. Improve Configuration's address handling (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332429 13f79535-47bb-0310-9956-ffa450edef68
2012-04-30 21:56:59 +00:00
Tsz-wo Sze 0af11f7bff svn merge -c 1332363 from trunk for HADOOP-8330.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332364 13f79535-47bb-0310-9956-ffa450edef68
2012-04-30 20:13:34 +00:00
Alejandro Abdelnur f49684246e Merge -r 1332344:1332345 from trunk to branch. FIXES: HADOOP-8325
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332346 13f79535-47bb-0310-9956-ffa450edef68
2012-04-30 19:21:47 +00:00
Robert Joseph Evans c90e791502 svn merge -c 1332336. FIXES: HADOOP-8334. HttpServer sometimes returns incorrect port (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332337 13f79535-47bb-0310-9956-ffa450edef68
2012-04-30 18:58:48 +00:00
Thomas Graves 41ce1fa860 merge -r 1332231:1332232 from trunk. FIXES: MAPREDUCE-4206
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332235 13f79535-47bb-0310-9956-ffa450edef68
2012-04-30 15:08:30 +00:00
Robert Joseph Evans f17cf45efe svn merge -c 1332226. FIXES: MAPREDUCE-4209. junit dependency in hadoop-mapreduce-client is missing scope test (Radim Kolar via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332227 13f79535-47bb-0310-9956-ffa450edef68
2012-04-30 14:49:43 +00:00
Thomas Graves 0b6d455dc8 merge -r 1332195:1332196 from trunk. FIXES: MAPREDUCE-3883
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332198 13f79535-47bb-0310-9956-ffa450edef68
2012-04-30 13:44:12 +00:00
Eli Collins 95a762f651 HDFS-3326. svn merge -c 1331626 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331627 13f79535-47bb-0310-9956-ffa450edef68
2012-04-27 23:04:44 +00:00
Tsz-wo Sze 5b56599766 svn merge -c 1331598 from trunk for HDFS-3331. In namenode, check superuser privilege for setBalancerBandwidth and acquire the write lock for finalizeUpgrade.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331599 13f79535-47bb-0310-9956-ffa450edef68
2012-04-27 21:18:59 +00:00
Tsz-wo Sze 73c378c1e7 svn merge -c 1331570 from trunk for HDFS-3334. Fix ByteRangeInputStream stream leakage.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331572 13f79535-47bb-0310-9956-ffa450edef68
2012-04-27 20:14:43 +00:00
Alejandro Abdelnur 596831bcba Merge -r 1331492:1331493 from trunk to branch. FIXES: HDFS-3309
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331494 13f79535-47bb-0310-9956-ffa450edef68
2012-04-27 16:30:56 +00:00
Robert Joseph Evans 0581c7e598 svn merge -c 1331440. FIXES: HADOOP-8305. distcp over viewfs is broken (John George via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331441 13f79535-47bb-0310-9956-ffa450edef68
2012-04-27 14:41:38 +00:00
Tsz-wo Sze be4dfe86af svn merge -c 1331138 from trunk for HDFS-3181. Fix a test case in TestLeaseRecovery2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331139 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 22:45:53 +00:00
Tsz-wo Sze 973ae0114d svn merge -c 1331114 from trunk for HDFS-3322. Use HdfsDataInputStream and HdfsDataOutputStream in Hdfs.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331118 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 21:57:05 +00:00
Alejandro Abdelnur fe7e9ba9d3 Merge -r 1331072:1331073 from trunk to branch. FIXES: HADOOP-8321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331075 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 20:36:43 +00:00
Uma Maheswara Rao G 16d6cbc9ef Merge HDFS-3222. DFSInputStream#openInfo should not silently get the length as 0 when locations length is zero for last partial block. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331067 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 20:25:10 +00:00
Robert Joseph Evans da0f9645a0 svn merge -c 1331046. FIXES: MAPREDUCE-4189. TestContainerManagerSecurity is failing (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331048 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 19:44:22 +00:00
Thomas White e5e15fab74 Merge -r 1331022:1331023 from trunk to branch-2. Fixes: MAPREDUCE-4138
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331029 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 18:48:13 +00:00
Robert Joseph Evans 0f0204c3c2 svn merge -c 1331012. FIXES: MAPREDUCE-4169. Container Logs appear in unsorted order (Jonathan Eagles via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331014 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 18:28:18 +00:00
Aaron Myers 9caa050cf8 HADOOP-8310. FileContext#checkPath should handle URIs with no port. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331008 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 18:21:03 +00:00
Eli Collins 85e160deaa HDFS-3258. svn merge -c 1330613 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330618 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 01:12:24 +00:00
Thomas Graves bb9cfbb052 merge -r 1330559:1330560 from trunk. FIXES: MAPREDUCE-3613
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330561 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 21:14:13 +00:00
Robert Joseph Evans 7f40acc947 svn merge -c 1330552 FIXES: MAPREDUCE-4194. ConcurrentModificationError in DirectoryCollection (Jonathan Eagles via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330555 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 20:53:15 +00:00
Tsz-wo Sze ab658346fb svn merge -c 1330535 from trunk for HDFS-3319. Change DFSOutputStream to not to start a thread in constructors.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330536 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 20:18:35 +00:00
Tsz-wo Sze f65f193d78 svn merge -c 1330506 from trunk for HDFS-3321. Fix safe mode turn off tip message.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330508 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 19:35:47 +00:00
Tsz-wo Sze 376c6918b9 svn merge -c 1330500 from trunk for HDFS-3318. Use BoundedInputStream in ByteRangeInputStream, otherwise, it hangs on transfers >2 GB.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330503 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 19:25:45 +00:00
Thomas Graves 5ea6469304 merge -r 1330444:1330445 from trunk. FIXES: HADOOP-8296
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330446 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 18:00:11 +00:00
Tsz-wo Sze 1968058617 svn merge -c 1330064 from trunk for HDFS-3298. Add HdfsDataOutputStream as a public API.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330437 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 17:42:48 +00:00
Tsz-wo Sze b3787c3d87 Merge r1327788 and r1327790 from trunk for HDFS-3282. Add HdfsDataInputStream as a public API.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330436 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 17:39:13 +00:00
Thomas White a7e688c6a8 Merge -r 1330426:1330427 from trunk to branch-2. Fixes: MAPREDUCE-4193.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330429 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 17:22:53 +00:00
Alejandro Abdelnur b3cc55a45c Merge -r 1330085:1330086 from trunk to branch. FIXES: HADOOP-8314
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330087 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 03:21:37 +00:00
Alejandro Abdelnur bd9d0da9d4 Merge -r 1329993:1329994 from trunk to branch. FIXES: HADOOP-7549
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329996 13f79535-47bb-0310-9956-ffa450edef68
2012-04-24 20:34:59 +00:00
Alejandro Abdelnur 2690acc9d5 Merge -r 1329714:1329715 from trunk to branch. FIXES: HDFS-3314
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329725 13f79535-47bb-0310-9956-ffa450edef68
2012-04-24 13:52:07 +00:00
Alejandro Abdelnur 2eacd6d90a Merge -r 1329712:1329713 from trunk to branch. FIXES: HADOOP-8309
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329720 13f79535-47bb-0310-9956-ffa450edef68
2012-04-24 13:51:24 +00:00
Thomas Graves f8f390b83d merge -r 1329693:1329694 from trunk. FIXES: MAPREDUCE-4079
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329697 13f79535-47bb-0310-9956-ffa450edef68
2012-04-24 13:07:22 +00:00
Eli Collins 11e0a12672 HADOOP-8152. svn merge -c 1329541 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329542 13f79535-47bb-0310-9956-ffa450edef68
2012-04-24 04:00:10 +00:00
Alejandro Abdelnur 37026cea83 Merge -r 1329492:1329493 from trunk to branch. FIXES: MAPREDUCE-4141
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329496 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 22:33:51 +00:00
Alejandro Abdelnur 06428cdcc1 Merge -r 1329489:1329490 from trunk to branch. FIXES: HADOOP-8284
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329495 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 22:33:24 +00:00
Tsz-wo Sze e360e796ef svn merge -c 1329462 from trunk for HDFS-3312. In HftpFileSystem, the namenode URI is non-secure but the delegation tokens have to use secure URI.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329464 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 21:29:18 +00:00
Robert Joseph Evans 88d736ce2b svn merge -c 1329403. FIXES: MAPREDUCE-4133. MR over viewfs is broken (John George via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329405 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 19:46:16 +00:00
Robert Joseph Evans 1fca6cfe03 svn merge -c 1329398 FIXES: MAPREDUCE-4190. Improve web UI for task attempts userlog link (Tom Graves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329399 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 19:39:43 +00:00
Robert Joseph Evans 1ea39ddc3c svn merge -c 1329282 FIXES: MAPREDUCE-3812. Lower default allocation sizes, fix allocation configurations and document them (Harsh J via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329283 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 15:28:19 +00:00
Tsz-wo Sze 89d5bdaa2c svn merge -c 1328541 from trunk for HDFS-3308. Uses canonical URI to select delegation tokens in HftpFileSystem and WebHdfsFileSystem.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328542 13f79535-47bb-0310-9956-ffa450edef68
2012-04-21 00:01:59 +00:00
Aaron Myers 17791eb373 HDFS-3305. GetImageServlet should consider SBN a valid requestor in a secure HA setup. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328116 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 20:46:46 +00:00
Robert Joseph Evans 0c244e8703 svn merge -c 1328111, FIXES: MAPREDUCE-3947. yarn.app.mapreduce.am.resource.mb not documented (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328112 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 20:36:47 +00:00
Alejandro Abdelnur 479e5b0102 Merge -r 1328108:1328109 from trunk to branch. FIXES: MAPREDUCE-3867
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328110 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 20:34:49 +00:00
Robert Joseph Evans 8f4c3499f5 svn merge -c 1328106, FIXES: MAPREDUCE-4129. Lots of unneeded counters log messages (Ahmed Radwan via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328107 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 20:24:45 +00:00