Commit Graph

1223 Commits

Author SHA1 Message Date
Alejandro Abdelnur 26e597010f Reverting MAPREDUCE-2264
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439564 13f79535-47bb-0310-9956-ffa450edef68
2013-01-28 18:59:32 +00:00
Alejandro Abdelnur 7ac9d3b1c5 MAPREDUCE-2264. Job status exceeds 100% in some cases. (devaraj.k and sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1438800 13f79535-47bb-0310-9956-ffa450edef68
2013-01-26 00:50:17 +00:00
Alejandro Abdelnur d8cdee8360 MAPREDUCE-4808. Refactor MapOutput and MergeManager to facilitate reuse by Shuffle implementations. (masokan via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1438796 13f79535-47bb-0310-9956-ffa450edef68
2013-01-26 00:41:12 +00:00
Alejandro Abdelnur cf67cccd7c MAPREDUCE-4807. Allow MapOutputBuffer to be pluggable. (masokan via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1438795 13f79535-47bb-0310-9956-ffa450edef68
2013-01-26 00:40:21 +00:00
Alejandro Abdelnur 7a6b9f3609 MAPREDUCE-4809. Change visibility of classes for pluggable sort changes. (masokan via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1438794 13f79535-47bb-0310-9956-ffa450edef68
2013-01-26 00:39:27 +00:00
Alejandro Abdelnur c4c039bb29 MAPREDUCE-4049. Experimental api to allow for alternate shuffle plugins. Contributed by Anver BenHanoch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1438793 13f79535-47bb-0310-9956-ffa450edef68
2013-01-26 00:38:38 +00:00
Siddharth Seth b981b59c06 merge MAPREDUCE-4946 from trunk. Fix a performance problem for large jobs by reducing the number of map completion event type conversions. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1437104 13f79535-47bb-0310-9956-ffa450edef68
2013-01-22 19:08:06 +00:00
Alejandro Abdelnur b486f7e2de MAPREDUCE-4949. Enable multiple pi jobs to run in parallel. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1437030 13f79535-47bb-0310-9956-ffa450edef68
2013-01-22 16:28:36 +00:00
Jonathan Turner Eagles 361e05864f svn merge -c 1435386 FIXES: MAPREDUCE-4458. Warn if java.library.path is used for AM or Task (Robert Parker via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1435394 13f79535-47bb-0310-9956-ffa450edef68
2013-01-18 22:47:14 +00:00
Siddharth Seth f18bb1a150 merge MAPREDUCE-4948 from trunk. Fix a failing unit test - TestYARNRunner.testHistoryServerToken. Contributed by Junping Du
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1435313 13f79535-47bb-0310-9956-ffa450edef68
2013-01-18 19:31:10 +00:00
Alejandro Abdelnur 1d6bd54e29 MAPREDUCE-4923. Add toString method to TaggedInputSplit. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1434994 13f79535-47bb-0310-9956-ffa450edef68
2013-01-18 00:41:26 +00:00
Thomas Graves d5334e1571 Preparing for release 0.23.6
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1434031 13f79535-47bb-0310-9956-ffa450edef68
2013-01-16 16:46:12 +00:00
Alejandro Abdelnur 2e2afd22f9 MAPREDUCE-4924. flakey test: org.apache.hadoop.mapred.TestClusterMRNotification.testMR. (rkanter via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433759 13f79535-47bb-0310-9956-ffa450edef68
2013-01-16 00:15:59 +00:00
Jason Darrell Lowe 3943008b07 svn merge -c 1433445 FIXES: MAPREDUCE-4936. JobImpl uber checks for cpu are wrong. Contributed by Arun C Murthy
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433446 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 14:49:14 +00:00
Harsh J 0ab4e6984f MAPREDUCE-4925. The pentomino option parser may be buggy. Contributed by Karthik Kambatla. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433416 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 13:55:49 +00:00
Harsh J 82f03491a6 MAPREDUCE-4678. Running the Pentomino example with defaults throws java.lang.NegativeArraySizeException. Contributed by Chris McConnell. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433412 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 13:47:53 +00:00
Suresh Srinivas 1b410df23f MAPREDUCE-4938. Merging change 1433227 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433230 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 00:13:43 +00:00
Thomas Graves fdc4c61101 MAPREDUCE-4934. Maven RAT plugin is not checking all source files (tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1432940 13f79535-47bb-0310-9956-ffa450edef68
2013-01-14 15:01:35 +00:00
Robert Joseph Evans 63106e20e0 svn merge -c 1432230 FIXES: MAPREDUCE-4921. JobClient should acquire HS token with RM principal (daryn via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1432232 13f79535-47bb-0310-9956-ffa450edef68
2013-01-11 19:05:02 +00:00
Alejandro Abdelnur 572f7f45d6 MAPREDUCE-4907. TrackerDistributedCacheManager issues too many getFileStatus calls. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431167 13f79535-47bb-0310-9956-ffa450edef68
2013-01-10 00:52:15 +00:00
Jason Darrell Lowe fb0a8ff926 svn merge -c 1431131 FIXES: MAPREDUCE-4848. TaskAttemptContext cast error during AM recovery. Contributed by Jerry Chen
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431134 13f79535-47bb-0310-9956-ffa450edef68
2013-01-09 23:01:11 +00:00
Thomas White 98cb5344eb Merge -r 1430928:1430929 from trunk to branch-2. Fixes: MAPREDUCE-1700. User supplied dependencies may conflict with MapReduce system JARs.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430936 13f79535-47bb-0310-9956-ffa450edef68
2013-01-09 16:22:55 +00:00
Vinod Kumar Vavilapalli 76939f2877 MAPREDUCE-4810. Added new admin command options for MR AM. Contributed by Jerry Chen.
svn merge --ignore-ancestry -c 1430707 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430708 13f79535-47bb-0310-9956-ffa450edef68
2013-01-09 06:33:01 +00:00
Arun Murthy 122cd0fb5b Merge -c 1430688 from trunk to branch-2 to fix MAPREDUCE-4520. Added support for MapReduce applications to request for CPU cores along-with memory post YARN-2. Contributed by Arun C. Murthy.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430690 13f79535-47bb-0310-9956-ffa450edef68
2013-01-09 05:31:53 +00:00
Thomas White 75878f6c7b Merge -r 1430362:1430363 from trunk to branch-2. Fixes: MAPREDUCE-4278. Cannot run two local jobs in parallel from the same gateway. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430369 13f79535-47bb-0310-9956-ffa450edef68
2013-01-08 16:31:58 +00:00
Vinod Kumar Vavilapalli 9a87b2f7fe MAPREDUCE-4920. Use security token protobuf definition from hadoop common. Contributed by Suresh Srinivas.
svn merge --ignore-ancestry -c 1429751 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429752 13f79535-47bb-0310-9956-ffa450edef68
2013-01-07 11:15:10 +00:00
Thomas Graves b035a444e1 MAPREDUCE-4913. TestMRAppMaster#testMRAppMasterMissingStaging occasionally exits (Jason Lowe via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429376 13f79535-47bb-0310-9956-ffa450edef68
2013-01-05 20:19:18 +00:00
Robert Joseph Evans 199df2b770 svn merge -c 1429114 FIXES: MAPREDUCE-4819. AM can rerun job after reporting final job status to the client (bobby and Bikas Saha via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429115 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 20:38:36 +00:00
Thomas Graves 2cb090a075 MAPREDUCE-4894. Renewal / cancellation of JobHistory tokens (Siddharth Seth via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429105 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 20:31:22 +00:00
Jason Darrell Lowe ec4fc07c52 svn merge -c 1429040 FIXES: MAPREDUCE-4832. MR AM can get in a split brain situation. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429046 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 19:27:56 +00:00
Robert Joseph Evans 6862511182 svn merge -c 1428482 FIXES: MAPREDUCE-4279. getClusterStatus() fails with null pointer exception when running jobs in local mode (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1428489 13f79535-47bb-0310-9956-ffa450edef68
2013-01-03 17:21:27 +00:00
Robert Joseph Evans 52742c9a65 svn merge -c 1426536 FIXES: MAPREDUCE-4813. AM timing out during job commit (jlowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1426539 13f79535-47bb-0310-9956-ffa450edef68
2012-12-28 15:06:15 +00:00
Jason Darrell Lowe 7bec80179b svn merge -c 1426018 FIXES: MAPREDUCE-4902. Fix typo "receievd" should be "received" in log output. Contributed by Albert Chu
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1426020 13f79535-47bb-0310-9956-ffa450edef68
2012-12-26 20:49:39 +00:00
Vinod Kumar Vavilapalli 121a79c7a1 MAPREDUCE-4899. Implemented a MR specific plugin for tracking finished applications that YARN's ResourceManager doesn't keep track off anymore. Contributed by Derek Dagit.
svn merge --ignore-ancestry -c 1425225 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425226 13f79535-47bb-0310-9956-ffa450edef68
2012-12-22 01:49:02 +00:00
Jason Darrell Lowe 5b6115e3bb svn merge -c 1425223 FIXES: MAPREDUCE-4890. Invalid TaskImpl state transitions when task fails while speculating. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425224 13f79535-47bb-0310-9956-ffa450edef68
2012-12-22 01:46:05 +00:00
Jason Darrell Lowe 41ad080fd9 svn merge -c 1425177 FIXES: MAPREDUCE-4793. Problem with adding resources when using both -files and -file to hadoop streaming. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425181 13f79535-47bb-0310-9956-ffa450edef68
2012-12-21 23:12:44 +00:00
Luke Lu 307a46f6be MAPREDUCE-4272. SortedRanges.Range#compareTo is not spec compliant. (Yu Gao via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425179 13f79535-47bb-0310-9956-ffa450edef68
2012-12-21 23:08:54 +00:00
Jason Darrell Lowe 043fd00a30 svn merge -c 1425167 FIXES: MAPREDUCE-4833. Task can get stuck in FAIL_CONTAINER_CLEANUP. Contributed by Robert Parker
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425168 13f79535-47bb-0310-9956-ffa450edef68
2012-12-21 22:34:41 +00:00
Jason Darrell Lowe 891e616d51 svn merge -c 1425071 FIXES: MAPREDUCE-4842. Shuffle race can hang reducer. Contributed by Mariappan Asokan
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425074 13f79535-47bb-0310-9956-ffa450edef68
2012-12-21 18:32:57 +00:00
Thomas Graves 38750e6500 MAPREDUCE-4895 Fix compilation failure of org.apache.hadoop.mapred.gridmix.TestResourceUsageEmulators (Dennis Y via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1424501 13f79535-47bb-0310-9956-ffa450edef68
2012-12-20 14:52:24 +00:00
Thomas White 01c5d0eb77 Merge -r 1423469:1423470 from trunk to branch-2. Fixes: MAPREDUCE-4845. ClusterStatus.getMaxMemory() and getUsedMemory() exist in MR1 but not MR2. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1423471 13f79535-47bb-0310-9956-ffa450edef68
2012-12-18 15:25:09 +00:00
Thomas White fc70cd9538 Merge -r 1420633:1420634 from trunk to branch-2. Fixes: MAPREDUCE-4856. TestJobOutputCommitter uses same directory as TestJobCleanup. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1420635 13f79535-47bb-0310-9956-ffa450edef68
2012-12-12 12:14:08 +00:00
Alejandro Abdelnur 1fce56fd24 MAPREDUCE-4549. Distributed cache conflicts breaks backwards compatability. (Robert Evans via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1420363 13f79535-47bb-0310-9956-ffa450edef68
2012-12-11 19:50:32 +00:00
Alejandro Abdelnur 680b437f2f MAPREDUCE-4861. Cleanup: Remove unused mapreduce.security.token.DelegationTokenRenewal. (kkambatl via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1420350 13f79535-47bb-0310-9956-ffa450edef68
2012-12-11 19:29:18 +00:00
Alejandro Abdelnur 89b9fc3034 MAPREDUCE-4703. Add the ability to start the MiniMRClientCluster using the configurations used before it is being stopped. (ahmed.radwan via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1419619 13f79535-47bb-0310-9956-ffa450edef68
2012-12-10 18:10:22 +00:00
Jonathan Turner Eagles 77933c6327 MAPREDUCE-4836. Elapsed time for running tasks on AM web UI tasks page is 0. (Ravi Prakash via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1415863 13f79535-47bb-0310-9956-ffa450edef68
2012-11-30 21:51:38 +00:00
Thomas Graves b432cf076e merge -r 1414872:1414873 from trunk. FIXES: MAPREDUCE-4817
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1414876 13f79535-47bb-0310-9956-ffa450edef68
2012-11-28 19:24:27 +00:00
Robert Joseph Evans 3e0d0cf08f svn merge -c 1414840 FIXES: MAPREDUCE-4825. JobImpl.finished doesn't expect ERROR as a final job state (jlowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1414842 13f79535-47bb-0310-9956-ffa450edef68
2012-11-28 17:54:10 +00:00
Robert Joseph Evans ff97561e05 svn merge -c 1413739 FIXES: MAPREDUCE-4764. repair TestBinaryTokenFile (Ivan A. Veselovsky via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1413741 13f79535-47bb-0310-9956-ffa450edef68
2012-11-26 17:38:53 +00:00
Jason Darrell Lowe 6e6b09dfba svn merge -c 1412377 FIXES: MAPREDUCE-4811. JobHistoryServer should show when it was started in WebUI About page. Contributed by Ravi Prakash
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1412378 13f79535-47bb-0310-9956-ffa450edef68
2012-11-22 00:11:02 +00:00
Alejandro Abdelnur 63d27f591c MAPREDUCE-4800. Cleanup o.a.h.mapred.MapTaskStatus - remove unused code. (kkambatl via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1410701 13f79535-47bb-0310-9956-ffa450edef68
2012-11-17 06:16:58 +00:00
Robert Joseph Evans 19748556f8 svn merge -c 1410498 FIXES: MAPREDUCE-4802. Takes a long time to load the task list on the AM for large jobs (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1410502 13f79535-47bb-0310-9956-ffa450edef68
2012-11-16 17:32:31 +00:00
Robert Joseph Evans 34abf278dd svn merge -c 1410131 FIXES: MAPREDUCE-4801. ShuffleHandler can generate large logs due to prematurely closed channels (jlowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1410132 13f79535-47bb-0310-9956-ffa450edef68
2012-11-16 00:55:56 +00:00
Robert Joseph Evans 9a5a5082c6 Updated CHANGES.txt in preparation for 0.23.5 release
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409821 13f79535-47bb-0310-9956-ffa450edef68
2012-11-15 14:59:27 +00:00
Robert Joseph Evans c26bf3b838 svn merge -c 1409580 FIXES: MAPREDUCE-4720. Browser thinks History Server main page JS is taking too long (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409583 13f79535-47bb-0310-9956-ffa450edef68
2012-11-15 00:02:52 +00:00
Robert Joseph Evans 3b9bb65473 svn merge -c 1409525 FIXES: MAPREDUCE-4797. LocalContainerAllocator can loop forever trying to contact the RM (jlowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409528 13f79535-47bb-0310-9956-ffa450edef68
2012-11-14 23:06:48 +00:00
Thomas Graves 6a743f3f5b merge -r 1409031:1409032 from trunk. FIXES: MAPREDUCE-4517
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409034 13f79535-47bb-0310-9956-ffa450edef68
2012-11-13 23:49:04 +00:00
Robert Joseph Evans 32850b486b svn merge -c 1408444 FIXES: MAPREDUCE-4786. Job End Notification retry interval is 5 milliseconds by default (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408447 13f79535-47bb-0310-9956-ffa450edef68
2012-11-12 20:38:55 +00:00
Robert Joseph Evans ec861244a2 svn merge -c 1408360 FIXES: MAPREDUCE-4425. Speculation + Fetch failures can lead to a hung job (jlowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408361 13f79535-47bb-0310-9956-ffa450edef68
2012-11-12 17:19:58 +00:00
Robert Joseph Evans b3c28a5753 svn merge -c 1408355 FIXES: MAPREDUCE-4787. TestJobMonitorAndPrint is broken (Rob Parker via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408357 13f79535-47bb-0310-9956-ffa450edef68
2012-11-12 17:07:22 +00:00
Robert Joseph Evans 74656788e5 svn merge -c 1408314 FIXES: MAPREDUCE-4751. AM stuck in KILL_WAIT for days (vinodkv via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408316 13f79535-47bb-0310-9956-ffa450edef68
2012-11-12 15:19:41 +00:00
Robert Joseph Evans b8f37b3b36 svn merge -c 1407679 FIXES: MAPREDUCE-4774. JobImpl does not handle asynchronous task events in FAILED state (jlowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1407682 13f79535-47bb-0310-9956-ffa450edef68
2012-11-09 23:00:57 +00:00
Jonathan Turner Eagles 1d58a7b5b3 MAPREDUCE-4666. JVM metrics for history server. (jlowe via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1407670 13f79535-47bb-0310-9956-ffa450edef68
2012-11-09 22:22:16 +00:00
Robert Joseph Evans 80a05764be svn merge -c 1407551 FIXES: MAPREDUCE-4266. remove Ant remnants from MR (tgraves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1407552 13f79535-47bb-0310-9956-ffa450edef68
2012-11-09 17:28:58 +00:00
Robert Joseph Evans 82ccfb726a svn merge -c 1407505 FIXES: MAPREDUCE-4782. NLineInputFormat skips first line of last InputSplit (Mark Fuhs via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1407506 13f79535-47bb-0310-9956-ffa450edef68
2012-11-09 15:53:52 +00:00
Robert Joseph Evans 6b3db6eabd svn merge -c 1407118 FIXES: MAPREDUCE-4772. Fetch failures can take way too long for a map to be restarted (bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1407126 13f79535-47bb-0310-9956-ffa450edef68
2012-11-08 15:21:36 +00:00
Thomas White 501b2758ce Merge -r 1406644:1406645 from trunk to branch-2. Fixes: MAPREDUCE-4777. In TestIFile, testIFileReaderWithCodec relies on testIFileWriterWithCodec. Contributed by Sandy Ryza
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1406647 13f79535-47bb-0310-9956-ffa450edef68
2012-11-07 14:12:55 +00:00
Robert Joseph Evans cb0f68cc3f svn merge -c 1405975. FIXES: MAPREDUCE-4771. KeyFieldBasedPartitioner not partitioning properly when configured (jlowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1405988 13f79535-47bb-0310-9956-ffa450edef68
2012-11-05 22:16:51 +00:00
Robert Joseph Evans 11822fb8ab svn merge -c 1404988 FIXES: MAPREDUCE-4763 repair test TestUmbilicalProtocolWithJobToken (Ivan A. Veselovsky via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404991 13f79535-47bb-0310-9956-ffa450edef68
2012-11-02 15:05:06 +00:00
Jason Darrell Lowe a280cd5567 svn merge -c 1404817 FIXES: MAPREDUCE-4729. job history UI not showing all job attempts. Contributed by Vinod Kumar Vavilapalli
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404824 13f79535-47bb-0310-9956-ffa450edef68
2012-11-01 23:05:53 +00:00
Robert Joseph Evans d9e5740ce7 svn merge -c 1404674 FIXES: MAPREDUCE-4746. The MR Application Master does not have a config to set environment variables (Rob Parker via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404676 13f79535-47bb-0310-9956-ffa450edef68
2012-11-01 17:07:24 +00:00
Robert Joseph Evans 9d689a9db9 svn merge -c 1404305 FIXES: MAPREDUCE-4724. job history web ui applications page should be sorted to display last app first (tgraves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404306 13f79535-47bb-0310-9956-ffa450edef68
2012-10-31 19:13:59 +00:00
Thomas Graves b958fa85a5 merge -r 1404176:1404177 from trunk. FIXES: MAPREDUCE-4752
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404182 13f79535-47bb-0310-9956-ffa450edef68
2012-10-31 15:02:59 +00:00
Alejandro Abdelnur d3e2e2cb68 MAPREDUCE-1806. CombineFileInputFormat does not work with paths not on default FS. (Gera Shegalov via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1403618 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 05:52:17 +00:00
Jason Darrell Lowe 58c43cc8cb svn merge -c 1402658 FIXES: MAPREDUCE-4748. Invalid event: T_ATTEMPT_SUCCEEDED at SUCCEEDED. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1402664 13f79535-47bb-0310-9956-ffa450edef68
2012-10-26 21:05:33 +00:00
Vinod Kumar Vavilapalli 79a14bb25f MAPREDUCE-4730. Fix Reducer's EventFetcher to scale the map-completion requests slowly to avoid HADOOP-8942. Contributed by Jason Lowe.
svn merge --ignore-ancestry -c 1401941 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401942 13f79535-47bb-0310-9956-ffa450edef68
2012-10-25 01:27:17 +00:00
Jason Darrell Lowe 33cb0be07c svn merge -c 1401738 FIXES: MAPREDUCE-4741. WARN and ERROR messages logged during normal AM shutdown. Contributed by Vinod Kumar Vavilapalli
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401741 13f79535-47bb-0310-9956-ffa450edef68
2012-10-24 15:47:01 +00:00
Daryn Sharp d647f98cb8 Updating credits for MAPREDUCE-4229.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401491 13f79535-47bb-0310-9956-ffa450edef68
2012-10-23 21:19:02 +00:00
Daryn Sharp 7b36e659c1 svn merge -c 1401467/1401473 FIXES: MAPREDUCE-4229. Intern counter names in the JT (bobby via daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401483 13f79535-47bb-0310-9956-ffa450edef68
2012-10-23 21:10:17 +00:00
Siddharth Seth 5d200b2ab3 merge MAPREDUCE-4637 from trunk. Handle TaskAttempt diagnostic updates while in the NEW and UNASSIGNED states. (Contributed by Mayank Bansal)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401475 13f79535-47bb-0310-9956-ffa450edef68
2012-10-23 21:03:17 +00:00
Jason Darrell Lowe 43159cc20d svn merge -c 1401054 FIXES: MAPREDUCE-4740. only .jars can be added to the Distributed Cache classpath. Contributed by Robert Joseph Evans
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401058 13f79535-47bb-0310-9956-ffa450edef68
2012-10-22 19:58:01 +00:00
Vinod Kumar Vavilapalli 3d8fa1d6c4 MAPREDUCE-4733. Reducer can fail to make progress during shuffle if too many reducers complete consecutively. Contributed by Jason Lowe.
svn merge --ignore-ancestry -c 1400264 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400266 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 20:20:03 +00:00
Robert Joseph Evans edd3bc5cc2 svn merge -c 1400192 FIXES: MAPREDUCE-4479. Fix parameter order in assertEquals() in TestCombineInputFileFormat.java (Mariappan Asokan via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400194 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 17:53:18 +00:00
Vinod Kumar Vavilapalli 5944b1c703 MAPREDUCE-4596. Split StateMachine state from states seen by MRClientProtocol for Job, Task and TaskAttempt. Contributed by Siddarth Seth.
svn merge --ignore-ancestry -c 1399976 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399977 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 05:59:25 +00:00
Robert Joseph Evans 070ae0d73e svn merge -c 1399289 FIXES: MAPREDUCE-4721. Task startup time in JHS is same as job startup time. (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399291 13f79535-47bb-0310-9956-ffa450edef68
2012-10-17 15:01:10 +00:00
Robert Joseph Evans 0f4838ab6b svn merge -c 1399011. FIXES: MAPREDUCE-4521. mapreduce.user.classpath.first incompatibility with 0.20/1.x (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399012 13f79535-47bb-0310-9956-ffa450edef68
2012-10-16 22:00:51 +00:00
Suresh Srinivas 3a9aadc3c7 HADOOP-8911. CRLF characters in source and text files (trunk equivalent patch). Contributed Raja Aluri.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1397435 13f79535-47bb-0310-9956-ffa450edef68
2012-10-12 04:48:40 +00:00
Arun Murthy 267bfc5ff2 Merge -c 1397182 from trunk to branch-2 to fix MAPREDUCE-4616. Improve javadoc for MultipleOutputs. Contributed by Tony Burton.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1397183 13f79535-47bb-0310-9956-ffa450edef68
2012-10-11 17:22:27 +00:00
Thomas White 4a63906756 Merge -r 1396046:1396047 from trunk to branch-2. Fixes: MAPREDUCE-4654. TestDistCp is ignored. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396051 13f79535-47bb-0310-9956-ffa450edef68
2012-10-09 14:49:51 +00:00
Harsh J 9a0f100130 MAPREDUCE-3678. The Map tasks logs should have the value of input split it processed. Contributed by Harsh J. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396034 13f79535-47bb-0310-9956-ffa450edef68
2012-10-09 13:41:45 +00:00
Siddharth Seth 7e55280b5b merge MAPREDUCE-4705 from trunk. Fix a bug in job history lookup, which makes older jobs inaccessible despite the presence of a valid history file. (Contributed by Jason Lowe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395851 13f79535-47bb-0310-9956-ffa450edef68
2012-10-09 03:24:43 +00:00
Robert Joseph Evans 09f0aee7f8 svn merge -c 1395769 FIXES: MAPREDUCE-4554. Job Credentials are not transmitted if security is turned off (Benoy Antony via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395772 13f79535-47bb-0310-9956-ffa450edef68
2012-10-08 20:55:21 +00:00
Thomas Graves 279d3cc66a merge -r 1394608:1394609 from trunk. FIXES: MAPREDUCE-4712
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395726 13f79535-47bb-0310-9956-ffa450edef68
2012-10-08 19:04:43 +00:00
Siddharth Seth aa53f366c8 merge MAPREDUCE-4123 from trunk. Remove the 'mapred groups' command, which is no longer supported. (Contributed by Devaraj K)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1393776 13f79535-47bb-0310-9956-ffa450edef68
2012-10-03 21:28:49 +00:00
Arun Murthy bfb69f6eea Merge -c 1392075 from trunk to branch-2 to fix MAPREDUCE-4681. Fix unit tests broken by HDFS-3910. Contributed by Arun C. Murthy.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1392076 13f79535-47bb-0310-9956-ffa450edef68
2012-09-30 17:02:27 +00:00
Robert Joseph Evans 76aa144c64 Preparing for release 0.23.4
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1391806 13f79535-47bb-0310-9956-ffa450edef68
2012-09-29 14:18:27 +00:00
Robert Joseph Evans 81b14fae80 svn merge -c 1391679 FIXES: MAPREDUCE-4689. JobClient.getMapTaskReports on failed job results in NPE (jlowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1391680 13f79535-47bb-0310-9956-ffa450edef68
2012-09-28 22:18:32 +00:00
Jason Darrell Lowe f40997309e svn merge -c 1391671 FIXES: MAPREDUCE-4691. Historyserver can report "Unknown job" after RM says job has completed. Contributed by Robert Joseph Evans.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1391675 13f79535-47bb-0310-9956-ffa450edef68
2012-09-28 22:00:42 +00:00
Arun Murthy e619da2136 Reverted MAPREDUCE-4253 from branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1390655 13f79535-47bb-0310-9956-ffa450edef68
2012-09-26 18:43:17 +00:00
Thomas Graves e5e1887092 merge -r 1390556:1390557 from trunk. FIXES: MAPREDUCE-4647
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1390563 13f79535-47bb-0310-9956-ffa450edef68
2012-09-26 15:25:05 +00:00
Arun Murthy 6667d885bb Merge -c 1390218 from trunk to branch-2 to fix MAPREDUCE-4649. Ensure MapReduce JobHistory Daemon doens't assume HADOOP_YARN_HOME and HADOOP_MAPRED_HOME are the same. Contributed by Vinod K V.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1390226 13f79535-47bb-0310-9956-ffa450edef68
2012-09-25 23:50:03 +00:00
Konstantin Shvachko 1aba4503cf MAPREDUCE-4651. Benchmarking random reads with DFSIO. Contributed by Konstantin Shvachko.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1390161 13f79535-47bb-0310-9956-ffa450edef68
2012-09-25 21:36:30 +00:00
Konstantin Shvachko 7cf9362055 MAPREDUCE-4645. Provide a random seed to Slive to make the sequence of file names deterministic. Contributed by Ravi Prakash.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1389595 13f79535-47bb-0310-9956-ffa450edef68
2012-09-24 21:17:29 +00:00
Eli Collins 1b04c502e0 MAPREDUCE-4674. Hadoop examples secondarysort has a typo "secondarysrot" in the usage. Contributed by Robert Justice
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1388663 13f79535-47bb-0310-9956-ffa450edef68
2012-09-21 20:16:16 +00:00
Vinod Kumar Vavilapalli a5e50dfae9 MAPREDUCE-4646. Fixed MR framework to send diagnostic information correctly to clients in case of failed jobs also. Contributed by Jason Lowe.
svn merge --ignore-ancestry -c 1383709 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1383710 13f79535-47bb-0310-9956-ffa450edef68
2012-09-12 00:59:59 +00:00
Thomas White 803905eb5a Merge -r 1383421:1383422 from trunk to branch-2. Fixes: MAPREDUCE-4607. Race condition in ReduceTask completion can result in Task being incorrectly failed. Contributed by Bikas Saha.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1383425 13f79535-47bb-0310-9956-ffa450edef68
2012-09-11 14:13:58 +00:00
Arun Murthy c76e05c1b7 Set date for hadoop-2.0.2-alpha
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1382198 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 22:37:55 +00:00
Arun Murthy d47f6bb16e Preparing for hadoop-2.0.2-alpha release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1382195 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 22:34:25 +00:00
Alejandro Abdelnur 2cdffe63d5 MAPREDUCE-4642. MiniMRClientClusterFactory should not use job.setJar() (rkanter via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1382094 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 17:06:55 +00:00
Robert Joseph Evans ebb1a16f62 svn merge -c 1382088 FIXES: MAPREDUCE-4629. Remove JobHistory.DEBUG_MODE (Karthik Kambatla via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1382089 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 16:47:04 +00:00
Arun Murthy b9a3f51dcd Merge -c r1381868 from trunk to branch-2 to fix MR AM supplies MapReduce jars in classpath rather than rely on YARN. Contributed by Arun C Murthy.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381869 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 04:59:20 +00:00
Robert Joseph Evans 928e6864d3 svn merge -c 1381784 FIXES: MAPREDUCE-4641. Exception in commitJob marks job as successful in job history (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381786 13f79535-47bb-0310-9956-ffa450edef68
2012-09-06 22:22:01 +00:00
Robert Joseph Evans 2616974383 svn merge -c 1381614 FIXES: MAPREDUCE-4633. history server doesn't set permissions on all subdirs (tgraves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381618 13f79535-47bb-0310-9956-ffa450edef68
2012-09-06 14:22:04 +00:00
Robert Joseph Evans 8d310aad55 pdating CHANGES.txt for 0.23.4
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1380907 13f79535-47bb-0310-9956-ffa450edef68
2012-09-04 21:48:58 +00:00
Konstantin Shvachko 54ca8b837c MAPREDUCE-2786. Add compression option for TestDFSIO. Contributed by Plamen Jeliazkov.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1380308 13f79535-47bb-0310-9956-ffa450edef68
2012-09-03 18:50:28 +00:00
Jonathan Turner Eagles a64a30ce6c svn merge -c 1379617 from trunk FIXES: MAPREDUCE-4604. In mapred-default, mapreduce.map.maxattempts & mapreduce.reduce.maxattempts defaults are set to 4 as well as mapreduce.job.maxtaskfailures.per.tracker. (Ravi Prakash via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379622 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 21:31:23 +00:00
Thomas Graves c54a74a2cc merge -r 1379598:1379599 from trunk. FIXES: MAPREDUCE-4611
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379602 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 20:45:34 +00:00
Robert Joseph Evans 8ef7e47241 svn merge -c 1379595 FIXES: MAPREDUCE-4614. Simplify debugging a job's tokens (daryn via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379596 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 20:39:03 +00:00
Robert Joseph Evans b2382b0cd4 svn merge -c 1379584 FIXES: MAPREDUCE-4612. job summary file permissions not set when its created (tgraves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379585 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 20:26:26 +00:00
Vinod Kumar Vavilapalli e591c4f4dc MAPREDUCE-4569. Fixed TestHsWebServicesJobsQuery to pass on JDK7 by not depending on test order. Contributed by Thomas Graves.
svn merge --ignore-ancestry -c 1379146 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379148 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 21:04:05 +00:00
Thomas White 9f94b89742 Merge -r 1379021:1379022 from trunk to branch-2. Fixes: MAPREDUCE-4610. Support deprecated mapreduce.job.counters.limit property in MR2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379023 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 17:14:07 +00:00
Thomas White ebbb304022 Merge -r 1378872:1378873 from trunk to branch-2. Fixes: MAPREDUCE-4608. hadoop-mapreduce-client is missing some dependencies.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1378874 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 10:02:31 +00:00
Robert Joseph Evans a88454abb7 MAPREDUCE-4600. TestTokenCache.java from MRV1 no longer compiles (daryn via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1378267 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 18:53:53 +00:00
Vinod Kumar Vavilapalli 14b1cf459b MAPREDUCE-4579. Split TestTaskAttempt into two so as to pass tests on jdk7. Contributed by Thomas Graves.
svn merge --ignore-ancestry -c 1377943 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377944 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 02:05:25 +00:00
Siddharth Seth a1c556ca19 merge MAPREDUCE-4580 from trunk. Change MapReduce to use the yarn-client module. (Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377924 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 00:41:03 +00:00
Alejandro Abdelnur 2ff2b79e33 MAPREDUCE-4408. allow jobs to set a JAR that is in the distributed cached (rkanter via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377150 13f79535-47bb-0310-9956-ffa450edef68
2012-08-24 23:38:21 +00:00
Alejandro Abdelnur 6e831b0f5e MAPREDUCE-4470. Fix TestCombineFileInputFormat.testForEmptyFile (ikatsov via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376326 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 00:24:36 +00:00
Aaron Myers 0490537635 MAPREDUCE-4577. HDFS-3672 broke TestCombineFileInputFormat.testMissingBlocks() test. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376298 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 22:45:30 +00:00
Alejandro Abdelnur d7a90bc552 MAPREDUCE-4068. Jars in lib subdirectory of the submittable JAR are not added to the classpath (rkanter via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376255 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 21:23:09 +00:00
Robert Joseph Evans 1ee0c23b39 svn merge -c 1375687 FIXES: MAPREDUCE-4570. ProcfsBasedProcessTree#constructProcessInfo() prints a warning if procfsDir/<pid>/stat is not found. (Ahmed Radwan via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1375691 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 17:47:08 +00:00
Robert Joseph Evans f3f8edbd10 svn merge -c 1375602 FIXES: MAPREDUCE-3506. Calling getPriority on JobInfo after parsing a history log with JobHistoryParser throws a NullPointerException (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1375604 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 15:21:30 +00:00
Thomas White 832e7c6dc3 Merge -r 1373822:1373823 from trunk to branch-2. Fixes: MAPREDUCE-4562. Support for "FileSystemCounter" legacy counter group name for compatibility reasons is creating incorrect counter name.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1373824 13f79535-47bb-0310-9956-ffa450edef68
2012-08-16 13:27:24 +00:00
Alejandro Abdelnur fc783dcc1e MAPREDUCE-4511. Add IFile readahead (ahmed via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1373671 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 23:11:00 +00:00
Thomas Graves 6f516ea1bf merge -r 1372635:1372636 from trunk. FIXES: MAPREDUCE-4053
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1372638 13f79535-47bb-0310-9956-ffa450edef68
2012-08-13 21:50:21 +00:00
Robert Joseph Evans 4705652915 svn merge -c 1371325 FIXES: MAPREDUCE-3782. teragen terasort jobs fail when using webhdfs:// (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1371332 13f79535-47bb-0310-9956-ffa450edef68
2012-08-09 17:39:37 +00:00
Alejandro Abdelnur 88593c443d Merge -r 1370119:1370120 from trunk to branch. FIXES: MAPREDUCE-4484
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1370121 13f79535-47bb-0310-9956-ffa450edef68
2012-08-07 05:16:15 +00:00
Alejandro Abdelnur 6c4b4e19b3 Merge -r 1370117:1370118 from trunk to branch. FIXES: MAPREDUCE-4494
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1370119 13f79535-47bb-0310-9956-ffa450edef68
2012-08-07 05:12:08 +00:00
Alejandro Abdelnur 2a178a8d0b Merge -r 1369905:1369906 from trunk to branch. FIXES: MAPREDUCE-4498
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1369908 13f79535-47bb-0310-9956-ffa450edef68
2012-08-06 18:15:35 +00:00
Jonathan Turner Eagles 054dd2d39c svn merge -c 1369197 FIXES: MAPREDUCE-4503. Should throw InvalidJobConfException if duplicates found in cacheArchives or cacheFiles (Robert Evans via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1369201 13f79535-47bb-0310-9956-ffa450edef68
2012-08-03 20:42:18 +00:00
Siddharth Seth f7545f076e Merge MAPREDUCE-3289 from trunk. Make use of fadvise in the NM's shuffle handler. (Contributed by Todd Lipcon and Siddharth Seth)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1368722 13f79535-47bb-0310-9956-ffa450edef68
2012-08-02 21:57:42 +00:00
Thomas Graves 6b3c8934f3 merge -r 1368293:1368294 from trunk. FIXES: MAPREDUCE-4504
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1368296 13f79535-47bb-0310-9956-ffa450edef68
2012-08-01 22:20:59 +00:00
Jonathan Turner Eagles d40b6be2f5 svn merge -c 1367789 FIXES: MAPREDUCE-4234. SortValidator.java is incompatible with multi-user or parallel use (due to a /tmp file with static name) (Robert Evans via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367793 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 21:45:45 +00:00
Robert Joseph Evans bc65eefdd3 svn merge -c 1367783 FIXES: MAPREDUCE-4444. nodemanager fails to start when one of the local-dirs is bad (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367784 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 21:09:43 +00:00
Thomas Graves 66d468eece merge -r 1367770:1367771 from trunk. FIXES: MAPREDUCE-4457
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367772 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 20:53:45 +00:00
Robert Joseph Evans 6817f87461 svn merge -c 1367726. FIXES: MAPREDUCE-4483. 2.0 build does not work (John George via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367729 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 19:50:11 +00:00
Robert Joseph Evans e265f69a18 svn merge -c 1367719 FIXES: MAPREDUCE-4492. Configuring total queue capacity between 100.5 and 99.5 at perticular level is sucessfull (Mayank Bansal via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367720 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 19:35:39 +00:00
Thomas Graves 5a17a40ee6 merge -r 1367712:1367713 from trunk. FIXES: MAPREDUCE-4493
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367715 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 19:21:27 +00:00
Robert Joseph Evans 6fe821a14a svn merge -c 1367601 FIXES: MAPREDUCE-4496. AM logs link is missing user name (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367602 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 15:09:49 +00:00
Thomas Graves a1a7ee23f7 merge -r 1367580:1367581 from trunk. FIXES: MAPREDUCE-4456
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367585 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 14:49:07 +00:00
Thomas Graves ca7732aae9 merge -r 1367538:1367539 from trunk. FIXES: MAPREDUCE-4375
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367540 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 13:40:39 +00:00
Alejandro Abdelnur f86353ba09 Merge -r 1367351:1367352 from trunk to branch. FIXES: MAPREDUCE-4342
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367353 13f79535-47bb-0310-9956-ffa450edef68
2012-07-30 22:57:30 +00:00
Thomas Graves 4850bf623c merge -r 1366257:1366258 from trunk. FIXES: MAPREDUCE-4423
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1366260 13f79535-47bb-0310-9956-ffa450edef68
2012-07-27 01:48:54 +00:00
Alejandro Abdelnur f00a592fe9 Merge -r 1365978:1365979 from trunk to branch. FIXES: MAPREDUCE-4417
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1365982 13f79535-47bb-0310-9956-ffa450edef68
2012-07-26 13:25:41 +00:00
Alejandro Abdelnur 4ded6d2c01 Merge -r 1365321:1365322 from trunk to branch. FIXES: MAPREDUCE-4465
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1365323 13f79535-47bb-0310-9956-ffa450edef68
2012-07-24 22:09:04 +00:00
Thomas Graves dce4a7c765 merge -r 1365239:1365240 from trunk. FIXES: MAPREDUCE-4467
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1365241 13f79535-47bb-0310-9956-ffa450edef68
2012-07-24 19:28:43 +00:00
Arun Murthy 95a5222e4a Merge -c 1365185 from trunk to branch-2 to fix MAPREDUCE-4438. Add a simple, generic client to run 'easy' AMs in YARN. Contributed by Bikas Saha.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1365190 13f79535-47bb-0310-9956-ffa450edef68
2012-07-24 17:40:34 +00:00
Robert Joseph Evans f7a722c38f svn merge -c 1364764 FIXES: MAPREDUCE-3893. allow capacity scheduler configs max-apps and max-am-pct per queue (tgraves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1364765 13f79535-47bb-0310-9956-ffa450edef68
2012-07-23 19:32:59 +00:00
Alejandro Abdelnur 3298bb541c Merge -r 1364019:1364020 from trunk to branch. FIXES: MAPREDUCE-987
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1364117 13f79535-47bb-0310-9956-ffa450edef68
2012-07-21 16:26:00 +00:00
Thomas Graves 45c42817ca svn merge --change -1363455 for reverting MAPREDUCE-4423
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1363936 13f79535-47bb-0310-9956-ffa450edef68
2012-07-20 20:21:09 +00:00
Thomas Graves 5568bf8260 merge -r 1363453:1363454 from trunk. FIXES: MAPREDUCE-4423
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1363455 13f79535-47bb-0310-9956-ffa450edef68
2012-07-19 18:22:03 +00:00
Alejandro Abdelnur 52fa40b8ba Merge -r 1363161:1363162 from trunk to branch. FIXES: MAPREDUCE-4407
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1363163 13f79535-47bb-0310-9956-ffa450edef68
2012-07-18 22:43:52 +00:00
Robert Joseph Evans e69e5c9cd3 svn merge -c 1363067 FIXES: MAPREDUCE-4157. ResourceManager should not kill apps that are well behaved (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1363070 13f79535-47bb-0310-9956-ffa450edef68
2012-07-18 19:44:22 +00:00
Alejandro Abdelnur bd359a1a8e Merge -r 1362750:1362751 from trunk to branch. FIXES: MAPREDUCE-4406
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362752 13f79535-47bb-0310-9956-ffa450edef68
2012-07-18 03:37:38 +00:00
Alejandro Abdelnur c22cddbad1 Merge -r 1362721:1362722 from trunk to branch. FIXES: MAPREDUCE-4422
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362723 13f79535-47bb-0310-9956-ffa450edef68
2012-07-17 23:34:38 +00:00
Daryn Sharp 70f330d14c svn merge -c 1362618 FIXES: MAPREDUCE-4448. Fix NM crash during app cleanup if aggregation didn't
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362621 13f79535-47bb-0310-9956-ffa450edef68
2012-07-17 19:46:44 +00:00
Robert Joseph Evans f8bd54b16a svn merge -c 1362612 FIXES: MAPREDUCE-4380. Empty Userlogs directory is getting created under logs directory (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362613 13f79535-47bb-0310-9956-ffa450edef68
2012-07-17 19:15:30 +00:00
Robert Joseph Evans 71b35e827c svn merge -c 1362608 FIXES: MAPREDUCE-4283. Display tail of aggregated logs by default (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362609 13f79535-47bb-0310-9956-ffa450edef68
2012-07-17 19:08:26 +00:00
Robert Joseph Evans 796272a502 svn merge -c 1362495 FIXES: MAPREDUCE-4449. Incorrect MR_HISTORY_STORAGE property name in JHAdminConfig (Ahmed Radwan via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362496 13f79535-47bb-0310-9956-ffa450edef68
2012-07-17 13:51:52 +00:00
Arun Murthy 1f299865c0 Merge -c 1362332 from trunk to branch-2 to fix MAPREDUCE-4440. Changed SchedulerApp and SchedulerNode to be a minimal interface to allow schedulers to maintain their own.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362333 13f79535-47bb-0310-9956-ffa450edef68
2012-07-17 01:49:30 +00:00
Robert Joseph Evans 0d1867fa9d svn merge -c 1362209 FIXES: MAPREDUCE-4437. Race in MR ApplicationMaster can cause reducers to never be scheduled (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362213 13f79535-47bb-0310-9956-ffa450edef68
2012-07-16 19:13:10 +00:00
Robert Joseph Evans c35da29454 svn merge -c 1362052. FIXES: MAPREDUCE-4395. Possible NPE at ClientDistributedCacheManager#determineTimestamps (Bhallamudi via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362054 13f79535-47bb-0310-9956-ffa450edef68
2012-07-16 14:20:47 +00:00
Arun Murthy 4902c6bdc9 Merge -c 1361813 from trunk to branch-2 to fix MAPREDUCE-4427. Added an 'unmanaged' mode for AMs so as to ease development of new applications. Contributed by Bikas Saha.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1361815 13f79535-47bb-0310-9956-ffa450edef68
2012-07-15 21:47:53 +00:00
Eli Collins 67c853f068 HADOOP-8499. Lower min.user.id to 500 for the tests. Contributed Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1361439 13f79535-47bb-0310-9956-ffa450edef68
2012-07-13 23:05:35 +00:00
Robert Joseph Evans 24bb52b137 svn merge -c 1361397 FIXES: MAPREDUCE-4299. Terasort hangs with MR2 FifoScheduler (Tom White via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1361398 13f79535-47bb-0310-9956-ffa450edef68
2012-07-13 20:55:05 +00:00
Robert Joseph Evans 3260960be3 svn merge -c 1361389 FIXES: MAPREDUCE-4419. ./mapred queue -info <queuename> -showJobs displays all the jobs irrespective of <queuename> (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1361391 13f79535-47bb-0310-9956-ffa450edef68
2012-07-13 20:45:05 +00:00
Alejandro Abdelnur e4f54acd26 Merge -r 1361386:1361387 from trunk to branch. FIXES: MAPREDUCE-4441
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1361390 13f79535-47bb-0310-9956-ffa450edef68
2012-07-13 20:42:51 +00:00
Harsh J f457ffb05b Backport of MAPREDUCE-4432 from trunk. Confusing warning message when GenericOptionsParser is not used. Contributed by Gabriel Reid. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1361275 13f79535-47bb-0310-9956-ffa450edef68
2012-07-13 15:23:09 +00:00
Harsh J 7d09bc1880 Revert MAPREDUCE-4422 from branch-2 until further comments are addressed.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1361100 13f79535-47bb-0310-9956-ffa450edef68
2012-07-13 08:45:53 +00:00
Harsh J eb22b9d183 MAPREDUCE-4422. YARN_APPLICATION_CLASSPATH needs a documented default value in YarnConfiguration. Contributed by Ahmed Radwan. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1361062 13f79535-47bb-0310-9956-ffa450edef68
2012-07-13 07:27:31 +00:00
Alejandro Abdelnur d9fc2b7f8e Merge -r 1361019:1361020 from trunk to branch. FIXES: MAPREDUCE-3451
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1361023 13f79535-47bb-0310-9956-ffa450edef68
2012-07-13 00:47:53 +00:00
Robert Joseph Evans 75af3cba6b svn merge -c 1360735 FIXES: MAPREDUCE-4416. Some tests fail if Clover is enabled (Kihwal Lee via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1360737 13f79535-47bb-0310-9956-ffa450edef68
2012-07-12 15:53:38 +00:00
Vinod Kumar Vavilapalli 60ad1056af MAPREDUCE-3940. ContainerTokens should have an expiry interval. Contributed by Siddharth Seth and Vinod Kumar Vavilapalli.
svn merge -c 1359910 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359912 13f79535-47bb-0310-9956-ffa450edef68
2012-07-10 21:33:04 +00:00
Robert Joseph Evans aaea868826 svn merge -c 1359747. FIXES: MAPREDUCE-4252. MR2 job never completes with 1 pending task (Tom White via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359749 13f79535-47bb-0310-9956-ffa450edef68
2012-07-10 16:11:23 +00:00
Thomas Graves 5ecf46efb6 merge -r 1359398:1359399 from trunk. FIXES: MAPREDUCE-4300
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359400 13f79535-47bb-0310-9956-ffa450edef68
2012-07-09 21:10:09 +00:00
Alejandro Abdelnur 3097c15d9d Merge -r 1359344:1359345 from trunk to branch. FIXES: MAPREDUCE-3993
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359347 13f79535-47bb-0310-9956-ffa450edef68
2012-07-09 19:19:42 +00:00
Alejandro Abdelnur 681857a257 Merge -r 1359302:1359303 from trunk to branch. FIXES: MAPREDUCE-2739
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359304 13f79535-47bb-0310-9956-ffa450edef68
2012-07-09 17:41:05 +00:00
Robert Joseph Evans 2353571c64 svn merge -c 1359252 FIXES: MAPREDUCE-4402. TestFileInputFormat fails intermittently (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359253 13f79535-47bb-0310-9956-ffa450edef68
2012-07-09 16:15:12 +00:00
Harsh J 9ffc3e7dfd Backport MAPREDUCE-3906 from trunk. svn merge -c 1358896 ../../trunk (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358897 13f79535-47bb-0310-9956-ffa450edef68
2012-07-09 02:14:11 +00:00
Harsh J 41553468b1 Backport HADOOP-3907 from trunk (svn merge -c 1358892). (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358894 13f79535-47bb-0310-9956-ffa450edef68
2012-07-09 02:02:53 +00:00
Harsh J b035a14d58 Backport of MAPREDUCE-2220. svn merge -c 1358788 from trunk. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358789 13f79535-47bb-0310-9956-ffa450edef68
2012-07-08 17:24:38 +00:00
Robert Joseph Evans 2e6f49f4e4 svn merge -c 1358305 FIXES: MAPREDUCE-4379. Node Manager throws java.lang.OutOfMemoryError: Java heap space due to org.apache.hadoop.fs.LocalDirAllocator.contexts (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358308 13f79535-47bb-0310-9956-ffa450edef68
2012-07-06 17:20:45 +00:00
Thomas Graves ca23ea7cf5 merge -r 1358200:1358201 from trunk. FIXES: MAPREDUCE-4387
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358203 13f79535-47bb-0310-9956-ffa450edef68
2012-07-06 13:39:41 +00:00
Thomas Graves ca78b62579 merge -r 1357936:1357937 from trunk. FIXES: MAPREDUCE-4384
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1357940 13f79535-47bb-0310-9956-ffa450edef68
2012-07-05 21:37:53 +00:00
Robert Joseph Evans 93f425a659 svn merge -c 1357776 FIXES: MAPREDUCE-4392. Counters.makeCompactString() changed behavior from 0.20 (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1357777 13f79535-47bb-0310-9956-ffa450edef68
2012-07-05 18:10:51 +00:00
Alejandro Abdelnur c25a45dc52 Merge -r 1357722:1357723 from trunk to branch. FIXES: MAPREDUCE-4355
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1357728 13f79535-47bb-0310-9956-ffa450edef68
2012-07-05 16:33:34 +00:00
Harsh J f62de1d81e svn merge -c 1355766 from trunk. Backport of MAPREDUCE-4253. Tests for mapreduce-client-core are lying under mapreduce-client-jobclient. Contributed by Tsuyoshi Ozawa. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355772 13f79535-47bb-0310-9956-ffa450edef68
2012-06-30 17:11:46 +00:00
Eli Collins 4a5591ebe1 MAPREDUCE-4383. HadoopPipes.cc needs to include unistd.h. Contributed by Andy Isaacson
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355557 13f79535-47bb-0310-9956-ffa450edef68
2012-06-29 21:02:29 +00:00
Robert Joseph Evans b38f46e73c svn merge -c 1355124 FIXES: MAPREDUCE-4376. TestClusterMRNotification times out (Kihwal Lee via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355125 13f79535-47bb-0310-9956-ffa450edef68
2012-06-28 19:30:22 +00:00
Alejandro Abdelnur 0b4c8a5875 Reverting MAPREDUCE-4346
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1354658 13f79535-47bb-0310-9956-ffa450edef68
2012-06-27 18:33:38 +00:00
Robert Joseph Evans 15e5fb1c34 svn merge -c 1354531 FIXES: MAPREDUCE-4372. Deadlock in Resource Manager (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1354533 13f79535-47bb-0310-9956-ffa450edef68
2012-06-27 14:29:12 +00:00
Robert Joseph Evans 4bb61ecbd7 svn merge -c 1354181 FIXES: MAPREDUCE-4228. mapreduce.job.reduce.slowstart.completedmaps is not working properly (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1354182 13f79535-47bb-0310-9956-ffa450edef68
2012-06-26 19:18:49 +00:00
Alejandro Abdelnur df2f723a75 Merge -r 1353756:1353757 from trunk to branch. FIXES: MAPREDUCE-4355
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1353760 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 22:01:01 +00:00
Alejandro Abdelnur d21c6aa52f Merge -r 1353749:1353750 from trunk to branch. FIXES: MAPREDUCE-2289
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1353751 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 21:37:14 +00:00
Siddharth Seth 09ac40f800 Merge MAPREDUCE-4290 from trunk. Fix Yarn Applicaiton Status to MR JobState conversion. (Contributed by Devaraj K)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1353685 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 17:56:11 +00:00
Alejandro Abdelnur e519ed959a Merge -r 1353624:1353625 from trunk to branch. FIXES: MAPREDUCE-4336
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1353628 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 16:03:25 +00:00
Siddharth Seth 461ef73bf2 Merge MAPREDUCE-4031 from trunk. Prevent a Node Manager hang during shutdown. (Contributed by Devaraj K)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1353040 13f79535-47bb-0310-9956-ffa450edef68
2012-06-22 21:47:12 +00:00
Thomas Graves 22d23a4d0f merge -r 1352637:1352638 from trunk. FIXES: MAPREDUCE-4295
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1352639 13f79535-47bb-0310-9956-ffa450edef68
2012-06-21 18:15:13 +00:00
Thomas Graves 2d734774a1 merge -r 1352549:1352550 from trunk. FIXES: MAPREDUCE-4320
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1352551 13f79535-47bb-0310-9956-ffa450edef68
2012-06-21 15:02:16 +00:00
Robert Joseph Evans f63255faec svn merge -c 1352330. FIXES: MAPREDUCE-3889. job client tries to use /tasklog interface, but that doesn't exist anymore (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1352335 13f79535-47bb-0310-9956-ffa450edef68
2012-06-20 21:32:21 +00:00
Siddharth Seth 3b61e3693f Merge MAPREDUCE-4306 from trunk. Fix distributed shell to work with users other than the one running the daemons. (Contributed by Ahmed Radwan)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351878 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 22:02:48 +00:00
Siddharth Seth 27bbcc4c5c Merge MAPREDUCE-4270 from trunk. Move the data_join test classes to the correct path. (Contributed by Thomas Graves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351870 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 21:54:00 +00:00
Robert Joseph Evans c30a4d6a90 svn merge -c 1351818. FIXESL MAPREDUCE-4267. mavenize pipes (tgraves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351825 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 20:00:35 +00:00
Thomas Graves 234f1a7ab7 merge -r 1351761:1351762 from trunk. FIXES: MAPREDUCE-4341
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351764 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 16:18:08 +00:00
Thomas Graves daf8c54e66 merge -r 1351699:1351700 from trunk. FIXES: MAPREDUCE-4311
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351703 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 13:08:20 +00:00
Siddharth Seth 2846979f16 Merged MAPREDUCE-3921 from trunk. MR AM should act on node health status changes. Contributed by Bikas Saha
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349066 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 23:16:08 +00:00
Thomas White f323ea705d Merge -r 1348996:1348997 from trunk to branch-2. Fixes: MAPREDUCE-3871.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348999 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 20:39:13 +00:00
Thomas Graves 4159a21d28 merge -r 1348845:1348846 from trunk. FIXES: MAPREDUCE-3927
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348848 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 13:57:15 +00:00
Thomas Graves d1607ba557 merge -r 1348122:1348123 from trunk. FIXES: MAPREDUCE-3842
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348126 13f79535-47bb-0310-9956-ffa450edef68
2012-06-08 15:51:21 +00:00
Vinod Kumar Vavilapalli cb4b43b37e MAPREDUCE-3873. Fixed NodeManagers' decommissioning at RM to accept IP addresses also. Contributed by xieguiming and vinodkv.
svn merge --ignore-ancestry -c 1346671 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346673 13f79535-47bb-0310-9956-ffa450edef68
2012-06-05 23:55:46 +00:00
Robert Joseph Evans eb7df250ca svn merge -c 1346406. FIXES: MAPREDUCE-4313. TestTokenCache doesn't compile due TokenCache.getDelegationToken compilation error (bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346409 13f79535-47bb-0310-9956-ffa450edef68
2012-06-05 15:09:56 +00:00
Eli Collins 068b62b9a3 Updated CHANGES.txt files to reflect the 2.0.0-alpha release
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346151 13f79535-47bb-0310-9956-ffa450edef68
2012-06-04 20:54:17 +00:00
Thomas Graves 3dc10a25d9 merge -r 1346046:1346047 from trunk. FIXES: MAPREDUCE-3350
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346048 13f79535-47bb-0310-9956-ffa450edef68
2012-06-04 17:42:45 +00:00
Thomas Graves c59349ede3 merge -r 1346001:1346002 from trunk. FIXES: MAPREDUCE-4301
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346003 13f79535-47bb-0310-9956-ffa450edef68
2012-06-04 15:15:13 +00:00
Eli Collins 026a285d52 MAPREDUCE-4307. TeraInputFormat calls FileSystem.getDefaultBlockSize() without a Path - Failure when using ViewFileSystem. Contributed by Ahmed Radwan
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1345552 13f79535-47bb-0310-9956-ffa450edef68
2012-06-02 18:50:50 +00:00
Robert Joseph Evans 5e8a982209 svn merge -c 1345362. FIXES: MAPREDUCE-4302. NM goes down if error encountered during log aggregation (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1345363 13f79535-47bb-0310-9956-ffa450edef68
2012-06-01 21:56:04 +00:00
Robert Joseph Evans f376251475 svn merge -c 1344763 FIXES: MAPREDUCE-4297. Usersmap file in gridmix should not fail on empty lines (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1344764 13f79535-47bb-0310-9956-ffa450edef68
2012-05-31 15:17:39 +00:00
Robert Joseph Evans ed20ba2e49 svn merge -c 1344283. FIXES: MAPREDUCE-4152. map task left hanging after AM dies trying to connect to RM (Tom Graves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1344288 13f79535-47bb-0310-9956-ffa450edef68
2012-05-30 14:52:39 +00:00
Harsh J 4200fa906e svn merge -c 1343804 from trunk. Backport of MAPREDUCE-3493. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343809 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 16:15:25 +00:00
Thomas White 5e473c9c6e Merge -r 1343754:1343755 from trunk to branch-2. Fixes: MAPREDUCE-4146
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343756 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 14:45:25 +00:00
Thomas Graves 02a703fac2 merge -r 1342243:1342244 from trunk. FIXES: MAPREDUCE-4224
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1342245 13f79535-47bb-0310-9956-ffa450edef68
2012-05-24 13:17:08 +00:00
Alejandro Abdelnur 897314775b Merge -r 1342074:1342075 from trunk to branch. FIXES: MAPREDUCE-4276
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1342076 13f79535-47bb-0310-9956-ffa450edef68
2012-05-23 22:23:50 +00:00
Thomas Graves f57e335252 merge -r 1341971:1341972 from trunk. FIXES: MAPREDUCE-4262
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1341973 13f79535-47bb-0310-9956-ffa450edef68
2012-05-23 18:38:23 +00:00
Thomas Graves 0a0c649c86 merge -r 1341159:1341160 from trunk. FIXES: MAPREDUCE-3870
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1341162 13f79535-47bb-0310-9956-ffa450edef68
2012-05-21 19:22:49 +00:00
Robert Joseph Evans 1586e827ed i?\127svn merge -c 1341151. FIXES: MAPREDUCE-4274 MapOutputBuffer should use native byte order for kvmeta. (todd via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1341153 13f79535-47bb-0310-9956-ffa450edef68
2012-05-21 19:07:13 +00:00
Thomas Graves 1c65990dae merge -r 1340879:1340880 from trunk. FIXES: MAPREDUCE-4269
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1340881 13f79535-47bb-0310-9956-ffa450edef68
2012-05-21 01:57:21 +00:00
Todd Lipcon 58f72f035f MAPREDUCE-4002. MultiFileWordCount job fails if the input path is not from default file system. Contributed by Bhallamudi Venkata Siva Kamesh.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1340629 13f79535-47bb-0310-9956-ffa450edef68
2012-05-20 07:41:37 +00:00
Thomas Graves 297cbcca27 merge -r 1339956:1339957 from trunk. FIXES: MAPREDUCE-4197
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339958 13f79535-47bb-0310-9956-ffa450edef68
2012-05-18 02:51:56 +00:00
Thomas Graves b35de62e1d MAPREDUCE-3543. Mavenize Gridmix. (tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339652 13f79535-47bb-0310-9956-ffa450edef68
2012-05-17 15:31:19 +00:00
Thomas Graves a1ce7813e9 merge -r 1339173:1339174 from trunk. FIXES: MAPREDUCE-4102
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339177 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 14:10:35 +00:00
Todd Lipcon 73766e6d1d Move changes from 2.0.0-alpha to 2.0.1-alpha in CHANGES.txt for those that did not make rc1
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339017 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 05:44:01 +00:00
Alejandro Abdelnur e8ea3fdb52 Merge -r 1338999:1339000 from trunk to branch. FIXES: MAPREDUCE-4250
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339002 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 04:16:37 +00:00
Thomas Graves c993d1bac5 merge -r 1338834:1338835 from trunk. FIXES: MAPREDUCE-4238
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1338841 13f79535-47bb-0310-9956-ffa450edef68
2012-05-15 19:15:43 +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
Robert Joseph Evans 5922f4f064 svn merge -c 1337363 FIXES: MAPREDUCE-4233. NPE can happen in RMNMNodeInfo. (bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337364 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 20:27:58 +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
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
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
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
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
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 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
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
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
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
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
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
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
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
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
Thomas White a7e688c6a8 Merge -r 1330426:1330427 from trunk to branch-2. Fixes: MAPREDUCE-4193.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330429 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 17:22:53 +00:00
Thomas Graves f8f390b83d merge -r 1329693:1329694 from trunk. FIXES: MAPREDUCE-4079
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329697 13f79535-47bb-0310-9956-ffa450edef68
2012-04-24 13:07:22 +00:00
Alejandro Abdelnur 37026cea83 Merge -r 1329492:1329493 from trunk to branch. FIXES: MAPREDUCE-4141
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329496 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 22:33:51 +00:00
Robert Joseph Evans 88d736ce2b svn merge -c 1329403. FIXES: MAPREDUCE-4133. MR over viewfs is broken (John George via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329405 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 19:46:16 +00:00
Robert Joseph Evans 1fca6cfe03 svn merge -c 1329398 FIXES: MAPREDUCE-4190. Improve web UI for task attempts userlog link (Tom Graves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329399 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 19:39:43 +00:00
Robert Joseph Evans 1ea39ddc3c svn merge -c 1329282 FIXES: MAPREDUCE-3812. Lower default allocation sizes, fix allocation configurations and document them (Harsh J via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329283 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 15:28:19 +00:00
Robert Joseph Evans 0c244e8703 svn merge -c 1328111, FIXES: MAPREDUCE-3947. yarn.app.mapreduce.am.resource.mb not documented (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328112 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 20:36:47 +00:00
Alejandro Abdelnur 479e5b0102 Merge -r 1328108:1328109 from trunk to branch. FIXES: MAPREDUCE-3867
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328110 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 20:34:49 +00:00
Robert Joseph Evans 8f4c3499f5 svn merge -c 1328106, FIXES: MAPREDUCE-4129. Lots of unneeded counters log messages (Ahmed Radwan via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328107 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 20:24:45 +00:00
Robert Joseph Evans e439d3bb39 MAPREDUCE-4093. Improve RM WebApp start up when proxy address is not set (Devaraj K vai bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328091 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 19:44:55 +00:00
Robert Joseph Evans eec2fd9f74 MAPREDUCE-4165. Committing is misspelled as commiting in task logs (John Eagles via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328087 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 19:33:04 +00:00
Robert Joseph Evans a18ad09c94 svn merge -c 1328031 from trunk. FIXES: MAPREDUCE-4159. Job is running in Uber mode after setting "mapreduce.job.ubertask.maxreduces" to zero (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328033 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 16:23:35 +00:00
Thomas Graves 7221ae82e5 merge -r 1327971:1327972 from trunk. FIXES: MAPREDUCE-4074
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327977 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 14:54:03 +00:00
Robert Joseph Evans 461b330ebf svn merge -c 1327621 from trunk. FIXES: MAPREDUCE-4161. create sockets consistently (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327624 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 18:48:20 +00:00
Siddharth Seth be7e487ef3 Merge MAPREDUCE-3972 from trunk. Fix locking and exception issues in JobHistory server. (Contributed by Robert Joseph Evans)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327355 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 02:01:02 +00:00
Robert Joseph Evans 45b2835e9f svn merge -c 1327304 from trunk. FIXES: MAPREDUCE-4134. Remove references of mapred.child.ulimit etc. since they are not being used any more (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327306 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 22:13:52 +00:00
Thomas Graves 1769fd46e2 merge -r 1327262:1327263 from trunk. FIXES: MAPREDUCE-4151
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327265 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 20:06:49 +00:00
Thomas Graves 7fec5b7d94 merge -r 1327232:1327233 from trunk. FIXES: MAPREDUCE-4160
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327234 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 19:23:01 +00:00
Siddharth Seth ab8ea1db58 Merge MAPREDUCE-3942 from trunk. Randomize master key generation for ApplicationTokenSecretManager and roll it every so often. (Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327221 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 18:55:53 +00:00
Thomas Graves 27cdd16a50 merge -r 1326794:1326795 from trunk. FIXES: MAPREDUCE-4156
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1326796 13f79535-47bb-0310-9956-ffa450edef68
2012-04-16 20:47:44 +00:00
Thomas Graves e1aa56712c merge -r 1326706:1326707 from trunk. FIXES: MAPREDUCE-4008
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1326709 13f79535-47bb-0310-9956-ffa450edef68
2012-04-16 18:04:25 +00:00
Siddharth Seth 68f136337d Merge MAPREDUCE-4144 from trunk. Fix a NPE in the ResourceManager when handling node updates. (Contributed by Jason Lowe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325993 13f79535-47bb-0310-9956-ffa450edef68
2012-04-13 22:26:07 +00:00
Robert Joseph Evans 8ca897dea2 svn merge -c 1325765 from trunk. FIXES: MAPREDUCE-4128. AM Recovery expects all attempts of a completed task to also be completed. (Bikas Saha via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325767 13f79535-47bb-0310-9956-ffa450edef68
2012-04-13 13:46:45 +00:00
Thomas White f537469c7e Merge -r 1325572:1325573 from trunk to branch-2. Fixes: MAPREDUCE-4147
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325574 13f79535-47bb-0310-9956-ffa450edef68
2012-04-13 00:11:53 +00:00
Siddharth Seth d550503dbb Merge MAPREDUCE-4050 from trunk. For tasks without assigned containers, changes the node text on the UI to N/A instead of a link to null. (Contributed by Bhallamudi Venkata Siva Kamesh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325436 13f79535-47bb-0310-9956-ffa450edef68
2012-04-12 18:41:09 +00:00
Thomas White cb3d6c3d98 Merge -r 1325351:1325352 from trunk to branch-2. Fixes: MAPREDUCE-4140
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325359 13f79535-47bb-0310-9956-ffa450edef68
2012-04-12 16:31:15 +00:00
Thomas Graves d31abfe3f8 merge -r 1325009:1325010 from trunk. FIXES: MAPREDUCE-4107
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325011 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 21:14:55 +00:00
Siddharth Seth 462f9a5249 MAPREDUCE-3932. Fix the TaskAttempt state machine to handle CONTIANER_LAUNCHED and CONTIANER_LAUNCH_FAILED events in additional states. (Contributed by Robert Joseph Evans)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1324903 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 18:20:08 +00:00
Siddharth Seth 50c13a44af merge MAPREDUCE-4099 amendment from trunk. ApplicationMaster will remove staging directory after the history service is stopped. (Contributed by Jason Lowe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1324868 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 17:11:34 +00:00