Commit Graph

2798 Commits

Author SHA1 Message Date
Todd Lipcon 512763f50f HADOOP-8350. Improve NetUtils.getInputStream to return a stream which has a tunable timeout. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333651 13f79535-47bb-0310-9956-ffa450edef68
2012-05-03 21:58:34 +00:00
Todd Lipcon 9c5ec67761 HDFS-3359. DFSClient.close should close cached sockets. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333625 13f79535-47bb-0310-9956-ffa450edef68
2012-05-03 21:13:52 +00:00
Uma Maheswara Rao G 75fab46041 merge HDFS-3332. NullPointerException in DN when directoryscanner is trying to report bad blocks. Contributed by Amith D K.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333589 13f79535-47bb-0310-9956-ffa450edef68
2012-05-03 19:15:08 +00:00
Robert Joseph Evans c9aac0a1d1 svn merge -c 1333579 FIXES: MAPREDUCE-4163. consistently set the bind address (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333580 13f79535-47bb-0310-9956-ffa450edef68
2012-05-03 18:37:01 +00:00
Devaraj Das cd9063fa57 Merge -r 1333556:1333557 from hadoop-trunk onto branch-2. Fixes HADOOP-8346.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333559 13f79535-47bb-0310-9956-ffa450edef68
2012-05-03 17:22:13 +00:00
Eli Collins 8b1b26a3a6 HADOOP-8347. svn merge -c 1333321 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333322 13f79535-47bb-0310-9956-ffa450edef68
2012-05-03 06:42:23 +00:00
Aaron Myers 1372adf39c HDFS-3351. NameNode#initializeGenericKeys should always set fs.defaultFS regardless of whether HA or Federation is enabled. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333300 13f79535-47bb-0310-9956-ffa450edef68
2012-05-03 03:02:14 +00:00
Todd Lipcon 54d6cf02a9 HDFS-3330. If GetImageServlet throws an Error or RTE, response should not have HTTP "OK" status. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333285 13f79535-47bb-0310-9956-ffa450edef68
2012-05-03 01:44:03 +00:00
Alejandro Abdelnur d5defb5e60 Merge -r 1333240:1333241 from trunk to branch. FIXES: MAPREDUCE-4219
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333242 13f79535-47bb-0310-9956-ffa450edef68
2012-05-02 22:54:36 +00:00
Alejandro Abdelnur a2391dad68 Merge -r 1333235:1333236 from trunk to branch. FIXES: HADOOP-3336
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333237 13f79535-47bb-0310-9956-ffa450edef68
2012-05-02 22:48:09 +00:00
Alejandro Abdelnur 3faa2881f9 Merge -r 1333230:1333231 from trunk to branch. FIXES: HADOOP-8214
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333233 13f79535-47bb-0310-9956-ffa450edef68
2012-05-02 22:45:04 +00:00
Alejandro Abdelnur 7a6493914b Merge -r 1333223:1333224 from trunk to branch. FIXES: HADOOP-8342
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333225 13f79535-47bb-0310-9956-ffa450edef68
2012-05-02 21:51:55 +00:00
Robert Joseph Evans 611dffafc7 svn merge -c 1333144 FIXES: MAPREDUCE-4210. Expose listener address for WebApp (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333145 13f79535-47bb-0310-9956-ffa450edef68
2012-05-02 18:28:13 +00:00
Aaron Myers 653bae728f HADOOP-8185. Update namenode -format documentation and add -nonInteractive and -force. Contributed by Arpit Gupta.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333142 13f79535-47bb-0310-9956-ffa450edef68
2012-05-02 18:21:51 +00:00
Robert Joseph Evans 76cc94f43f svn merge -c 1333063 FIXES: MAPREDUCE-3173. MRV2 UI doesn't work properly without internet (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333066 13f79535-47bb-0310-9956-ffa450edef68
2012-05-02 14:44:10 +00:00
Tsz-wo Sze 06770ff55b svn merge -c 1332876 from trunk for HDFS-3339. Change INode to package private.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332877 13f79535-47bb-0310-9956-ffa450edef68
2012-05-01 23:03:36 +00:00
Eli Collins 7c45bfee33 HADOOP-8275. svn merge -c 1332839 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332841 13f79535-47bb-0310-9956-ffa450edef68
2012-05-01 21:28:13 +00:00
Robert Joseph Evans 24ba919e7b svn merge -c 1332821 FIXES: HADOOP-8172. Configuration no longer sets all keys in a deprecated key list. (Anupam Seth via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332823 13f79535-47bb-0310-9956-ffa450edef68
2012-05-01 21:02:17 +00:00
Robert Joseph Evans b9d8f1737b svn merge -c 1332775 FIXES: HADOOP-8317. Update maven-assembly-plugin to 2.3 - fix build on FreeBSD (Radim Kolar via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332776 13f79535-47bb-0310-9956-ffa450edef68
2012-05-01 18:53:08 +00:00
Robert Joseph Evans 007878d3e2 MAPREDUCE-4202. Updating changes to just be branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332728 13f79535-47bb-0310-9956-ffa450edef68
2012-05-01 16:13:53 +00:00
Robert Joseph Evans 5765eb1868 svn merge -c 1332716. FIXES: MAPREDUCE-4202. TestYarnClientProtocolProvider is broken (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332719 13f79535-47bb-0310-9956-ffa450edef68
2012-05-01 16:02:31 +00:00
Robert Joseph Evans 848a2026f2 svn merge -c 1332701 FIXES: MAPREDUCE-4211. Error conditions (missing appid, appid not found) are masked in the RM app page (Jonathan Eagles via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332703 13f79535-47bb-0310-9956-ffa450edef68
2012-05-01 15:36:09 +00:00
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