Commit Graph

3336 Commits

Author SHA1 Message Date
Vinod Kumar Vavilapalli
cfbde6ac0f MAPREDUCE-3484. Fixed JobEndNotifier to not get interrupted before completing all its retries. Contributed by Ravi Prakash.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214563 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 23:58:35 +00:00
Todd Lipcon
b77c107ccb Committing rest of merge from trunk (accidentally only committed the HDFS portion before)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214546 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 23:34:04 +00:00
Todd Lipcon
ecdf9da770 Fix treatment of NNHAStatusHeartbeat in protobuffer.
Committing without pre-commit review since it's a pretty trivial merge fix


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214543 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 23:28:43 +00:00
Todd Lipcon
8134b1c870 Merge trunk into HA branch.
Several conflicts around introduction of protobuf translator for DatanodeProtocol - mostly trivial resolutions.

NB: this does not successfully pass any tests since the HAStatus field needs
to be integrated into the HeartbeatResponse Protobuf implementation.
That will be a separate commit for clearer history.



git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214518 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 22:47:41 +00:00
Doug Cutting
3758710bff HADOOP-7920. Remove a few more bits that are no longer required.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214499 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 21:57:55 +00:00
Todd Lipcon
6c2da4bc0f HDFS-2680. DFSClient should construct failover proxy with exponential backoff. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214487 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 21:41:31 +00:00
Vinod Kumar Vavilapalli
c32ca00a75 MAPREDUCE-3530. Fixed an NPE occuring during scheduling in the ResourceManager. Contributed by Arun C Murthy.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214476 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 21:22:32 +00:00
Vinod Kumar Vavilapalli
50fa9b89f4 MAPREDUCE-3398. Fixed log aggregation to work correctly in secure mode. Contributed by Siddharth Seth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214429 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 19:55:22 +00:00
Mahadev Konar
739f8871f2 MAPREDUCE-3541. Fix broken TestJobQueueClient test. (Ravi Prakash via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214421 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 19:45:59 +00:00
Alejandro Abdelnur
2e6c75a062 MAPREDUCE-3557. MR1 test fail to compile because of missing hadoop-archives dependency. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214354 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 17:21:43 +00:00
Sanjay Radia
d8dfcdcbc2 HDFS-2669 Enable protobuf rpc for ClientNamenodeProtocol
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214128 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 09:27:51 +00:00
Todd Lipcon
7e8accd68e HDFS-2671. NN should throw StandbyException in response to RPCs in STANDBY state. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214117 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 08:56:21 +00:00
Suresh Srinivas
d9c9fb913e HADOOP-7920. Remove Avro Rpc. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214114 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 08:45:59 +00:00
Suresh Srinivas
f7f5e51431 Missed deleting the files in r1214066
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214106 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 08:30:37 +00:00
Suresh Srinivas
95bdb29aaf r1214102 should have removed the file. Committing this to remove empty file.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214103 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 08:25:47 +00:00
Suresh Srinivas
60dd76c6ab HDFS-2676. Remove Avro RPC. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214102 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 08:20:23 +00:00
Todd Lipcon
b9238e3bad HDFS-2675. Reduce warning verbosity when double-closing edit logs. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214098 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 08:13:55 +00:00
Todd Lipcon
d5a658e7a4 HADOOP-7921. StandbyException should extend IOException. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214093 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 08:10:34 +00:00
Todd Lipcon
9cf3e0805f HADOOP-7922. Improve some logging for client IPC failovers and StandbyExceptions. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214082 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 07:51:30 +00:00
Aaron Myers
9818091a66 HADOOP-7896. HA: if both NNs are in Standby mode, client needs to try failing back and forth several times with sleeps. Contributed by Aaron T. Myers
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214076 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 07:24:36 +00:00
Suresh Srinivas
ec4971a280 MAPREDUCE-3545. Remove Avro RPC. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214066 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 06:57:00 +00:00
Eli Collins
bdc2a77d6b HDFS-2649. eclipse:eclipse build fails for hadoop-hdfs-httpfs. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214046 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 03:42:24 +00:00
Jitendra Nath Pandey
3cffe34177 HDFS-2661. Enable protobuf RPC for DatanodeProtocol.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214033 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 02:15:37 +00:00
Tsz-wo Sze
433a6e78f6 HDFS-2545. Change WebHDFS to support multiple namenodes in federation.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214027 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 01:47:57 +00:00
Alejandro Abdelnur
a839f875e8 MAPREDUCE-3544. gridmix build is broken, requires hadoop-archives to be added as ivy dependency. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214017 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 01:18:14 +00:00
Vinod Kumar Vavilapalli
b7ae5a6cb7 MAPREDUCE-3426. Fixed MR AM in uber mode to write map intermediate outputs in the correct directory to work properly in secure mode. Contributed by Hitesh Shah.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213987 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 23:35:11 +00:00
Suresh Srinivas
3954a2fb1c HDFS-2663. Optional protobuf parameters are not handled correctly. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213985 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 23:31:44 +00:00
Suresh Srinivas
6a609cb471 Reverting the patch r1213981
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213984 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 23:27:58 +00:00
Jitendra Nath Pandey
1f2f4e105b HDFS-234. Integration with BookKeeper logging system. Contributed by Ivan Kelly.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213983 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 23:27:13 +00:00
Suresh Srinivas
b5229fd19b HDFS-2663. Optional protobuf parameters are not handled correctly. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213981 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 23:22:28 +00:00
Suresh Srinivas
3001a172c8 Reverting r1213512 because it committed changes that were not part of the patch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213980 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 23:17:02 +00:00
Vinod Kumar Vavilapalli
0ea8570be5 MAPREDUCE-2863. Support web services for YARN and MR components. (Thomas Graves via vinodkv)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213975 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 23:05:56 +00:00
Thomas White
37b8cc3f19 MAPREDUCE-3542. Support "FileSystemCounter" legacy counter group name for compatibility.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213971 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 22:59:49 +00:00
Todd Lipcon
fac14e799a HADOOP-7892. IPC logs too verbose after "RpcKind" introduction. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213954 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 21:59:34 +00:00
Alejandro Abdelnur
74c9166923 HADOOP-7810. move hadoop archive to core from tools [missing file from original commit]. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213911 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 20:22:28 +00:00
Alejandro Abdelnur
0201be46c2 HADOOP-7810. move hadoop archive to core from tools. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213907 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 20:17:59 +00:00
Aaron Myers
a0fe4f476a Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1213867 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 19:02:37 +00:00
Suresh Srinivas
f2f4e93413 HDFS-2650. Replace @inheritDoc with @Override. Contributed by Hari Mankude.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213813 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 18:07:29 +00:00
Suresh Srinivas
4ec8424e5d HDFS-2666. Fix TestBackupNode failure. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213808 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 17:59:37 +00:00
Tsz-wo Sze
eae3a91b19 Add .classpath, .externalToolBuilders, .launches, .project and .settings to svn:ignore of hadoop-mapreduce-project/hadoop-mapreduce-examples.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213630 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 09:43:30 +00:00
Sanjay Radia
186df142cc HADOOP-7913 Fix bug in ProtoBufRpcEngine (sanjay)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213619 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 09:18:04 +00:00
Tsz-wo Sze
40cc6fc292 HADOOP-7914. Remove the duplicated declaration of hadoop-hdfs test-jar in hadoop-project/pom.xml.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213598 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 08:47:47 +00:00
Eli Collins
c3f7c1f3e5 Add missing file to previous commit.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213593 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 08:10:29 +00:00
Eli Collins
5f39d6c239 HDFS-2654. Make BlockReaderLocal not extend RemoteBlockReader2. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213592 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 08:09:50 +00:00
Eli Collins
197634f2f7 HDFS-2653. DFSClient should cache whether addrs are non-local when short-circuiting is enabled. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213586 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 07:51:23 +00:00
Arun Murthy
f611e1d1b1 MAPREDUCE-3537. Fix race condition in DefaultContainerExecutor which led to container localization occuring in wrong directories.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213575 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 06:33:30 +00:00
Eli Collins
2892b058e0 Put HDFS-1765 in the right place in the changelog.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213541 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 02:23:07 +00:00
Eli Collins
43100e9c0e HDFS-1765. Block Replication should respect under-replication block priority. Contributed by Uma Maheswara Rao G
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213537 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 01:58:25 +00:00
Suresh Srinivas
13345f3a85 HDFS-2663. Handle protobuf optional parameters correctly. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213512 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 00:21:48 +00:00
Mahadev Konar
e52291ea88 MAPREDUCE-3510. Capacity Scheduler inherited ACLs not displayed by mapred queue -showacls (Jonathan Eagles via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213511 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 00:20:01 +00:00