Commit Graph

2129 Commits

Author SHA1 Message Date
Arun Murthy 96247ead03 MAPREDUCE-3376. Fixed Task to ensure it passes reporter to combiners using old MR api. Contributed by Subroto Sanyal.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1221501 13f79535-47bb-0310-9956-ffa450edef68
2011-12-20 22:01:13 +00:00
Eli Collins f9b2197d2a HADOOP-7837. no NullAppender in the log4j config. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1221348 13f79535-47bb-0310-9956-ffa450edef68
2011-12-20 17:17:26 +00:00
Tsz-wo Sze 3503d9a4a8 HDFS-2706. Use configuration for blockInvalidateLimit if it is set.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1221106 13f79535-47bb-0310-9956-ffa450edef68
2011-12-20 05:49:24 +00:00
Arun Murthy a61a18cc09 MAPREDUCE-3563. Fixed LocalJobRunner to work correctly with new mapreduce apis.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1220996 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 23:07:17 +00:00
Todd Lipcon 57ef902bbc HDFS-2682. When a FailoverProxyProvider is used, Client should not retry for 45 times if it is timing out to connect to server. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1220965 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 21:49:39 +00:00
Todd Lipcon 009dfed8d7 HADOOP-7932. Make client connection retries on socket time outs configurable. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1220957 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 21:32:55 +00:00
Todd Lipcon 4bb0456c66 HDFS-2678. When a FailoverProxyProvider is used, DFSClient should not retry connection ten times before failing over. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1220942 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 20:57:13 +00:00
Todd Lipcon 08bde10e24 Merge trunk into HA branch to pick up fix for bkjournal findbugs
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1220941 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 20:46:58 +00:00
Todd Lipcon dfba847eb6 Amend HDFS-234 (bkjournal contrib). Fix findbugs build
- Fixes pom parent to point to hadoop-project instead of hadoop-project-dist
- Fix relative path in pom to have the correct number of ../s


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1220940 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 20:42:25 +00:00
Alejandro Abdelnur de928a4aa0 HDFS-2658. HttpFS introduced 70 javadoc warnings. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1220810 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 15:53:53 +00:00
Aaron Myers 35206c716e Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1220631 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 07:19:36 +00:00
Todd Lipcon 8ff28f4549 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1220616 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 05:34:51 +00:00
Todd Lipcon 625d1b380a HDFS-2677. Web UI should indicate the NN state. Contributed by Eli Collins.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1220613 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 05:26:07 +00:00
Todd Lipcon 329717264f HDFS-2679. Add interface to query current state to HAServiceProtocol. Contributed by Eli Collins.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1220612 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 05:24:32 +00:00
Todd Lipcon 45e81ae415 HADOOP-7925. Add interface and update CLI to query current state to HAServiceProtocol. Contributed by Eli Collins.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1220611 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 05:21:24 +00:00
Eli Collins 5e185702ea HDFS-2335. DataNodeCluster and NNStorage always pull fresh entropy. Contributed by Uma Maheswara Rao G
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1220510 13f79535-47bb-0310-9956-ffa450edef68
2011-12-18 18:12:48 +00:00
Todd Lipcon a89baed833 HDFS-2553. Fix BlockPoolSliceScanner spinning in a tight loop. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1220317 13f79535-47bb-0310-9956-ffa450edef68
2011-12-18 01:13:00 +00:00
Todd Lipcon fa1edc9a1e HDFS-2700. Fix failing TestDataNodeMultipleRegistrations in trunk. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1220315 13f79535-47bb-0310-9956-ffa450edef68
2011-12-18 01:10:49 +00:00
Todd Lipcon 191b56d802 HADOOP-7657. Add support for LZ4 compression. Contributed by Binglin Chang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1220314 13f79535-47bb-0310-9956-ffa450edef68
2011-12-18 00:54:18 +00:00
Harsh J 2cf4aca02e MAPREDUCE-3579. ConverterUtils shouldn't include a port in a path from a url without a port (Contributed by atm)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1215528 13f79535-47bb-0310-9956-ffa450edef68
2011-12-17 17:10:12 +00:00
Aaron Myers 08c9dc3780 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1215367 13f79535-47bb-0310-9956-ffa450edef68
2011-12-17 00:31:46 +00:00
Suresh Srinivas 89553be90e HDFS-2687. Tests failing with ClassCastException post protobuf RPC changes. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1215366 13f79535-47bb-0310-9956-ffa450edef68
2011-12-17 00:26:46 +00:00
Aaron Myers 52c1491155 HDFS-2694. Removal of Avro broke non-PB NN services. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1215364 13f79535-47bb-0310-9956-ffa450edef68
2011-12-17 00:19:01 +00:00
Aaron Myers 059290ce3a HADOOP-7931. o.a.h.ipc.WritableRpcEngine should have a way to force initialization. Contributed by Aaron T. Myers
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1215358 13f79535-47bb-0310-9956-ffa450edef68
2011-12-17 00:14:36 +00:00
Thomas White 9b7617a909 HDFS-2640. Javadoc generation hangs.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1215354 13f79535-47bb-0310-9956-ffa450edef68
2011-12-17 00:09:04 +00:00
Vinod Kumar Vavilapalli feb3a23c71 MAPREDUCE-3387. Fixed AM's tracking URL to always go through the proxy, even before the job started, so that it works properly with oozie throughout the job execution. Contributed by Robert Joseph Evans.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1215345 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 23:41:36 +00:00
Todd Lipcon 371f4228e8 HDFS-2684. Fix up some failing unit tests on HA branch. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1215241 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 18:36:24 +00:00
Amar Kamat a238f931ea MAPREDUCE-778. Rumen Anonymizer. (Amar Kamat and Chris Douglas via amarrk)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1215141 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 14:20:58 +00:00
Mahadev Konar 6d551b83de MAPREDUCE-3366. Mapreduce component should use consistent directory structure layout as HDFS/common (Eric Yang via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1215065 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 09:09:28 +00:00
Todd Lipcon cdb9f01ad4 HDFS-2667. Fix transition from active to standby. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1215037 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 04:25:13 +00:00
Aaron Myers 71071b904d HDFS-2602. NN should log newly-allocated blocks without losing BlockInfo. Contributed by Aaron T. Myers
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1215036 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 04:18:58 +00:00
Siddharth Seth c4ff892520 MAPREDUCE-3422. Counter display names are not being picked up. Contributed by Jonathan Eagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1215031 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 03:10:31 +00:00
Vinod Kumar Vavilapalli f73bd5402e MAPREDUCE-3564. Fixed failures in TestStagingCleanup and TestJobEndNotifier tests. Contributed by Siddharth Seth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1215022 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 02:09:00 +00:00
Aaron Myers 116bf57bd6 HADOOP-7928. HA: Client failover policy is incorrectly trying to fail over all IOExceptions. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1215019 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 01:54:44 +00:00
Vinod Kumar Vavilapalli c2fe4a7e83 MAPREDUCE-3487. Fixed JobHistory web-UI to display links to single task's counters' page. Contributed by Jason Lowe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1215016 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 01:51:15 +00:00
Aaron Myers 353bc3799d HDFS-2689. HA: BookKeeperEditLogInputStream doesn't implement isInProgress(). Contributed by Aaron T. Myers
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214965 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 21:54:00 +00:00
Aaron Myers d937abd434 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214944 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 20:05:38 +00:00
Suresh Srinivas 558185aecd Add target directory to svn:ignore
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214906 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 18:37:05 +00:00
Alejandro Abdelnur 6cf3a15c52 HADOOP_7917. compilation of protobuf files fails in windows/cygwin. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214790 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 14:41:01 +00:00
Mahadev Konar 227fb568b8 MAPREDUCE-3560. TestRMNodeTransitions is failing on trunk. (Siddharth Seth via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214668 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 09:11:18 +00:00
Mahadev Konar beec374542 MAPREDUCE-3251. Network ACLs can prevent some clients to talk to MR ApplicationMaster (Anupam Seth via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214662 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 08:58:51 +00:00
Siddharth Seth 14ba2e65c9 MAPREDUCE-3531. Fixed a race in ContainerTokenSecretManager. (Contributed by Robert Joseph Evans)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214593 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 02:09:16 +00:00
Todd Lipcon afd0333196 HDFS-2683. Authority-based lookup of proxy provider fails if path becomes canonicalized. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214579 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 00:42:50 +00:00
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