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
7cad25ec94
MAPREDUCE-6044. Fully qualified intermediate done dir path breaks per-user dir creation on Windows. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1619863 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619864 13f79535-47bb-0310-9956-ffa450edef68
2014-08-22 17:08:17 +00:00
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
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
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
8b8fe3a425
Set the release date for 2.5.0 in CHANGES.txt
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619238 13f79535-47bb-0310-9956-ffa450edef68
2014-08-20 21:33:42 +00:00
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
e06838038e
svn merge -c 1618691 FIXES: MAPREDUCE-6036. TestJobEndNotifier fails intermittently in branch-2. Contributed by chang li
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618692 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 18:19:09 +00:00
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
0b20086da1
MAPREDUCE-6033. Updated access check for displaying job information
...
(Yu Gao via Eric Yang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618649 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 16:14:27 +00:00
a7a79a198b
MAPREDUCE-6032. Made MR jobs write job history files on the default FS when the current context’s FS is different. Contributed by Benjamin Zhitomirsky.
...
svn merge --ignore-ancestry -c 1618269 ../../trunk/
svn merge --ignore-ancestry -c 1618270 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618271 13f79535-47bb-0310-9956-ffa450edef68
2014-08-15 20:33:55 +00:00
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
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
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
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
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
3755f527a8
svn merge -c 1617984 FIXES: MAPREDUCE-6010. HistoryServerFileSystemStateStore fails to update tokens. Contributed by Jason Lowe
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617987 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 16:08:53 +00:00
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
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
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
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
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
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
90d4cf83cc
MAPREDUCE-5944. Remove MRv1 commands from CommandsManual.apt.vm (Akira AJISAKA via aw)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617805 13f79535-47bb-0310-9956-ffa450edef68
2014-08-13 19:21:02 +00:00
4365c4530b
YARN-2212 ApplicationMaster needs to find a way to update the AMRMToken periodically. Contributed by Xuan Gong
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616891 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 21:37:35 +00:00
16c4bd1a96
svn merge -c 1616585 FIXES: MAPREDUCE-6021. MR AM should have working directory in LD_LIBRARY_PATH. Contributed by Jason Lowe
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616591 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 20:29:48 +00:00
24346da6b6
svn merge -c 1616018 FIXES: MAPREDUCE-6014. New task status field in task attempts table can lead to an empty web page. Contributed by Mit Desai
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616020 13f79535-47bb-0310-9956-ffa450edef68
2014-08-05 21:59:01 +00:00
ecc257e384
YARN-1994. Expose YARN/MR endpoints on multiple interfaces. Contributed by Craig Welch, Milan Potocnik and Arpit Agarwal
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615010 13f79535-47bb-0310-9956-ffa450edef68
2014-07-31 21:29:01 +00:00
f52092be46
YARN-2347. Consolidated RMStateVersion and NMDBSchemaVersion into Version in yarn-server-common. Contributed by Junping Du.
...
svn merge --ignore-ancestry -c 1614838 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614839 13f79535-47bb-0310-9956-ffa450edef68
2014-07-31 09:31:22 +00:00
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
a1e6be744c
svn merge -c 1612652 FIXES: MAPREDUCE-5963. ShuffleHandler DB schema should be versioned with compatible/incompatible changes. Contributed by Junping Du
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612654 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 19:38:11 +00:00
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
7c44536678
svn merge -c 1612358 FIXES: MAPREDUCE-5957. AM throws ClassNotFoundException with job classloader enabled if custom output format/committer is used. Contributed by Sangjin Lee
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612371 13f79535-47bb-0310-9956-ffa450edef68
2014-07-21 18:22:45 +00:00
99805f5eac
Merge r1611434 from trunk. MAPREDUCE-5910. Make MR AM resync with RM in case of work-preserving RM-restart. Contributed by Rohith
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611436 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 19:01:27 +00:00
59c91b22d7
MAPREDUCE-5971. Move the default options for distcp -p to DistCpOptionSwitch. Contributed by Charles Lamb.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611218 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 23:43:00 +00:00
4c7db3c6a3
MAPREDUCE-5952. LocalContainerLauncher#renameMapOutputForReduce incorrectly assumes a single dir for mapOutIndex. (Gera Shegalov via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611197 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 21:30:19 +00:00
9ff82dc855
Merged revision(s) 1610964 from hadoop/common/trunk:
...
HADOOP-9921. daemon scripts should remove pid file on stop call after stop or process is found not running ( Contributed by Vinayakumar B)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1610965 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 10:49:04 +00:00
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
bba266610c
MAPREDUCE-5956. Made MR AM not use maxAttempts to determine if the current attempt is the last retry. Contributed by Wangda Tan.
...
svn merge --ignore-ancestry -c 1609649 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609650 13f79535-47bb-0310-9956-ffa450edef68
2014-07-11 08:49:54 +00:00
fd6f4f72e4
MAPREDUCE-5517. Fixed MapReduce ApplicationMaster to not validate reduce side resource configuration for deciding uber-mode on map-only jobs. Contributed by Siqi Li.
...
svn merge --ignore-ancestry -c 1608595 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608596 13f79535-47bb-0310-9956-ffa450edef68
2014-07-07 20:14:33 +00:00
00ff3d320a
MAPREDUCE-5866. Merging change r1608585 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608588 13f79535-47bb-0310-9956-ffa450edef68
2014-07-07 20:00:38 +00:00
29099c8a5c
MAPREDUCE-5868. Fixed an issue with TestPipeApplication that was causing the nightly builds to fail. Contributed by Akira Ajisaka.
...
svn merge --ignore-ancestry -c 1608579 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608580 13f79535-47bb-0310-9956-ffa450edef68
2014-07-07 19:46:31 +00:00
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
8380254440
Preparing for release 2.6.0
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607539 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 05:56:01 +00:00
38bb24538d
MAPREDUCE-5900. Changed to the interpret container preemption exit code as a task attempt killing event. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1607512 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607513 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 01:45:53 +00:00
a7e8f79eb5
svn merge -c 1605892 FIXES: MAPREDUCE-5939. StartTime showing up as the epoch time in JHS UI after upgrade. Contributed by Chen He
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605895 13f79535-47bb-0310-9956-ffa450edef68
2014-06-26 19:57:31 +00:00
a2e2c8ad97
YARN-2152. Added missing information into ContainerTokenIdentifier so that NodeManagers can report the same to RM when RM restarts. Contributed Jian He.
...
svn merge --ignore-ancestry -c 1605205 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605206 13f79535-47bb-0310-9956-ffa450edef68
2014-06-24 21:44:00 +00:00
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
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
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
d3462755bb
Merge r1603338 from trunk. MAPREDUCE-5924. Changed TaskAttemptImpl to ignore TA_COMMIT_PENDING event at COMMIT_PENDING state. Contributed by Zhijie Shen
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603339 13f79535-47bb-0310-9956-ffa450edef68
2014-06-18 00:53:23 +00:00
3278b6cc39
Preparing to release hadoop-2.4.1.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602887 13f79535-47bb-0310-9956-ffa450edef68
2014-06-16 15:11:14 +00:00
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
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
2f25a4f3a4
Merged from trunk to branch-2. MAPREDUCE-5898. distcp to support preserving HDFS extended attributes(XAttrs). Contributed by Yi Liu.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602116 13f79535-47bb-0310-9956-ffa450edef68
2014-06-12 10:59:28 +00:00
71028526c1
MAPREDUCE-5834. Increased test-timeouts in TestGridMixClasses to avoid occassional failures. Contributed by Mit Desai.
...
svn merge --ignore-ancestry -c 1601764 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601765 13f79535-47bb-0310-9956-ffa450edef68
2014-06-10 20:25:22 +00:00
91c53d97bd
MAPREDUCE-5886. Merging change r1601704 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601707 13f79535-47bb-0310-9956-ffa450edef68
2014-06-10 17:52:27 +00:00
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
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
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
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
50acb4032f
MAPREDUCE-5899. Merge change r1596931 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596937 13f79535-47bb-0310-9956-ffa450edef68
2014-05-22 18:50:20 +00:00
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
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
d20f565b4c
MAPREDUCE-5809. Merging change r1595283 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595290 13f79535-47bb-0310-9956-ffa450edef68
2014-05-16 18:32:15 +00:00
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
6d3bfa33c9
Merge r1594795 from trunk: MAPREDUCE-5861. finishedSubMaps field in LocalContainerLauncher does not need to be volatile. (Contributed by Tsuyoshi OZAWA)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594797 13f79535-47bb-0310-9956-ffa450edef68
2014-05-15 07:10:42 +00:00
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
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
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
f8dad8a751
MAPREDUCE-5888. Failed job leaves hung AM after it unregisters (Jason Lowe via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594318 13f79535-47bb-0310-9956-ffa450edef68
2014-05-13 18:28:07 +00:00
7fe885d83f
MAPREDUCE-5774. Job overview in History UI should list reducer phases in chronological order. (Gera Shegalov via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593891 13f79535-47bb-0310-9956-ffa450edef68
2014-05-12 06:16:24 +00:00
3019b2c7f0
svn merge -c 1593422 FIXES: MAPREDUCE-5884. History server uses short user name when canceling tokens. Contributed by Mohammad Kamrul Islam
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593424 13f79535-47bb-0310-9956-ffa450edef68
2014-05-08 21:28:43 +00:00
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
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
6b7d074a54
svn merge -c 1592703 from trunk for MAPREDUCE-5402. In DynamicInputFormat, change MAX_CHUNKS_TOLERABLE, MAX_CHUNKS_IDEAL, MIN_RECORDS_PER_CHUNK and SPLIT_RATIO to be configurable.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592704 13f79535-47bb-0310-9956-ffa450edef68
2014-05-06 10:25:10 +00:00
73e0b8e55a
MAPREDUCE-5638. Port Hadoop Archives document to trunk (Akira AJISAKA via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591108 13f79535-47bb-0310-9956-ffa450edef68
2014-04-29 21:27:14 +00:00
3434d7b78b
svn merge -c 1590668 FIXES: MAPREDUCE-5812. Make job context available to OutputCommitter.isRecoverySupported(). Contributed by Mohammad Kamrul Islam
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1590675 13f79535-47bb-0310-9956-ffa450edef68
2014-04-28 15:27:01 +00:00
fef656527a
MAPREDUCE-5714. Removed forceful JVM exit in shutDownJob.
...
(Jinghui Wang via Eric Yang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1590267 13f79535-47bb-0310-9956-ffa450edef68
2014-04-26 18:02:19 +00:00
2a76cade32
svn merge -c 1590168 FIXES: MAPREDUCE-5835. Killing Task might cause the job to go to ERROR state. Contributed by Ming Ma
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1590174 13f79535-47bb-0310-9956-ffa450edef68
2014-04-25 22:34:44 +00:00
e0cd544a53
MAPREDUCE-5639. Port DistCp2 document to trunk (Akira AJISAKA via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1590131 13f79535-47bb-0310-9956-ffa450edef68
2014-04-25 20:32:09 +00:00
aa3d6ed6ea
svn merge -c 1590046 FIXES: MAPREDUCE-5749. TestRMContainerAllocator#testReportedAppProgress Failed. Contributed by Jason Lowe
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1590047 13f79535-47bb-0310-9956-ffa450edef68
2014-04-25 14:56:35 +00:00
1566fff15f
MAPREDUCE-5837. Merge r1589903 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589904 13f79535-47bb-0310-9956-ffa450edef68
2014-04-24 22:55:25 +00:00
10510bf324
MAPREDUCE-5846. Rumen doesn't understand JobQueueChangedEvent (Nathan Roberts via raviprak)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589597 13f79535-47bb-0310-9956-ffa450edef68
2014-04-24 06:05:31 +00:00
b04bb049d2
MAPREDUCE-5843. Fixed TestMRKeyValueTextInputFormat to not leak files and thus avoid failing on Windows. Contributed by Varun Vasudev.
...
svn merge --ignore-ancestry -c 1589533 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589534 13f79535-47bb-0310-9956-ffa450edef68
2014-04-23 22:54:55 +00:00
c02ab95ee6
svn merge -c 1589524 FIXES: MAPREDUCE-5841. uber job doesn't terminate on getting mapred job kill. Contributed by Sangjin Lee
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589526 13f79535-47bb-0310-9956-ffa450edef68
2014-04-23 21:57:55 +00:00
c5450fd0fe
MAPREDUCE-5832. Fixed TestJobClient to not fail on JDK7 or on Windows. Contributed by Jian He and Vinod Kumar Vavilapalli.
...
svn merge --ignore-ancestry -c 1589315 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589316 13f79535-47bb-0310-9956-ffa450edef68
2014-04-23 00:02:46 +00:00
2d8f62f5c1
MAPREDUCE-5833. TestRMContainerAllocator fails ocassionally. Contributed by Zhijie Shen.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589259 13f79535-47bb-0310-9956-ffa450edef68
2014-04-22 19:32:17 +00:00
babe6545d4
MAPREDUCE-5827. Merging change r1589238 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589241 13f79535-47bb-0310-9956-ffa450edef68
2014-04-22 18:25:02 +00:00
d87463514a
MAPREDUCE-5827. Merging change r1589223 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589236 13f79535-47bb-0310-9956-ffa450edef68
2014-04-22 18:22:26 +00:00
f0d3664d83
MAPREDUCE-5852. Merging change r1589006 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589007 13f79535-47bb-0310-9956-ffa450edef68
2014-04-21 23:49:28 +00:00
a7a7a16673
MAPREDUCE-5642. Merging change r1588605 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588606 13f79535-47bb-0310-9956-ffa450edef68
2014-04-19 04:21:01 +00:00
c8d5d1f82a
svn merge -c 1588559 FIXES: MAPREDUCE-4937. MR AM handles an oversized split metainfo file poorly. Contributed by Eric Payne
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588561 13f79535-47bb-0310-9956-ffa450edef68
2014-04-18 20:40:00 +00:00
5d90eaa20d
HADOOP-10499. Merging change r1588098 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588099 13f79535-47bb-0310-9956-ffa450edef68
2014-04-16 23:16:36 +00:00
327efd2672
MAPREDUCE-3191. docs for map output compression incorrectly reference SequenceFile (Chen He via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588010 13f79535-47bb-0310-9956-ffa450edef68
2014-04-16 18:16:58 +00:00
8f0bc218b6
MAPREDUCE-5775. Remove unnecessary job.setNumReduceTasks in SleepJob.createJob. Contributed by jhanver chand sharma.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587832 13f79535-47bb-0310-9956-ffa450edef68
2014-04-16 08:33:36 +00:00
53ab439204
MAPREDUCE-5836. Fix typo in RandomTextWriter (Akira AJISAKA via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587722 13f79535-47bb-0310-9956-ffa450edef68
2014-04-15 20:46:30 +00:00
982ab03fbb
MAPREDUCE-5828. Fixed a test issue with TestMapReduceJobControl that was causing it to fail on Windows. Contributed by Vinod Kumar Vavilapalli.
...
svn merge --ignore-ancestry -c 1587089 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587090 13f79535-47bb-0310-9956-ffa450edef68
2014-04-13 19:55:57 +00:00
b92a4cf472
MAPREDUCE-5826. Fixed HistoryServerFileSystemStore to use right permissions on Windows for temporary files and thus also fix the test-issue with
...
TestHistoryServerFileSystemStateStoreService. Contributed by Varun Vasudev.
svn merge --ignore-ancestry -c 1586567 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586568 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 04:29:28 +00:00
7eff6cc305
MAPREDUCE-5815. Fixed test-failure of TestMRAppMaster by making MRAppMaster gracefully handle empty-queue names. Contributed by Akira Ajisaka.
...
svn merge --ignore-ancestry -c 1586559 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586560 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 04:02:19 +00:00
58aefafe76
svn merge -c 1586479 FIXES: MAPREDUCE-5825. Provide diagnostics for reducers killed during ramp down. Contributed by Gera Shegalov
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586482 13f79535-47bb-0310-9956-ffa450edef68
2014-04-10 22:09:16 +00:00
ec907fef0e
MAPREDUCE-5824. Fixed test-failure of TestPipesNonJavaInputFormat in Windows. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1586368 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586369 13f79535-47bb-0310-9956-ffa450edef68
2014-04-10 16:44:31 +00:00
770aef5053
HADOOP-10104. Update jackson to 1.9.13 (Akira Ajisaka via stevel)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585933 13f79535-47bb-0310-9956-ffa450edef68
2014-04-09 11:11:31 +00:00
56268ffc41
HADOOP-10474. Merge r1585886 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585887 13f79535-47bb-0310-9956-ffa450edef68
2014-04-09 04:10:23 +00:00
a4029b2276
MAPREDUCE-5818. Added "hsadmin" command into mapred.cmd. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1584378 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1584380 13f79535-47bb-0310-9956-ffa450edef68
2014-04-03 20:26:49 +00:00
71a7f2b72b
MAPREDUCE-5014. Extending DistCp through a custom CopyListing is not possible. (Contributed by Srikanth Sundarrajan)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1584232 13f79535-47bb-0310-9956-ffa450edef68
2014-04-03 00:49:52 +00:00
96106ff46e
MAPREDUCE-5759. Remove unnecessary conf load in Limits (Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583498 13f79535-47bb-0310-9956-ffa450edef68
2014-04-01 00:17:18 +00:00
21a1744039
Preparing for hadoop-2.4.0 release.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583246 13f79535-47bb-0310-9956-ffa450edef68
2014-03-31 07:39:04 +00:00
e052a4579f
Merge -c 1583050 from trunk to branch-2 to fix MAPREDUCE-5813. Fix YarnChild to explicitly load job.xml from the local-filesystem, rather than rely on the classpath. Contributed by Gera Shegalov.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583051 13f79535-47bb-0310-9956-ffa450edef68
2014-03-29 19:16:03 +00:00
8753d10405
MAPREDUCE-5810. Removed the faulty and failing streaming test TestStreamingTaskLog. Contributed by Akira Ajisaka.
...
svn merge --ignore-ancestry -c 1582896 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582897 13f79535-47bb-0310-9956-ffa450edef68
2014-03-28 22:17:44 +00:00
039162818b
MAPREDUCE-5805. Fixed MapReduce JobHistory encoding of queue-name to escape hyphens and thus avoid parsing errors. Contributed by Akira Ajisaka.
...
svn merge --ignore-ancestry -c 1582125 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582127 13f79535-47bb-0310-9956-ffa450edef68
2014-03-26 23:44:17 +00:00
e51fbb6a9e
MAPREDUCE-5795. Fixed MRAppMaster to record the correct job-state after it recovers from a commit during a previous attempt. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1581180https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581181 13f79535-47bb-0310-9956-ffa450edef68
2014-03-25 02:01:13 +00:00
c1e93e1f90
MAPREDUCE-5791. Merging change r1580994 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580996 13f79535-47bb-0310-9956-ffa450edef68
2014-03-24 19:03:09 +00:00
751bba3d14
MAPREDUCE-5806. Fixed a bug in MRAppMaster so as to enable users to properly override HADOOP_ROOT_LOGGER or HADOOP_CLIENT_OPTS. Contributed by Varun Vasudev.
...
svn merge --ignore-ancestry -c 1580100https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580101 13f79535-47bb-0310-9956-ffa450edef68
2014-03-22 00:33:21 +00:00
444af8fac5
MAPREDUCE-5787. Added the ability to keep alive shuffle connections in the MapReduce shuffle-handler. Contributed by Rajesh Balamohan.
...
svn merge --ignore-ancestry -c 1580062 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580063 13f79535-47bb-0310-9956-ffa450edef68
2014-03-21 21:44:24 +00:00
2c3feeb727
svn merge -c 1579995 merging from trunk to branch-2 to fix:MAPREDUCE-5804. TestMRJobsWithProfiler#testProfiler timesout. Contributed by Mit Desai.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579998 13f79535-47bb-0310-9956-ffa450edef68
2014-03-21 17:58:33 +00:00
31a3a99f05
MAPREDUCE-2349. Modified FileInputFormat to be able to issue file and block location calls in parallel. Contributed by Siddharth Seth.
...
svn merge --ignore-ancestry -c 1579515 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579516 13f79535-47bb-0310-9956-ffa450edef68
2014-03-20 02:48:48 +00:00
d611f42c37
Merge r1578669 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578676 13f79535-47bb-0310-9956-ffa450edef68
2014-03-18 00:10:22 +00:00
d470c7b71a
YARN-1824. Improved NodeManager and clients to be able to handle cross platform application submissions. Contributed by Jian He.
...
MAPREDUCE-4052. Improved MapReduce clients to use NodeManagers' ability to handle cross platform application submissions. Contributed by Jian He.
svn merge --ignore-ancestry -c 1578135 ../../trunk/ with a couple of minor edits for working in branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578139 13f79535-47bb-0310-9956-ffa450edef68
2014-03-16 19:13:16 +00:00
c7a6775d94
svn merge -c 1577692 FIXES: MAPREDUCE-5570. Map task attempt with fetch failure has incorrect attempt finish time. Contributed by Rushabh S Shah
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577696 13f79535-47bb-0310-9956-ffa450edef68
2014-03-14 20:37:40 +00:00
fd118493c6
svn merge -c 1577647 FIXES: MAPREDUCE-5769. Unregistration to RM should not be called if AM is crashed before registering with RM. Contributed by Rohith
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577648 13f79535-47bb-0310-9956-ffa450edef68
2014-03-14 18:20:04 +00:00
dc7cae391d
Update CHANGES.txt to show MR-5688 pulled into 2.4.0
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577587 13f79535-47bb-0310-9956-ffa450edef68
2014-03-14 15:55:59 +00:00
838b4d3f84
MAPREDUCE-5751. MR app master fails to start in some cases if mapreduce.job.classloader is true. Contributed by Sangjin Lee
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577555 13f79535-47bb-0310-9956-ffa450edef68
2014-03-14 14:47:37 +00:00
9695bc7af6
YARN-1771. Reduce the number of NameNode operations during localization of
...
public resources using a cache. Contributed by Sangjin Lee
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577392 13f79535-47bb-0310-9956-ffa450edef68
2014-03-14 00:31:08 +00:00
d2990f85b3
MAPREDUCE-5456. TestFetcher.testCopyFromHostExtraBytes is missing (Jason Lowe via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577318 13f79535-47bb-0310-9956-ffa450edef68
2014-03-13 20:58:27 +00:00
fd4d1d1d05
MAPREDUCE-5794. Merging r1577281 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577283 13f79535-47bb-0310-9956-ffa450edef68
2014-03-13 18:57:01 +00:00
eaf54d5a10
MAPREDUCE-5713. InputFormat and JobConf JavaDoc Fixes (Chen He via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577240 13f79535-47bb-0310-9956-ffa450edef68
2014-03-13 16:50:13 +00:00
7f5a157995
svn merge -c 1577202 FIXES: MAPREDUCE-5789. Average Reduce time is incorrect on Job Overview page. Contributed by Rushabh S Shah
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577207 13f79535-47bb-0310-9956-ffa450edef68
2014-03-13 15:42:51 +00:00
50c410546b
MAPREDUCE-5765. Update hadoop-pipes examples README (Mit Desai via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577203 13f79535-47bb-0310-9956-ffa450edef68
2014-03-13 15:35:46 +00:00
7834c7f193
YARN-1389. Made ApplicationClientProtocol and ApplicationHistoryProtocol expose analogous getApplication(s)/Attempt(s)/Container(s) APIs. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1577052 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577053 13f79535-47bb-0310-9956-ffa450edef68
2014-03-13 07:45:30 +00:00
9e695db974
Merge -c 1576946 from trunk to branch-2 to fix MAPREDUCE-5553. Allow users to easily access completed/pending/successful/failed tasks on MR AM web-ui. Contributed by Paul Han.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576947 13f79535-47bb-0310-9956-ffa450edef68
2014-03-12 22:05:54 +00:00
804f86f42c
svn merge -c 1576940 FIXES: MAPREDUCE-5778. JobSummary does not escape newlines in the job name. Contributed by Akira AJISAKA
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576943 13f79535-47bb-0310-9956-ffa450edef68
2014-03-12 21:59:50 +00:00
ad5c0e4613
MAPREDUCE-5028. Fixed a bug in MapTask that was causing mappers to fail when a large value of io.sort.mb is set. Contributed by Karthik Kambatla.
...
svn merge --ignore-ancestry -c 1576170 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576171 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 01:30:20 +00:00
eb4e72d190
svn merge -c 1575049 from trunk for MAPREDUCE-5780. SliveTest should use the specified path to get the particular FileSystem instead of using the default FileSystem.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575055 13f79535-47bb-0310-9956-ffa450edef68
2014-03-06 21:40:31 +00:00
39b70d4e1f
Merge r1574792 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574794 13f79535-47bb-0310-9956-ffa450edef68
2014-03-06 08:16:12 +00:00
7c17cff55c
YARN-986. Changed client side to be able to figure out the right RM Delegation token for the right ResourceManager when HA is enabled. Contributed by Karthik Kambatla.
...
svn merge --ignore-ancestry -c 1574190 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574191 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 20:39:33 +00:00
8da70ca8e0
svn merge -c 1573775 FIXES: MAPREDUCE-5773. Provide dedicated MRAppMaster syslog length limit. Contributed by Gera Shegalov
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573778 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 22:12:18 +00:00
4d54763a07
svn merge -c 1573035 FIXES: MAPREDUCE-5768. TestMRJobs.testContainerRollingLog fails on trunk. Contributed by Gera Shegalov
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573037 13f79535-47bb-0310-9956-ffa450edef68
2014-02-28 19:28:03 +00:00
d00de6418a
MAPREDUCE-5665. Add audience annotations to MiniMRYarnCluster and MiniMRCluster. (Anubhav Dhoot via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572796 13f79535-47bb-0310-9956-ffa450edef68
2014-02-28 00:53:23 +00:00
04474afc81
MAPREDUCE-5770. Fixed MapReduce ApplicationMaster to correctly redirect to the YARN's web-app proxy with the correct scheme prefix. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1572711 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572712 13f79535-47bb-0310-9956-ffa450edef68
2014-02-27 19:24:49 +00:00
c5af93cd47
MAPREDUCE-5766. Moved ping messages from TaskAttempts to be at DEBUG level inside the ApplicationMaster log. Contributed by Jian He.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572381 13f79535-47bb-0310-9956-ffa450edef68
2014-02-27 01:30:07 +00:00
58d84af922
svn merge -c 1572269 FIXES: Preserve Job diagnostics in history. Contributed by Gera Shegalov
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572276 13f79535-47bb-0310-9956-ffa450edef68
2014-02-26 21:42:47 +00:00
a6529b363c
MAPREDUCE-5761. Added a simple log message to denote when encrypted shuffle is on in the shuffle-handler. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1571514 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1571515 13f79535-47bb-0310-9956-ffa450edef68
2014-02-25 01:24:50 +00:00
555d4b513f
MAPREDUCE-5688. TestStagingCleanup fails intermittently with JDK7 (Mit Desai via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570635 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 16:53:15 +00:00
9ffb6429a4
MAPREDUCE-5671. NaN can be created by client and assign to Progress (Chen He via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570623 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 16:32:52 +00:00
eeae0cd829
YARN-1590. Fixed ResourceManager, web-app proxy and MR JobHistoryServer to expand _HOST properly in their kerberos principles. Contributed by Mohammad Kamrul Islam.
...
svn merge --ignore-ancestry -c 1569537 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569539 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 21:51:06 +00:00
1ccccb8534
Branching for hadoop-2.4 releases, also set version to 2.5.0-SNAPSHOT in branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569186 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 04:41:01 +00:00
3452748b21
svn merge -c 1569038 FIXES: MAPREDUCE-5757. ConcurrentModificationException in JobControl.toList. Contributed by Jason Lowe
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569043 13f79535-47bb-0310-9956-ffa450edef68
2014-02-17 16:25:55 +00:00
7e252cdc9d
YARN-1553. Modified YARN and MR to stop using HttpConfig.isSecure() and
...
instead rely on the http policy framework. And also fix some bugs related
to https handling in YARN web-apps. Contributed by Haohui Mai.
svn merge --ignore-ancestry -c 1568501 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568503 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 20:01:32 +00:00
62cc4908c5
svn merge -c 1568118 FIXES: MAPREDUCE-5670. CombineFileRecordReader should report progress when moving to the next file. Contributed by Chen He
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568126 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 23:21:38 +00:00
22a0f31d66
MAPREDUCE-5746. Job diagnostics can implicate wrong task for a failed job. (Jason Lowe via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567669 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 16:08:02 +00:00
4032e147e8
YARN-1497. Command line additions for moving apps between queues (Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567485 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 01:22:02 +00:00
81bff204c3
YARN-1496. Protocol additions to allow moving apps between queues (Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567479 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 01:00:08 +00:00
3de6a0219e
Preparing to release hadoop-2.3.0
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567112 13f79535-47bb-0310-9956-ffa450edef68
2014-02-11 13:27:18 +00:00
d082b122f9
MAPREDUCE-5744. Job hangs because RMContainerAllocator.preemptReduce() violates the comparator contract (Gera Shegalov via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565479 13f79535-47bb-0310-9956-ffa450edef68
2014-02-06 23:31:04 +00:00
89fbc0ce18
MAPREDUCE-5743. Fixed CHANGES.txt to give credit to Ted too.
...
svn merge --ignore-ancestry -c 1565401 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565402 13f79535-47bb-0310-9956-ffa450edef68
2014-02-06 19:08:09 +00:00
fa43d8fb45
MAPREDUCE-5699. Allow setting tags on MR jobs (kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565385 13f79535-47bb-0310-9956-ffa450edef68
2014-02-06 18:30:43 +00:00
5afaafdb7f
MAPREDUCE-5743. Fixed the test failure in TestRMContainerAllocator. Contributed by Vinod Kumar Vavilapalli.
...
svn merge --ignore-ancestry -c 1565087 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565088 13f79535-47bb-0310-9956-ffa450edef68
2014-02-06 06:39:29 +00:00
73256800db
Updating branch-2.3's YARN's CHANGES.txt to reflect the recent rebase of unreleased 2.3 to more latest branch-2.
...
Fixing entry for MAPREDUCE-5732 in trunk and branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562949 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 20:30:12 +00:00
deb5e05964
Updating branch-2's MAPREDUCE CHANGES.txt to reflect the recent rebase of unreleased 2.3 to more latest branch-2.
...
Updating trunk's MAPREDUCE CHANGES.txt to fix more differences with branch-2's CHANGES.txt
MAPREDUCE's CHANGES.txt is foobar'ed. There are still a bunch of misplaced CHANGES.txt entries - not fixing them now.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562945 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 20:16:56 +00:00
28b178f55e
MAPREDUCE-5732. Report proper queue when job has been automatically placed (Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562906 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 17:57:08 +00:00
be75f21b6f
MAPREDUCE-5464. Add analogs of the SLOTS_MILLIS counters that jive with the YARN resource model (Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562229 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 21:05:03 +00:00
b7a3d0ae93
YARN-967. Added the client and CLI interfaces for obtaining ApplicationHistory data. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1556747 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562202 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 20:00:38 +00:00
afc40e8a66
HADOOP-10255. Merge 1561959 and 1561961 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561966 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 07:47:37 +00:00
f3136cd6b9
HADOOP-10167. Mark hadoop-common source as UTF-8 in Maven pom files / refactoring. Contributed by Mikhail Antonov.
...
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560832 13f79535-47bb-0310-9956-ffa450edef68
2014-01-23 22:31:27 +00:00
139b3a2ac4
MAPREDUCE-5723. MR AM container log can be truncated or empty. (Mohammad Kamrul Islam via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560593 13f79535-47bb-0310-9956-ffa450edef68
2014-01-23 06:09:21 +00:00
c4194399d3
Merge HDFS-4949 changes from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560522 13f79535-47bb-0310-9956-ffa450edef68
2014-01-22 21:43:00 +00:00
033d60a28f
svn merge -c 1560148 FIXES: MAPREDUCE-5693. Restore MRv1 behavior for log flush. Contributed by Gera Shegalov
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560149 13f79535-47bb-0310-9956-ffa450edef68
2014-01-21 19:27:57 +00:00
8adbc39208
MAPREDUCE-5725. Make explicit that TestNetworkedJob relies on the Capacity Scheduler (Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1559884 13f79535-47bb-0310-9956-ffa450edef68
2014-01-21 01:24:03 +00:00
57adfd42d4
MAPREDUCE-5729. mapred job -list throws NPE (kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1559812 13f79535-47bb-0310-9956-ffa450edef68
2014-01-20 19:30:12 +00:00
7c7f33a178
MAPREDUCE-5650. Job fails when hprof mapreduce.task.profile.map/reduce.params is specified (Gera Shegalov via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1559202 13f79535-47bb-0310-9956-ffa450edef68
2014-01-17 17:53:23 +00:00
99ce917eaf
svn merge -c 1558959 FIXES: Moving MR-5672 from bugs to improvements in CHANGES.txt
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558961 13f79535-47bb-0310-9956-ffa450edef68
2014-01-16 23:18:17 +00:00
0fa22b8120
svn merge -c 1558948 FIXES: MAPREDUCE-5672. Provide optional RollingFileAppender for container log4j (syslog). Contributed by Gera Shegalov
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558957 13f79535-47bb-0310-9956-ffa450edef68
2014-01-16 23:13:17 +00:00
0c84c76954
MAPREDUCE-5724. JobHistoryServer does not start if HDFS is not running. (tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558853 13f79535-47bb-0310-9956-ffa450edef68
2014-01-16 17:12:31 +00:00
c9e403f652
Adding 2.0.6-alpha release to the CHANGES.txt
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558216 13f79535-47bb-0310-9956-ffa450edef68
2014-01-14 21:52:06 +00:00
cf3ac1a59e
YARN-1138. Merging change r1556978 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556979 13f79535-47bb-0310-9956-ffa450edef68
2014-01-09 23:10:43 +00:00
9bf09c63f9
MAPREDUCE-3310. Addendum fixing javadocs warnings (tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556064 13f79535-47bb-0310-9956-ffa450edef68
2014-01-06 23:21:29 +00:00
47469c464c
MAPREDUCE-3310. Custom grouping comparator cannot be set for Combiners (tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1555969 13f79535-47bb-0310-9956-ffa450edef68
2014-01-06 18:37:40 +00:00
2bbd22bbd5
MAPREDUCE-5689. MRAppMaster does not preempt reducers when scheduled maps cannot be fulfilled. (lohit via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1555162 13f79535-47bb-0310-9956-ffa450edef68
2014-01-03 17:32:02 +00:00
eb247009b2
MAPREDUCE-5685. Fixed a bug with JobContext getCacheFiles API inside the WrappedReducer class. Contributed by Yi Song.
...
svn merge --ignore-ancestry -c 1554320 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1554321 13f79535-47bb-0310-9956-ffa450edef68
2013-12-30 21:15:13 +00:00
234b01e862
MAPREDUCE-5694. Fixed MR AppMaster to shutdown the LogManager so as to avoid losing syslog in some conditions. Contributed by Mohammad Kamrul Islam.
...
svn merge --ignore-ancestry -c 1553879 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1553880 13f79535-47bb-0310-9956-ffa450edef68
2013-12-28 17:51:37 +00:00
875a0d55f8
YARN-1463. Tests should avoid starting http-server where possible or creates spnego keytab/principals (vinodkv via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1553792 13f79535-47bb-0310-9956-ffa450edef68
2013-12-28 06:58:50 +00:00
76185bf7a3
MAPREDUCE-5550. Task Status message (reporter.setStatus) not shown in UI with Hadoop 2.0 (Gera Shegalov via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1552809 13f79535-47bb-0310-9956-ffa450edef68
2013-12-20 21:03:55 +00:00
d7e028de1a
MAPREDUCE-5692. Add explicit diagnostics when a task attempt is killed due to speculative execution (Gera Shegalov via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1552799 13f79535-47bb-0310-9956-ffa450edef68
2013-12-20 19:57:16 +00:00
0cf92b66c5
MAPREDUCE-5687. Correcting the previous commit by using the right patch.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1552070 13f79535-47bb-0310-9956-ffa450edef68
2013-12-18 19:28:14 +00:00
e89a93b85b
MAPREDUCE-5687. Fixed failure in TestYARNRunner caused by YARN-1446. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1551774 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551777 13f79535-47bb-0310-9956-ffa450edef68
2013-12-18 00:14:44 +00:00
88d09130e8
HDFS-5545. Merge change r1546151 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551703 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 20:59:27 +00:00
5975cf8fa9
svn merge -c 1551616 FIXES: MAPREDUCE-5679. TestJobHistoryParsing has race condition. Contributed by Liyin Liang
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551619 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 16:50:57 +00:00
63cb6749bb
svn merge -c 1551285 FIXES: MAPREDUCE-5623. TestJobCleanup fails because of RejectedExecutionException and NPE. Contributed by Jason Lowe
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551287 13f79535-47bb-0310-9956-ffa450edef68
2013-12-16 17:51:13 +00:00
cb6f28e122
MAPREDUCE-5674. Merging change r1550472 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550474 13f79535-47bb-0310-9956-ffa450edef68
2013-12-12 18:35:13 +00:00
b43308af0b
MAPREDUCE-5052. Job History UI and web services confusing job start time and job submit time (Chen He via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1549903 13f79535-47bb-0310-9956-ffa450edef68
2013-12-10 17:28:45 +00:00
5c1cbcb058
svn merge -c 1549705 FIXES: MAPREDUCE-5656. bzip2 codec can drop records when reading data in splits. Contributed by Jason Lowe
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1549710 13f79535-47bb-0310-9956-ffa450edef68
2013-12-09 23:42:36 +00:00
58b397a05b
svn merge -c 1548197 FIXES: MAPREDUCE-5409. MRAppMaster throws InvalidStateTransitonException: Invalid event: TA_TOO_MANY_FETCH_FAILURE at KILLED for TaskAttemptImpl. Contributed by Gera Shegalov
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548198 13f79535-47bb-0310-9956-ffa450edef68
2013-12-05 16:32:44 +00:00
644750fc7d
MAPREDUCE-5632. TestRMContainerAllocator#testUpdatedNodes fails (jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547932 13f79535-47bb-0310-9956-ffa450edef68
2013-12-04 22:18:21 +00:00
4a9770a48f
MAPREDUCE-5645. TestFixedLengthInputFormat fails with native libs (Mit Desai via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547630 13f79535-47bb-0310-9956-ffa450edef68
2013-12-03 22:54:42 +00:00
439a690ad1
Setting version to 2.4.0-SNAPSHOT in branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547165 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 19:40:42 +00:00
d76c9cdcdc
Add ACL check to JHS web-services.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547160 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 19:34:00 +00:00
29cdf33779
MAPREDUCE-5640. Rename TestLineRecordReader in jobclient module (Jason Lowe via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547156 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 19:14:56 +00:00
f5dc7b0c6b
Renamed releases. 2.2.1 -> 2.3.0 & 2.3.0 -> 2.4.0
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547140 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 18:43:55 +00:00
6d57c95003
svn merge -c 1544266 FIXES: MAPREDUCE-5631. TestJobEndNotifier.testNotifyRetries fails with Should have taken more than 5 seconds in jdk7. Contributed by Jonathan Eagles
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544267 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 17:55:40 +00:00
27c0b5fb20
MAPREDUCE-5625. TestFixedLengthInputFormat fails in jdk7 environment (Mariappan Asokan via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1542736 13f79535-47bb-0310-9956-ffa450edef68
2013-11-17 14:39:04 +00:00
1bbeb539e6
MAPREDUCE-5373. TestFetchFailure.testFetchFailureMultipleReduces could fail intermittently (jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1542459 13f79535-47bb-0310-9956-ffa450edef68
2013-11-16 03:34:10 +00:00
6ce1f14fed
MAPREDUCE-5616. Merging change r1542001 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1542003 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 18:12:48 +00:00
71ce967380
MAPREDUCE-5481. Enable uber jobs to have multiple reducers (Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541846 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 08:06:50 +00:00
bdab9d5cfd
MAPREDUCE-5624 Move grizzly-test and junit dependencies to test scope
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541701 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 20:45:52 +00:00
a7bfe3efe3
MAPREDUCE-6524 Move grizzly-test and junit dependencies to test scope
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541699 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 20:43:04 +00:00
5dd3da295d
MAPREDUCE-5431 Missing pom dependency in MR-client
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541680 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 19:50:17 +00:00
55a9d7dc50
svn merge -c 1541566 FIXES: MAPREDUCE-5610. TestSleepJob fails in jdk7. Contributed by Jonathan Eagles
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541583 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 16:19:21 +00:00
5653892571
MAPREDUCE-5613. DefaultSpeculator holds and checks hashmap that is alway empty (Gera Shegalov via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541435 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 09:26:30 +00:00
7b819a313e
MAPREDUCE-1176. FixedLengthInputFormat and FixedLengthRecordReader (Mariappan Asokan and BitsOfInfo via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540932 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 03:11:19 +00:00
97dc10bee5
svn merge -c 1540813 FIXES: MAPREDUCE-5186. mapreduce.job.max.split.locations causes some splits created by CombineFileInputFormat to fail. Contributed by Robert Parker and Jason Lowe
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540819 13f79535-47bb-0310-9956-ffa450edef68
2013-11-11 19:30:25 +00:00
c02e97c531
MAPREDUCE-5451. Merging change r1539413 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539416 13f79535-47bb-0310-9956-ffa450edef68
2013-11-06 18:17:32 +00:00
5324b77a60
HADOOP-9478. Fix race conditions during the initialization of Configuration related to deprecatedKeyMap (cmccabe)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538252 13f79535-47bb-0310-9956-ffa450edef68
2013-11-02 18:51:14 +00:00
5b7f2a5a2d
MAPREDUCE-5604. Merging change r1538035 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538038 13f79535-47bb-0310-9956-ffa450edef68
2013-11-01 19:12:36 +00:00
d023d52062
MAPREDUCE-5601. ShuffleHandler fadvises file regions as DONTNEED even when fetch fails (Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537856 13f79535-47bb-0310-9956-ffa450edef68
2013-11-01 08:55:05 +00:00
4b316b63c9
svn merge -c 1536724 FIXES: MAPREDUCE-5598. TestUserDefinedCounters.testMapReduceJob is flakey. Contributed by Robert Kanter
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536725 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 14:07:33 +00:00
72d881132f
svn merge -c 1536711 FIXES: MAPREDUCE-5596. Allow configuring the number of threads used to serve shuffle connections. Contributed by Sandy Ryza
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536720 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 13:53:55 +00:00
dd3e38280a
MAPREDUCE-4680. Job history cleaner should only check timestamps of files in old enough directories (Robert Kanter via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536561 13f79535-47bb-0310-9956-ffa450edef68
2013-10-28 23:54:52 +00:00
d480fb0cbb
svn commit -c 1534832 FIXES: MAPREDUCE-5561. org.apache.hadoop.mapreduce.v2.app.job.impl.TestJobImpl testcase failing on trunk. Contributed by Karthik Kambatla
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534835 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 22:44:25 +00:00
3f86a06ec0
MAPREDUCE-5587. TestTextOutputFormat fails on JDK7 (jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533630 13f79535-47bb-0310-9956-ffa450edef68
2013-10-18 21:03:37 +00:00
5c20de6ac3
MAPREDUCE-5457. Add a KeyOnlyTextOutputReader to enable streaming to write out text files without separators (Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533626 13f79535-47bb-0310-9956-ffa450edef68
2013-10-18 20:46:05 +00:00
bc18c6f842
HADOOP-10005. Merge 1532907 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532908 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 21:05:23 +00:00
f35f88b1cf
MAPREDUCE-5586. TestCopyMapper#testCopyFailOnBlockSizeDifference fails when run from hadoop-tools/hadoop-distcp directory (jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532890 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 20:28:13 +00:00
85b5e96f10
MAPREDUCE-5585. TestCopyCommitter#testNoCommitAction Fails on JDK7 (jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532878 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 20:06:53 +00:00
bb699cfb47
MAPREDUCE-5518. Fixed typo "can't read paritions file". Contributed by Albert Chu.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532209 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 06:30:49 +00:00
c5f7e137d3
MAPREDUCE-5546. Merging change r1532016 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532017 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 18:37:41 +00:00
4e4e958213
HADOOP-10040. Merging change r1531977 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531978 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 17:06:42 +00:00
1f77877bd9
MAPREDUCE-5463. Deprecate SLOTS_MILLIS counters. (Tzuyoshi Ozawa via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531823 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 09:12:11 +00:00
5ff9f8bed2
merge MAPREDUCE-5329. Allow MR applications to use additional AuxServices, which are compatible with the default MapReduce shuffle. Contributed by Avner BenHanoch.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531742 13f79535-47bb-0310-9956-ffa450edef68
2013-10-13 20:19:06 +00:00
4f3386420c
HADOOP-10040. Merging change r1531491 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531492 13f79535-47bb-0310-9956-ffa450edef68
2013-10-12 03:16:45 +00:00
82c4a9438d
YARN-1283. Fixed RM to give a fully-qualified proxy URL for an application so that clients don't need to do scheme-mangling. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1530819 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530820 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 22:49:50 +00:00
9b5a023fc2
svn merge -c 1530816 FIXES: MAPREDUCE-5102. fix coverage org.apache.hadoop.mapreduce.lib.db and org.apache.hadoop.mapred.lib.db. Contributed by Aleksey Gorshkov, Andrey Klochkov, and Nathan Roberts
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530818 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 22:45:34 +00:00
d5f32b0fab
svn merge -c 1530683 FIXES: MAPREDUCE-5569. FloatSplitter is not generating correct splits. Contributed by Nathan Roberts
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530684 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 15:44:47 +00:00
2031005eeb
HADOOP-9470. eliminate duplicate FQN tests in different Hadoop modules (Ivan A. Veselovsky via daryn)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530671 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 15:10:43 +00:00
c3dff760d9
Moving recent bug-fixes to hadoop-2.2.1.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530129 13f79535-47bb-0310-9956-ffa450edef68
2013-10-08 02:05:03 +00:00
3b514585f1
Preparing for hadoop-2.2.0 release.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529752 13f79535-47bb-0310-9956-ffa450edef68
2013-10-07 05:32:18 +00:00
ad9515fa9b
MAPREDUCE-5562. Fixed MR App Master to perform pending tasks like staging-dir cleanup, sending job-end notification correctly when unregister with RM fails. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1529682 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529683 13f79535-47bb-0310-9956-ffa450edef68
2013-10-06 20:54:10 +00:00
4b32d6ad9a
YARN-1277. Added a policy based configuration for http/https in common HttpServer and using the same in YARN - related
...
to per project https config support via HADOOP-10022. Contributed by Suresh Srinivas and Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1529662 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529663 13f79535-47bb-0310-9956-ffa450edef68
2013-10-06 18:44:27 +00:00
856907b8db
MAPREDUCE-5533. Fixed MR speculation code to track any TaskAttempts that aren't heart-beating for a while, so that we can aggressively speculate instead of waiting for task-timeout. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1529229 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529230 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 17:29:21 +00:00
658905cd44
MAPREDUCE-5442. Merging change r1529077 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529079 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 05:42:58 +00:00
2cc1005b92
Merge 1529068 from trunk to branch-2 for YARN-1131. logs command should return an appropriate error message if YARN application is still running. Contributed by Siddharth Seth.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529069 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 02:38:17 +00:00
8a93fa55b6
YARN-1199. Make NM/RM Versions Available (Mit Desai via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529008 13f79535-47bb-0310-9956-ffa450edef68
2013-10-03 21:18:18 +00:00
53df9bdb14
Merge r1529005 from trunk to branch-2 for MAPREDUCE-5489. MR jobs hangs as it does not use the node-blacklisting feature in RM requests (Zhijie Shen via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529007 13f79535-47bb-0310-9956-ffa450edef68
2013-10-03 21:18:06 +00:00
c738c106e9
MAPREDUCE-5554. hdfs-site.xml included in hadoop-mapreduce-client-jobclient tests jar is breaking tests for downstream components (Robert Kanter via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528647 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 22:00:56 +00:00
ce990cd911
Merge -c 1528626 from trunk to branch-2 to fix MAPREDUCE-5459. Update documentation on how to run MRv1 examples on YARN. Contributed by Zhijie Shen.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528627 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 21:09:59 +00:00
f49d9cf7a4
Merge -c 1528533 from trunk to branch-2 to fix MAPREDUCE-5530. Fix compat with hadoop-1 in mapred.lib.CombinFileInputFormat by re-introducing isSplittable(FileSystem, Path) api and ensuring semantic compatibility. Contributed by Robert Kanter.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528535 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 16:09:53 +00:00
6daca6a93d
MAPREDUCE-5536. Fixed MR AM and JHS to respect mapreduce.jobhistory.webapp.https.address. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1528251 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528253 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 22:54:35 +00:00
7e812e7126
svn merge -c 1528237 FIXES: MAPREDUCE-4421. Run MapReduce framework via the distributed cache. Contributed by Jason Lowe
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528242 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 22:40:01 +00:00
06e8660f2b
MAPREDUCE-5544. JobClient#getJob loads job conf twice. (Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528197 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 20:05:09 +00:00
85f5626076
Merge -c 1527848 from trunk to branch-2 to fix MAPREDUCE-5551. Fix compat with hadoop-1 in SequenceFileAsBinaryOutputFormat.WritableValueBytes by re-introducing missing constructors. Contributed by Zhijie Shen.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527850 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 01:25:31 +00:00
3c3b52b80b
MAPREDUCE-5538. Fixed MR AppMaster to send job-notification URL only after the job is really done - a bug caused by MAPREDUCE-5505. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1527219 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527221 13f79535-47bb-0310-9956-ffa450edef68
2013-09-28 19:14:46 +00:00
c03040a498
Merge -c 1527048 from trunk to branch-2 to fix MAPREDUCE-5529. Fix compat with hadoop-1 in mapred.TotalOrderPartitioner by re-introducing (get,set)PartitionFile which takes in JobConf. Contributed by Robert Kanter.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527054 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 20:04:31 +00:00
d36dec185e
svn commit -c 1527037 FIXES: MAPREDUCE-5545. org.apache.hadoop.mapred.TestTaskAttemptListenerImpl.testCommitWindow times out. Contributed by Robert Kanter
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527039 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 19:17:24 +00:00
146d9264a9
Merge -c 1527033 from trunk to branch-2 to fix MAPREDUCE-5531. Fix compat with hadoop-1 in mapreduce.(TaskID, TaskAttemptID) by re-introducing missing constructors. Contributed by Robert Kanter.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527034 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 19:10:07 +00:00
d8e9a472e7
svn merge -c 1527015 FIXES: MAPREDUCE-5332. Support token-preserving restart of history server. Contributed by Jason Lowe
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527016 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 18:26:09 +00:00
78045b7abc
Merge -c 1526735 from trunk to branch-2 to fix MAPREDUCE-5514. Fix TestRMContainerAllocator. Contributed by Zhijie Shen.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526736 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 23:03:25 +00:00
2b7ae8dd5d
svn merge -c 1526688 FIXES: MAPREDUCE-5513. ConcurrentModificationException in JobControl. Contributed by Robert Parker
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526702 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 21:21:34 +00:00
6bdd4791db
MAPREDUCE-5525. Merging change r1526624 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526625 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 17:47:45 +00:00
fa2a3c94f2
HADOOP-9998. Provide methods to clear only part of the DNSToSwitchMapping. (Junping Du via Colin Patrick McCabe)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526568 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 15:24:40 +00:00
6e132b1a2b
MAPREDUCE-5170. Fixed a wrong log message in CombineFileInputFormat class. Contributed by Sangjin Lee.
...
svn merge --ignore-ancestry -c 1526377 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526379 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 04:30:36 +00:00
b41137c73a
MAPREDUCE-5503. Fixed a test issue in TestMRJobClient. Contributed by Jian He.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526364 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 03:02:06 +00:00
a5ecb4de41
Merge r1526071 from trunk to branch-2 for MAPREDUCE-5505. Clients should be notified job finished only after job successfully unregistered (Zhijie Shen via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526072 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 00:53:10 +00:00
e23d5672a7
merge YARN-1229 from trunk. Define constraints on Auxiliary Service names. Change ShuffleHandler service name from mapreduce.shuffle to mapreduce_shuffle. Contributed by Xuan Gong.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526066 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 00:37:14 +00:00
2daddb610e
YARN-1204. Added separate configuration properties for https for RM and NM without which servers enabled with https will also start on http ports. Contributed by Omkar Vinit Joshi.
...
MAPREDUCE-5523. Added separate configuration properties for https for JHS without which even when https is enabled, it starts on http port itself. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1525947 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525948 13f79535-47bb-0310-9956-ffa450edef68
2013-09-24 17:20:48 +00:00
e2bfdfc585
svn merge -c 1525670 FIXES: MAPREDUCE-5522. Incorrect oreder expected from JobQueueInfo (Jinghui Wang via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525673 13f79535-47bb-0310-9956-ffa450edef68
2013-09-23 18:39:47 +00:00
d71bb8385b
YARN-1203. Changed YARN web-app proxy to handle http and https URLs from AM registration and finish correctly. Contributed by Omkar Vinit Joshi.
...
MAPREDUCE-5515. Fixed MR AM's webapp to depend on a new config mapreduce.ssl.enabled to enable https and disabling it by default as MR AM needs
to set up its own certificates etc and not depend on clusters'. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1524864 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524867 13f79535-47bb-0310-9956-ffa450edef68
2013-09-19 23:51:14 +00:00
d8ed9ef4b8
MAPREDUCE-5488. Changed MR client to keep trying to reach the application when it sees that on attempt's AM is down. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1524856 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524857 13f79535-47bb-0310-9956-ffa450edef68
2013-09-19 22:36:58 +00:00
11d0fe9722
MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta via tgraves)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524843 13f79535-47bb-0310-9956-ffa450edef68
2013-09-19 21:00:40 +00:00
f0e79b8157
MAPREDUCE-5487. In task processes, JobConf is unnecessarily loaded again in Limits (Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524417 13f79535-47bb-0310-9956-ffa450edef68
2013-09-18 13:58:37 +00:00
3836473c73
Preparing for hadoop-2.1.1-beta release.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523892 13f79535-47bb-0310-9956-ffa450edef68
2013-09-17 05:23:39 +00:00
73c69decf1
Merge -c 1523660 from trunk to branch-2 to fix MAPREDUCE-5493. Cleanup in-memory & on-disk segments to prevent leak on shuffle completion. Contributed by Jason Lowe.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523661 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 14:19:33 +00:00
c061a0da55
Merge -c 1523652 from trunk to branch-2 to fix YARN-1170. YARN & MapReduce proto definitions fixed to specify protobuf package as hadoop.yarn and hadoop.mapreduce respectively. Contributed by Binglin Chang.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523653 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 14:06:27 +00:00
7993c89ea8
MAPREDUCE-5379. Include token tracking ids in jobconf. (kkambatl via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523607 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 12:20:30 +00:00
c5ef30971e
Merge r1523376 from trunk to branch-2 for YARN-540. Race condition causing RM to potentially relaunch already unregistered AMs on RM restart (Jian He via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523377 13f79535-47bb-0310-9956-ffa450edef68
2013-09-15 01:07:11 +00:00
87d09e5ebe
Merge r1523146 from trunk to branch-2 YARN-1116. Populate AMRMTokens back to AMRMTokenSecretManager after RM restarts (Jian He via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523149 13f79535-47bb-0310-9956-ffa450edef68
2013-09-13 23:57:56 +00:00
103226cc91
MAPREDUCE-5164. mapred job and queue commands omit HADOOP_CLIENT_OPTS. Contributed by Nemon Lou.
...
Merged revision 1522595 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1522597 13f79535-47bb-0310-9956-ffa450edef68
2013-09-12 14:34:39 +00:00
90f492e532
MAPREDUCE-5497. Changed MRAppMaster to sleep only after doing everything else but just before ClientService to avoid race conditions during RM restart. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1521699 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1521700 13f79535-47bb-0310-9956-ffa450edef68
2013-09-11 00:39:21 +00:00
a574ef2864
MAPREDUCE-5020. Compile failure with JDK8 (Trevor Robinson via tgraves)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1521584 13f79535-47bb-0310-9956-ffa450edef68
2013-09-10 18:53:29 +00:00
d997ca22f9
MAPREDUCE-5414. TestTaskAttempt fails in JDK7 with NPE. Contributed by Nemon Lou.
...
svn merge --ignore-ancestry -c 1520964 ../../trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520965 13f79535-47bb-0310-9956-ffa450edef68
2013-09-09 06:46:16 +00:00
5ddee655e4
svn merge -c 1520156 FIXES: MAPREDUCE-5475. MRClientService does not verify ACLs properly. Contributed by Jason Lowe
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520157 13f79535-47bb-0310-9956-ffa450edef68
2013-09-04 22:32:35 +00:00
ab02296741
HADOOP-9918. Add addIfService to CompositeService (Karthik Kambatla via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519130 13f79535-47bb-0310-9956-ffa450edef68
2013-08-31 02:13:11 +00:00
997e2f4fd3
MAPREDUCE-5484. YarnChild unnecessarily loads job conf twice (Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518858 13f79535-47bb-0310-9956-ffa450edef68
2013-08-29 23:53:29 +00:00
7b8795012e
MAPREDUCE-5441. Changed MR AM to return RUNNING state if exiting when RM commands to reboot, so that client can continue to track the overall job. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1518821 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518824 13f79535-47bb-0310-9956-ffa450edef68
2013-08-29 21:10:54 +00:00
23cbe7af90
MAPREDUCE-5483. revert MAPREDUCE-5357. (rkanter via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518773 13f79535-47bb-0310-9956-ffa450edef68
2013-08-29 19:26:31 +00:00
ba89f8efc7
YARN-1085. Addendum patch to address issues with the earlier patch.
...
svn merge --ignore-ancestry -c 1517721 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517722 13f79535-47bb-0310-9956-ffa450edef68
2013-08-26 23:01:23 +00:00
2d9c88f45e
YARN-1074. Cleaned up YARN CLI application list to only display running applications by default. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1517196 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517197 13f79535-47bb-0310-9956-ffa450edef68
2013-08-24 21:17:11 +00:00
a42a5e153c
YARN-1085. Modified YARN and MR2 web-apps to do HTTP authentication in secure setup with kerberos. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1517101 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517102 13f79535-47bb-0310-9956-ffa450edef68
2013-08-24 02:48:17 +00:00
35f60e71de
svn merge -c 1517097 to revert MAPREDUCE-5475 and YARN-707
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517098 13f79535-47bb-0310-9956-ffa450edef68
2013-08-24 01:23:39 +00:00
25595863d3
svn merge -c 1517085 FIXES: MAPREDUCE-5475. MRClientService does not verify ACLs properly. Contributed by Jason Lowe
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517086 13f79535-47bb-0310-9956-ffa450edef68
2013-08-23 22:55:45 +00:00
5b8b923cd1
MAPREDUCE-5478. TeraInputFormat unnecessarily defines its own FileSplit subclass (Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517055 13f79535-47bb-0310-9956-ffa450edef68
2013-08-23 21:28:16 +00:00
91d8768381
MAPREDUCE-5476. Changed MR AM recovery code to cleanup staging-directory only after unregistering from the RM. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1516660 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516662 13f79535-47bb-0310-9956-ffa450edef68
2013-08-22 23:17:57 +00:00
3ad42fba26
MAPREDUCE-5470. Merging change r1516623 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516625 13f79535-47bb-0310-9956-ffa450edef68
2013-08-22 21:43:57 +00:00
8d1cd8ddb7
svn merge -c 1516594 FIXES: Revert MAPREDUCE-5475
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516596 13f79535-47bb-0310-9956-ffa450edef68
2013-08-22 20:38:06 +00:00
b9cee48717
Merge -c 1516361 from trunk to branch-2 to fix MAPREDUCE-5475. Ensure MRClientService verifies ACLs for users. Contributed by Jason Lowe.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516362 13f79535-47bb-0310-9956-ffa450edef68
2013-08-22 02:00:29 +00:00
e8268b8a5d
Merge -c 1516358 from trunk to branch-2 to fix MAPREDUCE-5468. Fix MR AM recovery for map-only jobs. Contributed by Vinod K. V.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516359 13f79535-47bb-0310-9956-ffa450edef68
2013-08-22 01:53:18 +00:00
83c4906a2e
MAPREDUCE-5466. Changed MR AM to not promote history files of intermediate AMs in case they are exiting because of errors and thus help history-server pick up the right history file for the last successful AM. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1516238 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516240 13f79535-47bb-0310-9956-ffa450edef68
2013-08-21 18:18:13 +00:00
d83061b71b
HADOOP-9784. Add a builder for HttpServer. (Junping Du via llu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516130 13f79535-47bb-0310-9956-ffa450edef68
2013-08-21 10:13:17 +00:00
6f27db80ac
svn merge -c 1515863 FIXES: MAPREDUCE-5001. LocalJobRunner has race condition resulting in job failures. Contributed by Sandy Ryza
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1515877 13f79535-47bb-0310-9956-ffa450edef68
2013-08-20 17:00:06 +00:00
0bf25e9d4c
svn merge -c 1514768 FIXES: Update CHANGES.txt to reflect merge of MR-1981 to branch-2.1-beta
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514769 13f79535-47bb-0310-9956-ffa450edef68
2013-08-16 16:14:51 +00:00
0c32694b27
MAPREDUCE-5462. In map-side sort, swap entire meta entries instead of indexes for better cache performance. (Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514610 13f79535-47bb-0310-9956-ffa450edef68
2013-08-16 08:14:58 +00:00
Sanford Ryza
Zhijie Shen
Jason Darrell Lowe
Karthik Kambatla
Eric Yang
Allen Wittenauer
Xuan Gong
Jian He
Andrew Wang
Vinayakumar B
Vinod Kumar Vavilapalli
Chris Nauroth
Arun Murthy
Uma Maheswara Rao G
Devarajulu K
Jing Zhao
Ravi Prakash
Junping Du
Christopher Douglas
Jonathan Turner Eagles
Tsz-wo Sze
Haohui Mai
Steve Loughran
Aaron Myers
Kihwal Lee
Arpit Agarwal
Suresh Srinivas
Konstantin Boudnik
Alejandro Abdelnur
Colin McCabe
Siddharth Seth
Daryn Sharp
Hitesh Shah
Bikas Saha
Robert Joseph Evans
Thomas Graves
Luke Lu