Commit Graph

2800 Commits

Author SHA1 Message Date
Eli Collins 42b6b5fcca HADOOP-8316. svn merge -c 1337334 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337336 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 19:23:15 +00:00
Aaron Myers 35b27ae3f5 HADOOP-8353. hadoop-daemon.sh and yarn-daemon.sh can be misleading on stop. Contributed by Roman Shaposhnik.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337252 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 16:16:55 +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 45bf0a3cac HADOOP-8388. svn merge -c 1336966 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336968 13f79535-47bb-0310-9956-ffa450edef68
2012-05-10 23:50:11 +00:00
Eli Collins 1135c04b40 HADOOP-8361. svn merge -c 1336945 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336947 13f79535-47bb-0310-9956-ffa450edef68
2012-05-10 23:20:17 +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 5ca0fc1b00 HADOOP-7868. svn merge -c 1336491 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336492 13f79535-47bb-0310-9956-ffa450edef68
2012-05-10 06:16:33 +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
Suresh Srinivas 920663da2d HADOOP-8372. Merging change r1336446 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336451 13f79535-47bb-0310-9956-ffa450edef68
2012-05-09 23:25:54 +00:00
Robert Joseph Evans 00f0379a54 svn merge -c 1336399. FIXES: MAPREDUCE-4237. TestNodeStatusUpdater can fail if localhost has a domain associated with it (bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336401 13f79535-47bb-0310-9956-ffa450edef68
2012-05-09 21:10:02 +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
Robert Joseph Evans c581de57a6 svn merge -c 1336299. FIXES: HADOOP-8373. Port RPC.getServerAddress to 0.23 (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336300 13f79535-47bb-0310-9956-ffa450edef68
2012-05-09 17:07:45 +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
Tsz-wo Sze 8a99480f44 svn merge -c 1335661 from trunk for MAPREDUCE-4231.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335662 13f79535-47bb-0310-9956-ffa450edef68
2012-05-08 17:57:07 +00:00
Thomas Graves 9b6535579e merge -r 1335646:1335647 from trunk. FIXES: MAPREDUCE-4215
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335648 13f79535-47bb-0310-9956-ffa450edef68
2012-05-08 17:14:43 +00:00
Robert Joseph Evans c35e442b1b svn merge -c 1335585 FIXES: MAPREDUCE-3850. Avoid redundant calls for tokens in TokenCache (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335587 13f79535-47bb-0310-9956-ffa450edef68
2012-05-08 15:26:11 +00:00
Robert Joseph Evans 4bc2774d79 svn merge -c 1335567 FIXES: MAPREDUCE-4162. Correctly set token service (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335569 13f79535-47bb-0310-9956-ffa450edef68
2012-05-08 15:10:03 +00:00
Robert Joseph Evans 09c2172681 svn merge -c 1335505 FIXES: HADOOP-8341. Fix or filter findbugs issues in hadoop-tools (bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335506 13f79535-47bb-0310-9956-ffa450edef68
2012-05-08 13:22:43 +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
Tsz-wo Sze 239fa432d0 svn merge -c 1335258 from trunk for HADOOP-8359.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335262 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 21:12:09 +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
Thomas White f1e31ebaf2 Merge -r 1335196:1335197 from trunk to branch-2. Fixes: MAPREDUCE-4226
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335198 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 19:07:29 +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
Robert Joseph Evans e54add89a8 svn merge -c 1335096 FIXES: MAPREDUCE-4220. RM apps page starttime/endtime sorts are incorrect (Jonathan Eagles via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335098 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 16:19:34 +00:00
Thomas White af074299c2 Merge -r 1335084:1335085 from trunk to branch-2. Fixes: HADOOP-8328
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335087 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 16:04:16 +00:00
Robert Joseph Evans 7602ae886f svn merge -c 1335075 FIXES: HADOOP-8327. distcpv2 and distcpv1 jars should not coexist (Dave Thompson via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335078 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 15:50:55 +00:00
Harsh J 9c4d5b4c59 svn merge -c 1334603 from trunk. Backport of HADOOP-8323. Reverts HADOOP-7940
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1334606 13f79535-47bb-0310-9956-ffa450edef68
2012-05-06 11:35:49 +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
Robert Joseph Evans 95a0505c60 svn merge -c 1334043. FIXES: MAPREDUCE-3958. RM: Remove RMNodeState and replace it with NodeState (Bikas Saha via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1334045 13f79535-47bb-0310-9956-ffa450edef68
2012-05-04 15:48:13 +00:00
Robert Joseph Evans 13acee63d3 svn merge -c 1334013 FIXES: MAPREDUCE-4048. NullPointerException exception while accessing the Application Master UI (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1334014 13f79535-47bb-0310-9956-ffa450edef68
2012-05-04 15:04:08 +00:00
Alejandro Abdelnur d828c4ffeb Merge -r 1333749:1333750 from trunk to branch. FIXES: HADOOP-8343
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333752 13f79535-47bb-0310-9956-ffa450edef68
2012-05-04 03:34:28 +00:00
Alejandro Abdelnur 9a04fc6caf Merge -r 1333747:1333748 from trunk to branch. FIXES: MAPREDUCE-4205
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333749 13f79535-47bb-0310-9956-ffa450edef68
2012-05-04 03:21:15 +00:00
Alejandro Abdelnur c7a47f2b8f Merge -r 1333745:1333746 from trunk to branch. FIXES: HADOOP-8355
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333747 13f79535-47bb-0310-9956-ffa450edef68
2012-05-04 03:15:27 +00:00