Commit Graph

502 Commits

Author SHA1 Message Date
Eli Collins 5ea3d6cf5d HDFS-3416. svn merge -c 1338784 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1338800 13f79535-47bb-0310-9956-ffa450edef68
2012-05-15 17:20:53 +00:00
Eli Collins b20ef722c5 HDFS-3417. svn merge -c 1338767 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1338780 13f79535-47bb-0310-9956-ffa450edef68
2012-05-15 16:17:21 +00:00
Todd Lipcon 715b4cfad1 HDFS-3335. check for edit log corruption at the end of the log. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1338493 13f79535-47bb-0310-9956-ffa450edef68
2012-05-15 00:41:53 +00:00
Todd Lipcon 201038272f HDFS-2759. Pre-allocate HDFS edit log files after writing version number. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1338489 13f79535-47bb-0310-9956-ffa450edef68
2012-05-15 00:31:35 +00:00
Todd Lipcon b81b987be8 HDFS-3031. Fix complete() and getAdditionalBlock() RPCs to be idempotent. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1338467 13f79535-47bb-0310-9956-ffa450edef68
2012-05-14 22:35:57 +00:00
Aaron Myers c0bacb578b HDFS-3414. Balancer does not find NameNode if rpc-address or servicerpc-address are not set in client configs. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1338277 13f79535-47bb-0310-9956-ffa450edef68
2012-05-14 16:28:23 +00:00
Aaron Myers 8cb6cc9d91 HDFS-3404. Make putImage in GetImageServlet infer remote address to fetch from request. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337756 13f79535-47bb-0310-9956-ffa450edef68
2012-05-13 02:57:41 +00:00
Tsz-wo Sze a5da2f6d68 Merge r1329319 for HADOOP-8285 for the changes outside common.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337433 13f79535-47bb-0310-9956-ffa450edef68
2012-05-12 02:19:58 +00:00
Tsz-wo Sze c0795cd107 svn merge -c 1310649 from trunk for HDFS-3211. Add fence(..) and replace NamenodeRegistration with JournalInfo and epoch in JournalProtocol.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337423 13f79535-47bb-0310-9956-ffa450edef68
2012-05-12 01:04:44 +00:00
Thomas White dc576b9fa1 Merge -r 1337198:1337199 from trunk to branch-2. Fixes: MAPREDUCE-4148.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337200 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 15:04:24 +00:00
Aaron Myers 97a8118315 HDFS-3026. HA: Handle failure during HA state transition. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337031 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 06:02:33 +00:00
Eli Collins 6795b5ad8f HDFS-3400. svn merge -c 1337017 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337018 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 03:16:28 +00:00
Tsz-wo Sze c68efee78c svn merge -c 1336976 from trunk for HDFS-3385. The last block of INodeFileUnderConstruction is not necessarily a BlockInfoUnderConstruction, so do not cast it in FSNamesystem.recoverLeaseInternal(..).
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336977 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 00:27:08 +00:00
Eli Collins c9a9756a2c HDFS-3401. svn merge -c 1336972 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336973 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 00:05:15 +00:00
Eli Collins a43a9cfe1a HDFS-3134. svn merge -c 1336943 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336944 13f79535-47bb-0310-9956-ffa450edef68
2012-05-10 23:15:19 +00:00
Tsz-wo Sze b41b4e9c43 svn merge -c 1336909 from trunk for HDFS-3369. Rename {get|set|add}INode(..) methods in BlockManager and BlocksMap to {get|set|add}BlockCollection(..).
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336911 13f79535-47bb-0310-9956-ffa450edef68
2012-05-10 21:45:45 +00:00
Eli Collins 2dd260be1b HDFS-3230. svn merge -c 1336815 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336867 13f79535-47bb-0310-9956-ffa450edef68
2012-05-10 20:08:41 +00:00
Aaron Myers 8ae40b7085 HDFS-3395. NN doesn't start with HA+security enabled and HTTP address set to 0.0.0.0. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336693 13f79535-47bb-0310-9956-ffa450edef68
2012-05-10 13:53:30 +00:00
Uma Maheswara Rao G 6209fed67d Reverting (Need to re-do the patch. new BlockInfo does not set iNode )HDFS-3157. Error in deleting block is keep on coming from DN even after the block report and direc
tory scanning has happened.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336576 13f79535-47bb-0310-9956-ffa450edef68
2012-05-10 10:10:03 +00:00
Eli Collins 51c1985bc9 HDFS-3396. svn merge -c 1336495 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336496 13f79535-47bb-0310-9956-ffa450edef68
2012-05-10 06:32:12 +00:00
Eli Collins 037c8e99c1 HDFS-3328. svn merge -c 1336480 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336481 13f79535-47bb-0310-9956-ffa450edef68
2012-05-10 04:54:50 +00:00
Todd Lipcon d0f920fba8 HDFS-3341, HADOOP-8340. SNAPSHOT build versions should compare as less than their eventual release. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336460 13f79535-47bb-0310-9956-ffa450edef68
2012-05-10 00:44:52 +00:00
Aaron Myers 34b9bc4e7f HDFS-3390. DFSAdmin should print full stack traces of errors when DEBUG logging is enabled. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336327 13f79535-47bb-0310-9956-ffa450edef68
2012-05-09 18:21:38 +00:00
Uma Maheswara Rao G 1c52a01422 HDFS-234. Integration with BookKeeper logging system. Contributed by Ivan Kelly.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336103 13f79535-47bb-0310-9956-ffa450edef68
2012-05-09 11:32:40 +00:00
Tsz-wo Sze 16bdd99dfd svn merge -c 1335788 from trunk for removing the empty file FSInodeInfo.java for HDFS-3363.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335789 13f79535-47bb-0310-9956-ffa450edef68
2012-05-08 21:55:47 +00:00
Uma Maheswara Rao G 0a9b3c4401 merge HDFS-3157. Error in deleting block is keep on coming from DN even after the block report and directory scanning has happened. Contributed by Ashish Singhi.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335723 13f79535-47bb-0310-9956-ffa450edef68
2012-05-08 19:53:04 +00:00
Eli Collins 797da76660 HDFS-3378. svn merge -c 1335309 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335310 13f79535-47bb-0310-9956-ffa450edef68
2012-05-08 00:29:06 +00:00
Tsz-wo Sze d8156648fe svn merge -c 1335304 from trunk for HDFS-3363. Define BlockCollection and MutableBlockCollection interfaces so that INodeFile and INodeFileUnderConstruction do not have to be used in block management.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335305 13f79535-47bb-0310-9956-ffa450edef68
2012-05-08 00:08:12 +00:00
Todd Lipcon adeb718f2b HDFS-3375. Put client name in DataXceiver thread name for readBlock and keepalive. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335271 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 21:34:38 +00:00
Todd Lipcon 4fa0dd2278 HDFS-3365. Enable users to disable socket caching in DFS client configuration. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335221 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 19:56:15 +00:00
Todd Lipcon c5434d6a88 HDFS-3376. DFSClient fails to make connection to DN if there are many unusable cached sockets. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335114 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 16:42:08 +00:00
Aaron Myers 1409441e45 HADOOP-8349. ViewFS doesn't work when the root of a file system is mounted. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1334233 13f79535-47bb-0310-9956-ffa450edef68
2012-05-04 22:16:44 +00:00
Eli Collins 2c4faa4b9c HDFS-2617. svn merge -c 1334216 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1334225 13f79535-47bb-0310-9956-ffa450edef68
2012-05-04 22:07:09 +00:00
Tsz-wo Sze 6096db181d svn merge -c 1334156 from trunk for HDFS-3303. Remove Writable implementation from RemoteEditLogManifest.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1334157 13f79535-47bb-0310-9956-ffa450edef68
2012-05-04 20:18:47 +00:00
Todd Lipcon e63d0b2667 HDFS-3357. DataXceiver reads from client socket with incorrect/no timeout. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1334115 13f79535-47bb-0310-9956-ffa450edef68
2012-05-04 18:50:41 +00:00
Tsz-wo Sze 05c08efa68 svn merge -c 1333679 from trunk for HDFS-3350. In INode, add final to compareTo(..), equals(..) and hashCode(), and remove synchronized from updatePermissionStatus(..).
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333680 13f79535-47bb-0310-9956-ffa450edef68
2012-05-03 23:34:35 +00:00
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
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 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
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
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
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
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