Commit Graph

588 Commits

Author SHA1 Message Date
Junping Du a9613bcc94 Ability to limit running map and reduce tasks. Contributed by Jason Lowe.
(cherry picked from commit 4228de9402)

Conflicts:
    hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
2015-03-03 02:23:00 -08:00
Akira Ajisaka f7a724ca9e HADOOP-10976. Backport "moving the source code of hadoop-tools docs to the directory under hadoop-tools" to branch-2. Contributed by Masatake Iwasaki.
(cherry picked from commit 9112f093cd)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
2015-02-28 17:06:58 -08:00
Akira Ajisaka 8aa0c73294 MAPREDUCE-5612. Add javadoc for TaskCompletionEvent.Status. Contributed by Chris Palmer.
(cherry picked from commit bfbf076b7d)
2015-02-26 15:06:26 -08:00
Akira Ajisaka 5f0d1f10db MAPREDUCE-2815. JavaDoc does not generate correctly for MultithreadedMapRunner. Contributed by Chris Palmer.
(cherry picked from commit 9a37247a67)
2015-02-24 12:11:22 -08:00
Akira Ajisaka 5e686dae44 MAPREDUCE-6264. Remove httpclient dependency from hadoop-mapreduce-client. Contributed by Brahma Reddy Battula.
(cherry picked from commit 3f665aa4d5ac2e737e29ff63b3837c083a49ea80)
2015-02-24 11:33:05 -08:00
Jason Lowe 386e62ace3 MAPREDUCE-6261. NullPointerException if MapOutputBuffer.flush invoked twice. Contributed by Tsuyoshi OZAWA
(cherry picked from commit 4981d082d4)
2015-02-18 19:28:45 +00:00
Junping Du 1d91daaae9 MAPREDUCE-6225. Fix new findbug warnings in hadoop-mapreduce-client-core. Contributed by Varun Saxena
(cherry picked from commit 814afa46ef)
2015-02-16 09:39:20 -08:00
Tsuyoshi Ozawa 7011125778 MAPREDUCE-6256. Removed unused private methods in o.a.h.mapreduce.Job.java. Contributed by Naganarasimha G R.
(cherry picked from commit 3338f6d907)
2015-02-15 10:10:11 +09:00
Tsuyoshi Ozawa 9d57392f5b MAPREDUCE-6221. Stringifier is left unclosed in Chain#getChainElementConf(). Contributed by Ted Yu.
(cherry picked from commit 9b0ba59b82)
2015-02-13 02:28:19 +09:00
Tsuyoshi Ozawa 941a923514 MAPREDUCE-4431. mapred command should print the reason on killing already completed jobs. Contributed by Devaraj K.
(cherry picked from commit ac8d52bf50)
2015-02-12 20:37:14 +09:00
Tsuyoshi Ozawa 9129b3415c MAPREDUCE-5335. Rename Job Tracker terminology in ShuffleSchedulerImpl. Contributed by Devaraj K.
(cherry picked from commit b42d09eb62)
2015-02-12 20:08:47 +09:00
Devaraj K a00c9362e6 MAPREDUCE-6253. Update use of Iterator to Iterable. Contributed by Ray
Chiang.

(cherry picked from commit 76e309ead0)
2015-02-12 13:47:19 +05:30
Tsuyoshi Ozawa b1aad1d941 MAPREDUCE-6237. Multiple mappers with DBInputFormat don't work because of reusing conections. Contributed by Kannan Rajah.
(cherry picked from commit 241336ca2b)
2015-02-10 03:53:15 +09:00
Akira Ajisaka ad4b243586 MAPREDUCE-5988. Fix dead links to the javadocs in mapreduce project. (aajisaka)
(cherry picked from commit cc6bbfceae)
2015-02-04 17:46:39 -08:00
Akira Ajisaka 8d98e5c960 MAPREDUCE-5800. Use Job#getInstance instead of deprecated constructors. (aajisaka)
(cherry picked from commit bd69fb2d44)

Conflicts:
	hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/mapreduce/TestStreamXmlRecordReader.java
2015-02-03 14:35:15 -08:00
Robert Kanter a3a7efe748 MAPREDUCE-6143. add configuration for mapreduce speculative execution in MR2 (zxu via rkanter)
(cherry picked from commit 8acc5e9b4b)
2015-02-02 13:52:29 -08:00
Jason Lowe 2cf58ca5a6 MAPREDUCE-6141. History server leveldb recovery store. Contributed by Jason Lowe
(cherry picked from commit 56b7ec71a6)
2015-01-26 16:30:10 +00:00
Xuan 0562f382fa MAPREDUCE-6173. Document the configuration of deploying MR over
distributed cache with enabling wired encryption at the same time.
Contributed by Junping Du.

(cherry picked from commit 10ac5abb86)
2015-01-13 10:08:24 -08:00
Tsuyoshi Ozawa 132fd6ba58 HADOOP-11032. Replace use of Guava's Stopwatch with Hadoop's StopWatch. (ozawa)
(cherry picked from commit a6ed4894b5)

Conflicts:
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/test/java/org/apache/hadoop/mapred/nativetask/kvtest/KVJob.java
2015-01-08 15:00:02 +09:00
Jason Lowe c22c27068e MAPREDUCE-6206. TestAggregatedTransferRate fails on non-US systems. Contributed by Jens Rabe
(cherry picked from commit a0aeed100b)
2015-01-06 23:40:42 +00:00
Jason Lowe 2b408d8dc7 HADOOP-11445. Bzip2Codec: Data block is skipped when position of newly created stream is equal to start of split. Contributed by Ankit Kamboj
(cherry picked from commit d02fb53750)
2015-01-06 21:20:31 +00:00
Harsh J 6d65e74670 MAPREDUCE-6149. Document override log4j.properties in MR job. Contributed by Junping Du.
(cherry picked from commit 6621c3598e)
2014-12-30 23:13:19 +05:30
Robert Kanter f9341c1e2c MAPREDUCE-6199. AbstractCounters are not reset completely on deserialization (adhoot via rkanter)
(cherry picked from commit 390a7c12f5)
2014-12-19 15:44:01 -08:00
Karthik Kambatla e6c73a1c1a HADOOP-11213. Typos in html pages: SecureMode and EncryptedShuffle. (Wei Yan via kasha)
(cherry picked from commit 6f1e3667cf)
2014-12-19 15:07:39 -08:00
Gera Shegalov 7c7bccfc31 MAPREDUCE-6166. Reducers do not validate checksum of map outputs when fetching directly to disk. (Eric Payne via gera)
(cherry picked from commit af006937e8)
2014-12-15 19:21:46 -08:00
Harsh J a3fa1f0761 MAPREDUCE-6194. Bubble up final exception in failures during creation of output collectors. Contributed by Varun Saxena.
(cherry picked from commit 298d09c9b5)
2014-12-15 14:27:49 +05:30
Gera Shegalov 8437c31b67 HADOOP-11211. mapreduce.job.classloader.system.classes semantics should be order-independent. (Yitong Zhou via gera)
(cherry picked from commit 0bcea111e5)
2014-12-11 13:29:40 -08:00
Harsh J 6e06a51e30 MAPREDUCE-5420. Remove mapreduce.task.tmp.dir from mapred-default.xml. Contributed by James Carman. (harsh)
(cherry picked from commit cb99f43305)
2014-12-11 09:46:08 +05:30
Harsh J bb1fedfbc3 MAPREDUCE-6177. Minor typo in the EncryptedShuffle document about ssl-client.xml. Contributed by Yangping Wu. (harsh)
(cherry picked from commit 8963515b88)
2014-12-08 16:00:12 +05:30
Jason Lowe db723a8499 MAPREDUCE-5932. Provide an option to use a dedicated reduce-side shuffle log. Contributed by Gera Shegalov
(cherry picked from commit 03ab24aa01)

Conflicts:

	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
2014-12-03 17:12:47 +00:00
Jason Lowe 2bdef5697b MAPREDUCE-6172. TestDbClasses timeouts are too aggressive. Contributed by Varun Saxena
(cherry picked from commit 2b30fb1053)
2014-12-01 21:52:51 +00:00
Karthik Kambatla 3a4211ec2c MAPREDUCE-6169. MergeQueue should release reference to the current item from key and value at the end of the iteration to save memory. (Zhihai Xu via kasha)
(cherry picked from commit 90194ca1cb)
2014-11-20 15:37:18 -08:00
Ravi Prakash 45692effe4 MAPREDUCE-5918. LineRecordReader can return the same decompressor to CodecPool multiple times (Sergey Murylev via raviprak) 2014-11-14 03:48:28 -08:00
Jason Lowe e62a5f9d0a MAPREDUCE-6156. Fetcher - connect() doesn't handle connection refused correctly. Contributed by Junping Du
(cherry picked from commit 177e8090f5)
2014-11-13 15:43:28 +00:00
cnauroth 69a7780ee5 HADOOP-7984. Add hadoop --loglevel option to change log level. Contributed by Aikira AJISAKA. 2014-11-12 21:44:05 -08:00
Arun C. Murthy adfb830a2b Preparing to release hadoop-2.6.0: Set version in branch-2 to 2.7.0-SNAPSHOT. 2014-11-09 19:19:02 -08:00
Arun C. Murthy 1f5bad04ce HADOOP-11286. Copied LimitInputStream from guava-0.14 to hadoop to avoid issues with newer versions of guava in applications. Contributed by Christopher Tubbs.
(cherry picked from commit 6caa8100d5)
2014-11-09 05:23:10 -08:00
Kihwal Lee a19123df9a MAPREDUCE-5958. Wrong reduce task progress if map output is compressed. Contributed by Emilio Coppa and Jason Lowe.
(cherry picked from commit 8f701ae07a)
2014-11-06 15:56:10 -06:00
Jason Lowe c0bbb72912 MAPREDUCE-5960. JobSubmitter's check whether job.jar is local is incorrect with no authority in job jar path. Contributed by Gera Shegalov
(cherry picked from commit 10f9f5101c)
2014-11-06 15:12:06 +00:00
Zhijie Shen c4aaa4db6c MAPREDUCE-6052. Supported overriding the default container-log4j.properties file per job. Contributed by Junping Du.
(cherry picked from commit ed63b11646)
2014-11-01 00:49:38 -07:00
Karthik Kambatla 160aebcae2 HADOOP-11243. SSLFactory shouldn't allow SSLv3. (Wei Yan via kasha)
(cherry picked from commit 3c5f5af118)
2014-10-28 18:08:00 -07:00
Zhijie Shen 52695d38fc MAPREDUCE-6018. Added an MR specific config to enable emitting job history data to the timeline server. Contributed by Robert Kanter.
(cherry picked from commit 971e91c8c0)
2014-10-27 21:08:38 -07:00
Jian He 1c235a4448 YARN-2198. Remove the need to run NodeManager as privileged account for Windows Secure Container Executor. Contributed by Remus Rusanu
(cherry picked from commit 3b12fd6cfb)
2014-10-22 15:58:26 -07:00
Jian He f93d2ea27e YARN-2312. Deprecated old ContainerId#getId API and updated MapReduce to use ContainerId#getContainerId instead. Contributed by Tsuyoshi OZAWA 2014-10-15 15:28:26 -07:00
Jason Lowe 025b6c13e9 MAPREDUCE-5970. Provide a boolean switch to enable MR-AM profiling. Contributed by Gera Shegalov
(cherry picked from commit f19771a24c)
2014-10-15 17:51:53 +00:00
Jason Lowe 1179a0cb07 MAPREDUCE-5873. Shuffle bandwidth computation includes time spent waiting for maps. Contributed by Siqi Li
(cherry picked from commit b9edad6403)
2014-10-15 15:54:57 +00:00
Karthik Kambatla 7bfd9e068d MAPREDUCE-5875. Make Counter limits consistent across JobClient, MRAppMaster, and YarnChild. (Gera Shegalov via kasha)
(cherry picked from commit ed0e0ef9748ce5b231de677ab41c3035137bbde4)
2014-10-11 22:49:46 -07:00
cnauroth 85a2b90740 MAPREDUCE-6122. TestLineRecordReader may fail due to test data files checked out of git with incorrect line endings. Contributed by Chris Nauroth.
(cherry picked from commit 684170d5ef)
2014-10-09 22:27:40 -07:00
subru 30a370e705 MAPREDUCE-6103.Adding reservation APIs to MR resource manager delegate. Contributed by Subru Krishnan and Carlo Curino.
(cherry picked from commit aa92dd45f2)
(cherry picked from commit 3f282762d1)
2014-10-06 10:21:06 -07:00
Jian He a6879b606e MAPREDUCE-6087. Fixed wrong config name of MRJobConfig#MR_CLIENT_TO_AM_IPC_MAX_RETRIES_ON_TIMEOUTS. Contributed by Akira AJISAKA
(cherry picked from commit 5f16c98ad6)
2014-09-26 18:06:19 -07:00
Allen Wittenauer e5d284664b MAPREDUCE-5796. Use current version of the archive name in DistributedCacheDeploy document (Akira AJISAKA via aw) 2014-09-26 12:59:59 -07:00
Allen Wittenauer fe8222998f MAPREDUCE-6073. Description of mapreduce.job.speculative.slowtaskthreshold in mapred-default should be moved into description tags (Tsuyoshi OZAWA via aw) 2014-09-26 11:17:11 -07:00
Zhijie Shen 7b3ecc547f MAPREDUCE-5831. Make MR client ignore unknown counters received from AM. Contributed by Junping Du.
(cherry picked from commit 662fc11ae7)
2014-09-25 23:46:57 -07:00
Allen Wittenauer 7ffb636a54 MAPREDUCE-6093. minor distcp doc edits (Charles Lamb via aw) 2014-09-25 11:33:01 -07:00
Karthik Kambatla 372bf54072 MAPREDUCE-6086. mapreduce.job.credentials.binary should allow all URIs. (Zhihai Xu via kasha)
(cherry picked from commit 52945a33cc)
2014-09-18 15:47:21 -07:00
Jason Lowe 44c7113133 MAPREDUCE-5891. Improved shuffle error handling across NM restarts. Contributed by Junping Du
(cherry picked from commit 2c3da25fd7)
2014-09-18 22:01:42 +00:00
Andrew Wang 5bc71071d1 HADOOP-11106. Document considerations of HAR and Encryption. (clamb via wang)
(cherry picked from commit fe2f54d4cb)
2014-09-18 14:51:27 -07:00
Jason Lowe 6f8abe7efe MAPREDUCE-6070. yarn.app.am.resource.mb/cpu-vcores affects uber mode but is not documented. Contributed by Tsuyoshi OZAWA
(cherry picked from commit 9e28e089c6)
2014-09-11 16:20:51 +00:00
Chris Douglas 69ee11dc93 MAPREDUCE-6063. Correct spill size calculation for spills wrapping the circular buffer. Contributed by zhihai xu. 2014-09-03 17:02:17 -07:00
Andrew Wang 075bb9e380 HADOOP-11021. Configurable replication factor in the hadoop archive command. Contributed by Zhe Zhang.
(cherry picked from commit ea1c6f31c2)
2014-08-29 14:47:28 -07:00
Chris Douglas 4f95017602 Fix typos in log messages. Contributed by Ray Chiang 2014-08-28 16:30:13 -07:00
Alejandro Abdelnur c77bd85b62 HDFS-6134 and HADOOP-10150 subtasks. 2014-08-28 15:03:08 -07:00
Sanford Ryza c38e751bca MAPREDUCE-5130. Fix mapred-default.xml after bad merge.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619930 13f79535-47bb-0310-9956-ffa450edef68
2014-08-22 20:58:12 +00:00
Sanford Ryza 53da85efaf MAPREDUCE-5130. Add missing job config options to mapred-default.xml (Ray Chiang via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619631 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 23:54:38 +00:00
Jason Darrell Lowe 23b4c0b6c1 HADOOP-10893. isolated classloader on the client side. Contributed by Sangjin Lee
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619605 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 21:41:24 +00:00
Karthik Kambatla c9d7647826 MAPREDUCE-5974. Allow specifying multiple MapOutputCollectors with fallback. (Todd Lipcon via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619496 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 17:39:54 +00:00
Karthik Kambatla c9702526a0 MAPREDUCE-6012. DBInputSplit creates invalid ranges on Oracle. (Wei Yan via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618696 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 18:33:59 +00:00
Zhijie Shen 570183a437 MAPREDUCE-6024. Shortened the time when Fetcher is stuck in retrying before concluding the failure by configuration. Contributed by Yunjiong Zhao.
svn merge --ignore-ancestry -c 1618677 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618679 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 17:59:32 +00:00
Jason Darrell Lowe c66756ebc1 svn merge -c 1618080 FIXES: MAPREDUCE-5878. some standard JDK APIs are not part of system classes defaults. Contributed by Sangjin Lee
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618081 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 23:18:45 +00:00
Allen Wittenauer d171c87a7a MAPREDUCE-5906. Inconsistent configuration in property "mapreduce.reduce.shuffle.input.buffer.percent" (Akira AJISAKA via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618008 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 18:07:50 +00:00
Allen Wittenauer a43fd59ba3 MAPREDUCE-5999. Fix dead link in InputFormat javadoc (Akira AJISAKA via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618005 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 17:57:36 +00:00
Allen Wittenauer eb11b4b2a7 MAPREDUCE-5998. CompositeInputFormat javadoc is broken (Akira AJISAKA via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617997 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 17:18:49 +00:00
Allen Wittenauer 8d1c74766b MAPREDUCE-5950. incorrect description in distcp2 document (Akira AJISAKA via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617993 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 17:11:30 +00:00
Allen Wittenauer 90478326fc MAPREDUCE-5597. Missing alternatives in javadocs for deprecated constructors in mapreduce.Job (Akira AJISAKA via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617985 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 15:57:42 +00:00
Allen Wittenauer 9a07d2c02c MAPREDUCE-5363. Fix doc and spelling for TaskCompletionEvent#getTaskStatus and getStatus (Akira AJISAKA via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617983 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 15:53:24 +00:00
Allen Wittenauer 89b41b5ce9 MAPREDUCE-5363. Fix doc and spelling for TaskCompletionEvent#getTaskStatus and getStatus (Akira AJISAKA via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617981 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 15:48:31 +00:00
Allen Wittenauer eeb8ff9688 MAPREDUCE-4791. Javadoc for KeyValueTextInputFormat should include default separator and how to change it (Akira AJISAKA via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617980 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 15:44:54 +00:00
Allen Wittenauer 0cac0fafc3 MAPREDUCE-883. harchive: Document how to unarchive (Akira AJISAKA and Koji Noguchi via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617978 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 15:40:31 +00:00
Allen Wittenauer 93e518be3a MAPREDUCE-5943. Separate mapred commands from CommandManual.apt.vm (Akira AJISAKA via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617807 13f79535-47bb-0310-9956-ffa450edef68
2014-08-13 19:36:08 +00:00
Zhijie Shen 8cde949397 MAPREDUCE-6002. Made MR task avoid reporting error to AM when the task process is shutting down. Contributed by Wangda Tan.
svn merge --ignore-ancestry -c 1613743 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613744 13f79535-47bb-0310-9956-ffa450edef68
2014-07-27 01:41:44 +00:00
Jason Darrell Lowe 0e2fee873d svn merge -c 1612400 FIXES: MAPREDUCE-5756. CombineFileInputFormat.getSplits() including directories in its results. Contributed by Jason Dere
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612402 13f79535-47bb-0310-9956-ffa450edef68
2014-07-21 21:30:33 +00:00
Vinod Kumar Vavilapalli 2c2c589700 MAPREDUCE-5790. Made it easier to enable hprof profile options by default. Contributed by Gera Shegalov.
svn merge --ignore-ancestry -c 1610578 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1610579 13f79535-47bb-0310-9956-ffa450edef68
2014-07-15 04:49:31 +00:00
Karthik Kambatla 9133e3142c Preparing for 2.6.0 development. Updated versions.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607541 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 06:11:57 +00:00
Vinod Kumar Vavilapalli 5f0a84d919 MAPREDUCE-5830. Added back the private API HostUtil.getTaskLogUrl(..) for binary compatibility with older clients like Hive 0.13. Contributed by Akira Ajisaka.
svn merge --ignore-ancestry -c 1604230 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604231 13f79535-47bb-0310-9956-ffa450edef68
2014-06-20 18:28:51 +00:00
Karthik Kambatla ff2886e909 MAPREDUCE-5844. Add a configurable delay to reducer-preemption. (Maysam Yabandeh via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604032 13f79535-47bb-0310-9956-ffa450edef68
2014-06-19 21:13:14 +00:00
Karthik Kambatla 1bbdc43f92 MAPREDUCE-5896. InputSplits should indicate which locations have the block cached in memory. (Sandy Ryza via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603673 13f79535-47bb-0310-9956-ffa450edef68
2014-06-18 23:32:36 +00:00
Karthik Kambatla c43ab7f08e YARN-2155. FairScheduler: Incorrect threshold check for preemption. (Wei Yan via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602297 13f79535-47bb-0310-9956-ffa450edef68
2014-06-12 21:26:39 +00:00
Uma Maheswara Rao G f089311aba Merge from trunk to branch-2. MAPREDUCE-5920. Add Xattr option in DistCp docs. Contributed by Yi Liu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602119 13f79535-47bb-0310-9956-ffa450edef68
2014-06-12 11:07:22 +00:00
Karthik Kambatla 3ed429bb62 MAPREDUCE-5777. Support utf-8 text with Byte Order Marker. (Zhihai Xu via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1600979 13f79535-47bb-0310-9956-ffa450edef68
2014-06-06 18:39:28 +00:00
Chris Nauroth 7895ecccac HADOOP-10602. Merging change r1598337 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598338 13f79535-47bb-0310-9956-ffa450edef68
2014-05-29 17:33:10 +00:00
Devarajulu K 99c0324937 MAPREDUCE-5895. Close streams properly to avoid leakage in TaskLog. Contributed by Kousuke Saruta.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598210 13f79535-47bb-0310-9956-ffa450edef68
2014-05-29 07:06:17 +00:00
Jason Darrell Lowe 3045fdc7c6 svn merge -c 1598111 FIXES: MAPREDUCE-5862. Line records longer than 2x split size aren't handled correctly. Contributed by bc Wong
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598115 13f79535-47bb-0310-9956-ffa450edef68
2014-05-28 19:53:08 +00:00
Jason Darrell Lowe fd6d5121e3 svn merge -c 1596295 FIXES: MAPREDUCE-5309. 2.0.4 JobHistoryParser can't parse certain failed job history files generated by 2.0.3 history server. Contributed by Rushabh S Shah
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596298 13f79535-47bb-0310-9956-ffa450edef68
2014-05-20 15:52:25 +00:00
Jason Darrell Lowe b6988521f4 Reverted HADOOP-10474 from branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596048 13f79535-47bb-0310-9956-ffa450edef68
2014-05-19 20:31:40 +00:00
Ravi Prakash 2125caaa2f MAPREDUCE 5874. Creating MapReduce REST API section. Contributed by Tsuyoshi Ozawa
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595268 13f79535-47bb-0310-9956-ffa450edef68
2014-05-16 17:11:01 +00:00
Christopher Douglas 28301a6b79 MAPREDUCE-5821. Avoid unintentional reallocation of byte arrays in segments
during merge. Contributed by Todd Lipcon


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594655 13f79535-47bb-0310-9956-ffa450edef68
2014-05-14 17:51:21 +00:00
Karthik Kambatla 96d4036449 MAPREDUCE-5652. NM Recovery. ShuffleHandler should handle NM restarts. (Jason Lowe via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594332 13f79535-47bb-0310-9956-ffa450edef68
2014-05-13 19:14:07 +00:00
Jason Darrell Lowe 890cd33bf7 svn merge -c 1594326 FIXES: MAPREDUCE-5814. fat jar with *-default.xml may fail when mapreduce.job.classloader=true. Contributed by Gera Shegalov
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594328 13f79535-47bb-0310-9956-ffa450edef68
2014-05-13 18:59:56 +00:00
Jonathan Turner Eagles 7ac359f389 MAPREDUCE-5636. Convert MapReduce Tutorial document to APT (Akira AJISAKA via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592796 13f79535-47bb-0310-9956-ffa450edef68
2014-05-06 16:18:13 +00:00
Jonathan Turner Eagles 72feaf0436 MAPREDUCE-5637. Convert Hadoop Streaming document to APT (Akira AJISAKA via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592792 13f79535-47bb-0310-9956-ffa450edef68
2014-05-06 16:05:37 +00:00