207 Commits

Author SHA1 Message Date
Sangjin Lee
6466ead9e0 Preparing for 2.6.3 development 2015-10-21 10:58:06 -07:00
Jason Lowe
ac865de725 YARN-3896. RMNode transitioned from RUNNING to REBOOTED because its response id has not been reset synchronously. (Jun Gong via rohithsharmaks)
(cherry picked from commit feaf0349949e831ce3f25814c1bbff52f17bfe8f)

Conflicts:

	hadoop-yarn-project/CHANGES.txt
2015-10-08 16:39:46 +00:00
Sangjin Lee
4cb7dbaead Preparing for 2.6.2 development: mvn versions:set -DnewVersion=2.6.2 2015-09-25 15:51:13 -07:00
Vinod Kumar Vavilapalli
3462a00dd2 Preparing for release 2.6.1: mvn versions:set -DnewVersion=2.6.1 2015-09-09 15:29:57 -07:00
Jian He
88f022da24 YARN-2920. Changed CapacityScheduler to kill containers on nodes where node labels are changed. Contributed by Wangda Tan
(cherry picked from commit fdf042dfffa4d2474e3cac86cfb8fe9ee4648beb)

(cherry picked from commit 411836b74c6c02c0b5aebbbce29c209d93db1de2)
2015-09-05 20:54:18 -07:00
Steve Loughran
e0e93e9f8d HADOOP-11730. Regression: s3n read failure recovery broken. (Takenori Sato via stevel)
(cherry picked from commit a6a5d1d6b5ee76c829ba7b54a4ad619f7b986681)
2015-09-02 14:01:53 -07:00
Arun C. Murthy
60584c732f Preparing to release hadoop-2.6.0: Set version in branch-2.6 to 2.6.1-SNAPSHOT. 2014-11-09 19:21:11 -08:00
Zhijie Shen
eb1718b71a HADOOP-11241. Fixed intermittent TestNMSimulator failure due to timing issue. Contributed by Varun Vasudev.
(cherry picked from commit 260ab6d5f462d0fe1a4312cbba1c098141e3870e)
2014-10-31 18:05:05 -07:00
Haohui Mai
2bb845de3c HADOOP-11253. Hadoop streaming test TestStreamXmlMultipleRecords fails on Windows. Contributed by Varun Vasudev. 2014-10-31 11:54:48 -07:00
Kihwal Lee
afbb279825 MAPREDUCE-6022. map_input_file is missing from streaming job
environment. Contributed by Jason Lowe.
(cherry picked from commit b056048114bf4701ef9dd22486db937cb589e81b)
2014-10-29 12:30:51 -05:00
Jian He
cca473a321 MAPREDUCE-6126. Fixed Rumen JobBuilder to ignore NormalizedResourceEvent. Contributed by Junping Du
Conflicts:
	hadoop-mapreduce-project/CHANGES.txt
(cherry picked from commit 9b973b7c83a5b78452b852860bc6c7a0bad1e2d0)
2014-10-22 10:58:21 -07:00
Vinod Kumar Vavilapalli
fe80fd5e88 YARN-2496. Enhanced Capacity Scheduler to have basic support for allocating resources based on node-labels. Contributed by Wangda Tan.
YARN-2500. Ehnaced ResourceManager to support schedulers allocating resources based on node-labels. Contributed by Wangda Tan.

(cherry picked from commit f2ea555ac6c06a3f2f6559731f48711fff05d3f1)
2014-10-15 18:35:34 -07:00
Kihwal Lee
06587e4876 Fix version in pom.xml from HADOOP-11007 in branch-2.6 2014-10-07 16:40:01 -05:00
Kihwal Lee
0a36b6808f Missing files from the previous commit of HADOOP-11007 2014-10-07 16:32:55 -05:00
Kihwal Lee
3f200fddfd HADOOP-11007. Reinstate building of ant tasks support. Contributed by
Jason Lowe.
(cherry picked from commit 99d7a452be91b3aefe9bcde9b51893ff6719742e)
2014-10-07 16:24:23 -05:00
Allen Wittenauer
27f9edceed HADOOP-10954. Adding site documents of hadoop-tools (Masatake Iwasaki via aw) 2014-09-26 12:01:41 -07:00
Andrew Wang
0eaa4ba026 HADOOP-11140. hadoop-aws only need test-scoped dependency on hadoop-common's tests jar. Contributed by Juan Yu.
(cherry picked from commit 4ea77efa3ab4160498fec54d4824321921c15124)
2014-09-25 21:56:35 -07:00
Allen Wittenauer
afde00a0f5 MAPREDUCE-6109. Fix minor typo in distcp -p usage text (Charles Lamb via aw) 2014-09-25 11:28:50 -07:00
Allen Wittenauer
ea1fb1461a HADOOP-11009. Add Timestamp Preservation to DistCp (Gary Steelman via aw) 2014-09-24 15:39:55 -07:00
Allen Wittenauer
0037b8f67b YARN-2460. Remove obsolete entries from yarn-default.xml (Ray Chiang via aw) 2014-09-19 14:08:04 -07:00
Allen Wittenauer
5f6129feb4 HADOOP-10946. Fix a bunch of typos in log messages (Ray Chiang via aw) 2014-09-19 11:32:00 -07:00
Colin Patrick Mccabe
f80b10e1e7 HADOOP-11091. Eliminate old configuration parameter names from s3a (dsw via cmccabe)
(cherry picked from commit 0ac760a58d96b36ab30e9d60679bbea6365ef120)
2014-09-15 16:50:10 -07:00
Aaron T. Myers
a0c54aeb00 HADOOP-10400. Incorporate new S3A FileSystem implementation. Contributed by Jordan Mendelson and Dave Wang. 2014-09-15 08:30:42 -07:00
Colin Patrick Mccabe
5e4cb3d04c HADOOP-11074. Move s3-related FS connector code to hadoop-aws. (David S. Wang via Colin Patrick McCabe)
(cherry picked from commit 5ec7fcd9dd6bb86858c6e2583321bb9a615bd392)
2014-09-11 15:00:47 -07:00
Steve Loughran
fb804ed46c HADOOP-10373 create tools/hadoop-amazon for aws/EMR support (stevel)
(cherry picked from commit 59384dfb710f42d2a419c1b7db5a1a62a39be5f3)
2014-09-11 11:43:52 -07:00
Karthik Kambatla
fe9d1ee96f YARN-2526. SLS can deadlock when all the threads are taken by AMSimulators. (Wei Yan via kasha)
(cherry picked from commit 28d99db99236ff2a6e4a605802820e2b512225f9)
2014-09-09 15:15:42 -07:00
Jian He
38853c97c2 YARN-1506. Changed RMNode/SchedulerNode to update resource with event notification. Contributed by Junping Du
(cherry picked from commit 5c14bc426b4be381383018ebc2236be83eef15cd)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
2014-08-29 23:39:58 -07:00
Andrew Wang
075bb9e380 HADOOP-11021. Configurable replication factor in the hadoop archive command. Contributed by Zhe Zhang.
(cherry picked from commit ea1c6f31c2d2ea5b38ed57e2aa241d122103a721)
2014-08-29 14:47:28 -07:00
Alejandro Abdelnur
c77bd85b62 HDFS-6134 and HADOOP-10150 subtasks. 2014-08-28 15:03:08 -07: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
Zhijie Shen
400f6131d4 YARN-2249. Avoided AM release requests being lost on work preserving RM restart. Contributed by Jian He.
svn merge --ignore-ancestry -c 1618972 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618973 13f79535-47bb-0310-9956-ffa450edef68
2014-08-19 20:40:37 +00:00
Allen Wittenauer
c828a23d52 HADOOP-10121. Fix javadoc spelling for HadoopArchives#writeTopLevelDirs (Akira AJISAKA via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618045 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 20:30:34 +00:00
Colin McCabe
0e37868f7e HADOOP-10843. TestGridmixRecord unit tests failure on PowerPC (Jinghui Wang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617861 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 01:36:35 +00:00
Karthik Kambatla
d0c3ca05de YARN-2399. FairScheduler: Merge AppSchedulable and FSSchedulerApp into FSAppAttempt. (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617623 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 23:04:06 +00:00
Steve Loughran
5a056789ad HADOOP-10931 compile error on tools/hadoop-openstack
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616481 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 12:35:21 +00:00
Karthik Kambatla
c2b0f62155 YARN-1726. ResourceSchedulerWrapper broken due to AbstractYarnScheduler. (Wei Yan via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613550 13f79535-47bb-0310-9956-ffa450edef68
2014-07-26 01:55:03 +00:00
Karthik Kambatla
913833abaf YARN-2335. Annotate all hadoop-sls APIs as @Private. (Wei Yan via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613480 13f79535-47bb-0310-9956-ffa450edef68
2014-07-25 17:33:42 +00:00
Andrew Wang
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
Steve Loughran
e87785aea4 HADOOP-9361: Strictly define FileSystem APIs - OpenStack portion
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607625 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 12:55:23 +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
Andrew Wang
a18dce22b9 HADOOP-10666. Remove Copyright /d/d/d/d Apache Software Foundation from the source files license header. Contributed by Henry Saputra.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603026 13f79535-47bb-0310-9956-ffa450edef68
2014-06-16 23:27:03 +00:00
Uma Maheswara Rao G
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
Vinod Kumar Vavilapalli
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
Steve Loughran
d7f5d6795c HADOOP-10647. String Format Exception in SwiftNativeFileSystemStore.java.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1600970 13f79535-47bb-0310-9956-ffa450edef68
2014-06-06 17:59:37 +00:00
Karthik Kambatla
cb3dbb4880 YARN-1474. Make sechedulers services. (Tsuyoshi Ozawa via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599025 13f79535-47bb-0310-9956-ffa450edef68
2014-06-01 19:11:23 +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
Jing Zhao
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
Vinod Kumar Vavilapalli
38b14291e9 YARN-2017. Merged some of the common scheduler code. Contributed by Jian He.
svn merge --ignore-ancestry -c 1596753 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596754 13f79535-47bb-0310-9956-ffa450edef68
2014-05-22 05:33:00 +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
Jason Darrell Lowe
fb22c7c52f Reverting HADOOP-10485 from branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596041 13f79535-47bb-0310-9956-ffa450edef68
2014-05-19 20:13:14 +00:00