Suresh Srinivas
611b3fc5e6
HDFS-4129. Merge r1403956 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471433 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 14:28:58 +00:00
Robert Joseph Evans
8b23e7e10c
svn merge -c 1471424 FIXES: MAPREDUCE-5069. add concrete common implementations of CombineFileInputFormat (Sangjin Lee via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471429 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 14:23:00 +00:00
Harsh J
c2d9bb2e6c
HADOOP-9496. Bad merge of HADOOP-9450 on branch-2 breaks all bin/hadoop calls that need HADOOP_CLASSPATH. Contributed by Harsh J (harsh)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471230 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 02:35:09 +00:00
Aaron Myers
79de664f03
HDFS-4737. JVM path embedded in fuse binaries. Contributed by Sean Mackrory.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471216 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 00:48:23 +00:00
Vinod Kumar Vavilapalli
2dfecb78e5
YARN-561. Modified NodeManager to set key information into the environment of every container that it launches. Contributed by Xuan Gong.
...
MAPREDUCE-5175. Updated MR App to not set envs that will be set by NMs anyways after YARN-561. Contributed by Xuan Gong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471207 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 00:01:08 +00:00
Vinod Kumar Vavilapalli
700a6aa0a0
YARN-581. Added a test to verify that app delegation tokens are restored after RM restart. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1471187 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471188 13f79535-47bb-0310-9956-ffa450edef68
2013-04-23 22:51:19 +00:00
Vinod Kumar Vavilapalli
23f099da0b
YARN-583. Moved application level local resources to be localized under the filecache sub-directory under application directory. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1470812 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470813 13f79535-47bb-0310-9956-ffa450edef68
2013-04-23 04:38:45 +00:00
Bikas Saha
778b64e29f
Merge -c r1470797 from trunk to branch-2 for YARN-549. YarnClient.submitApplication should wait for application to be accepted by the RM (Zhijie Shen via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470798 13f79535-47bb-0310-9956-ffa450edef68
2013-04-23 03:12:54 +00:00
Thomas White
d53afdb144
Merge -r 1470693:1470694 from trunk to branch-2. Fixes: MAPREDUCE-5146. application classloader may be used too early to load classes. Contributed by Sangjin Lee.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470696 13f79535-47bb-0310-9956-ffa450edef68
2013-04-22 20:09:44 +00:00
Bikas Saha
66beaf2c7d
Merge -c r1470243 from trunk to branch-2 for YARN-594. Update test and add comments in YARN-534 (Jian He via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470245 13f79535-47bb-0310-9956-ffa450edef68
2013-04-20 22:06:41 +00:00
Arun Murthy
b65a090174
Merge -c 1470216 from trunk to branch-2 to fix MAPREDUCE-5066. Added a timeout for the job.end.notification.url. Contributed by Ivan Mitic.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470217 13f79535-47bb-0310-9956-ffa450edef68
2013-04-20 19:19:16 +00:00
Vinod Kumar Vavilapalli
e2b5e3c2b4
YARN-542. Changed the default global AM max-attempts value to be not one. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1470094 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470095 13f79535-47bb-0310-9956-ffa450edef68
2013-04-20 00:36:07 +00:00
Vinod Kumar Vavilapalli
a02788f864
YARN-547. Fixed race conditions in public and private resource localization which used to cause duplicate downloads. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1470076 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470078 13f79535-47bb-0310-9956-ffa450edef68
2013-04-19 22:36:52 +00:00
Vinod Kumar Vavilapalli
6c37becf87
YARN-586. Fixed a typo in ApplicationSubmissionContext#setApplicationId. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1470068 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470069 13f79535-47bb-0310-9956-ffa450edef68
2013-04-19 22:25:53 +00:00
Thomas Graves
0a4857fef3
HADOOP-9469. mapreduce/yarn source jars not included in dist tarball Robert Parker via tgraves)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470059 13f79535-47bb-0310-9956-ffa450edef68
2013-04-19 21:59:31 +00:00
Thomas Graves
d5a1fb4663
MAPREDUCE-5147. Maven build should create hadoop-mapreduce-client-app-VERSION.jar directly (Robert Parker via tgraves)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470038 13f79535-47bb-0310-9956-ffa450edef68
2013-04-19 20:55:05 +00:00
Kihwal Lee
fbce046a88
svn merge -c 1469839 Merging from trunk to branch-2 to fix HDFS-4699.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469840 13f79535-47bb-0310-9956-ffa450edef68
2013-04-19 14:11:28 +00:00
Vinod Kumar Vavilapalli
1bfb6af49f
YARN-441. Removed unused utility methods for collections from two API records. Contributed by Xuan Gong.
...
MAPREDUCE-5163. Update MR App to not use API utility methods for collections after YARN-441. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1469657 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469658 13f79535-47bb-0310-9956-ffa450edef68
2013-04-19 01:34:04 +00:00
Alejandro Abdelnur
d516caf788
MAPREDUCE-4932. mapreduce.job#getTaskCompletionEvents incompatible with Hadoop 1. (rkanter via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469589 13f79535-47bb-0310-9956-ffa450edef68
2013-04-18 21:43:59 +00:00
Kihwal Lee
3ef924019d
svn merge -c 1375790 Merging from trunk to branch-2 to fix HADOOP-8711.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469565 13f79535-47bb-0310-9956-ffa450edef68
2013-04-18 20:54:07 +00:00
Vinod Kumar Vavilapalli
0df869e1f7
MAPREDUCE-5152. Make MR App to simply pass through the container from RM instead of extracting and populating information itself to start any container. Contributed by Vinod Kumar Vavilapalli.
...
svn merge --ignore-ancestry -c 1469544 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469545 13f79535-47bb-0310-9956-ffa450edef68
2013-04-18 20:14:22 +00:00
Alejandro Abdelnur
df24059512
MAPREDUCE-4898. FileOutputFormat.checkOutputSpecs and FileOutputFormat.setOutputPath incompatible with MR1. (rkanter via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469524 13f79535-47bb-0310-9956-ffa450edef68
2013-04-18 18:53:36 +00:00
Alejandro Abdelnur
15d5394221
YARN-482. FS: Extend SchedulingMode to intermediate queues. (kkambatl via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469511 13f79535-47bb-0310-9956-ffa450edef68
2013-04-18 18:13:36 +00:00
Vinod Kumar Vavilapalli
27bef76501
YARN-585. Fix failure in TestFairScheduler#testNotAllowSubmitApplication caused by YARN-514. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1469492 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469494 13f79535-47bb-0310-9956-ffa450edef68
2013-04-18 17:49:57 +00:00
Harsh J
8f02b5951b
HADOOP-9450. HADOOP_USER_CLASSPATH_FIRST is not honored; CLASSPATH is PREpended instead of APpended. Contributed by Chris Nauroth and Harsh J. (harsh)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469215 13f79535-47bb-0310-9956-ffa450edef68
2013-04-18 08:01:08 +00:00
Alejandro Abdelnur
9b4f1a0c10
MAPREDUCE-5128. mapred-default.xml is missing a bunch of history server configs. (sandyr via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469096 13f79535-47bb-0310-9956-ffa450edef68
2013-04-17 23:15:22 +00:00
Alejandro Abdelnur
4198eaf00d
YARN-476. ProcfsBasedProcessTree info message confuses users. (sandyr via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469094 13f79535-47bb-0310-9956-ffa450edef68
2013-04-17 23:12:37 +00:00
Alejandro Abdelnur
dc21be9026
YARN-518. Fair Scheduler's document link could be added to the hadoop 2.x main doc page. (sandyr via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469092 13f79535-47bb-0310-9956-ffa450edef68
2013-04-17 23:06:30 +00:00
Bikas Saha
2108a35d28
Merge -c r1469060 from trunk to branch-2 for MAPREDUCE-5140. MR part of YARN-514 (Zhijie Shen via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469064 13f79535-47bb-0310-9956-ffa450edef68
2013-04-17 20:32:15 +00:00
Bikas Saha
039d673794
Merge -c r1469059 from trunk to branch-2 for YARN-514. Delayed store operations should not result in RM unavailability for app submission (Zhijie Shen via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469062 13f79535-47bb-0310-9956-ffa450edef68
2013-04-17 20:30:48 +00:00
Suresh Srinivas
b3941c65e8
HDFS-4695. Merge 1469015 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469018 13f79535-47bb-0310-9956-ffa450edef68
2013-04-17 18:14:16 +00:00
Vinod Kumar Vavilapalli
7f3fd5f03d
Reverting my accidental revert of MAPREDUCE-5059 in the previous commit of YARN-500 from branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468743 13f79535-47bb-0310-9956-ffa450edef68
2013-04-17 04:22:34 +00:00
Vinod Kumar Vavilapalli
3d2430fad1
YARN-500. Fixed YARN webapps to not roll-over ports when explicitly asked to use non-ephemeral ports. Contributed by Kenji Kikushima.
...
svn merge --ignore-ancestry -c 1468739 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468740 13f79535-47bb-0310-9956-ffa450edef68
2013-04-17 04:17:49 +00:00
Kihwal Lee
88086534a8
svn merge -c 1468629 Merging from trunk to branch-2 to fix MR-5065.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468631 13f79535-47bb-0310-9956-ffa450edef68
2013-04-16 22:03:40 +00:00
Thomas Graves
fd6956c3bd
MAPREDUCE-5015. Coverage fix for org.apache.hadoop.mapreduce.tools.CLI (Aleksey Gorshkov via tgraves)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468484 13f79535-47bb-0310-9956-ffa450edef68
2013-04-16 16:12:25 +00:00
Suresh Srinivas
16d41cabf9
HDFS-4693. Merge 1468457 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468469 13f79535-47bb-0310-9956-ffa450edef68
2013-04-16 15:39:20 +00:00
Vinod Kumar Vavilapalli
8cc3b081fa
YARN-444. Moved special container exit codes from YarnConfiguration to API where they belong. Contributed by Sandy Ryza.
...
MAPREDUCE-5151. Updated MR AM to use standard exit codes from the API after YARN-444. Contributed by Sandy Ryza.
svn merge --ignore-ancestry -c 1468276 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468277 13f79535-47bb-0310-9956-ffa450edef68
2013-04-15 23:55:26 +00:00
Robert Joseph Evans
a7fba8fcd7
svn merge -c 1468232 FIXES: MAPREDUCE-4974. Optimising the LineRecordReader initialize() method (Gelesh via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468235 13f79535-47bb-0310-9956-ffa450edef68
2013-04-15 21:36:31 +00:00
Suresh Srinivas
5a98de170c
HADOOP-9473. Merge 1467694 and 1467696 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467697 13f79535-47bb-0310-9956-ffa450edef68
2013-04-13 20:27:50 +00:00
Konstantin Shvachko
a59b953861
HDFS-4639. startFileInternal() should not increment generation stamp. Contributed by Plamen Jeliazkov.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467535 13f79535-47bb-0310-9956-ffa450edef68
2013-04-13 01:36:46 +00:00
Arun Murthy
8acaea0028
YARN-412. Pushing to 2.0.5-beta only.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467471 13f79535-47bb-0310-9956-ffa450edef68
2013-04-12 21:20:45 +00:00
Konstantin Shvachko
a24b7fc1a6
HADOOP-9211. Set default max heap size in HADOOP_CLIENT_OPTS to 512m in order to avoid OOME. Contributed by Plamen Jeliazkov.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467390 13f79535-47bb-0310-9956-ffa450edef68
2013-04-12 18:11:28 +00:00
Kihwal Lee
c9b9ebde1d
svn merge -c 1467307 Merging from trunk to branch-2 to fix HDFS-4477.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467308 13f79535-47bb-0310-9956-ffa450edef68
2013-04-12 15:19:59 +00:00
Arun Murthy
ac7d455a0f
Merge -c 1467244 from trunk to branch-2 to fix YARN-412. Fixed FifoScheduler to check hostname of a NodeManager rather than its host:port during scheduling which caused incorrect locality for containers. Contributed by Roger Hoover.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467245 13f79535-47bb-0310-9956-ffa450edef68
2013-04-12 12:15:17 +00:00
Konstantin Shvachko
7e12ea395e
MAPREDUCE-4985. Add compression option to TestDFSIO usage. Contributed by Plamen Jeliazkov.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467146 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 23:50:15 +00:00
Vinod Kumar Vavilapalli
23dd901a48
HADOOP-9471. Merged into 2.0.4-alpha. Fixing CHANGES.txt
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467138 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 23:26:04 +00:00
Vinod Kumar Vavilapalli
3a1ab1bc98
(Missing commit message from the previous commit)
...
YARN-486. Changed NM's startContainer API to accept Container record given by RM as a direct parameter instead of as part of the ContainerLaunchContext record. Contributed by Xuan Gong.
MAPREDUCE-5139. Update MR AM to use the modified startContainer API after YARN-486. Contributed by Xuan Gong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467131 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 23:05:24 +00:00
Vinod Kumar Vavilapalli
a84c8bcbd4
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467130 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 23:04:09 +00:00
Vinod Kumar Vavilapalli
0c54bb343d
MAPREDUCE-5094. Disabled memory monitoring by default in MiniMRYarnCluster to avoid some downstream tests failing. Contributed by Siddharth Seth.
...
svn merge --ignore-ancestry -c 1467124 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467126 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 22:55:52 +00:00
Vinod Kumar Vavilapalli
ff4b1aa99e
MAPREDUCE-5059. Change average merge time on Job overview page to be the time delta between the end of the shuffle and the start of the reduce. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1467120 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467122 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 22:28:53 +00:00