e304090117
Cleanup CHANGES.txt to have consistent formatting and match the descrtion with CHANGES.txt in trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475780 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 14:04:12 +00:00
07ab02a982
Merge -r 1475680:1475681 from trunk to branch-2. Fixes: YARN-289. Fair scheduler allows reservations that won't fit on node. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475682 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 09:18:24 +00:00
3bed8dc7b9
Merge -r 1475669:1475670 from trunk to branch-2. Fixes: YARN-595. Refactor fair scheduler to use common Resources. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475672 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 08:36:22 +00:00
a1fe9a0c9f
YARN-577. Add application-progress also to ApplicationReport. Contributed by Hitesh Shah.
...
MAPREDUCE-5178. Update MR App to set progress in ApplicationReport after YARN-577. Contributed by Hitesh Shah.
svn merge --ignore-ancestry -c 1475636 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475637 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 05:45:15 +00:00
74885ea5c0
HADOOP-9357. Revert the change r1461901 to fix TestFcHdfsSymlink failures
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475628 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 04:55:05 +00:00
14f658bf38
HDFS-4745. Merge 1475623 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475625 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 04:32:51 +00:00
b392a65e2e
merge MAPREDUCE-5181 from trunk. RMCommunicator should not use AMToken from the env. Contributed by Vinod Kumar Vavilapalli.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471817 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 02:51:08 +00:00
c4feeefb2b
merge YARN-579 from trunk. Stop setting the Application Token in the AppMaster env, in favour of the copy present in the container token field. Contributed by Vinod Kumar Vavilapalli.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471815 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 02:48:18 +00:00
c281269d0e
Merge -c 1471796 from trunk to branch-2 to fix MAPREDUCE-5166. Fix ConcurrentModificationException due to insufficient synchronization on updates to task Counters. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471797 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 00:55:00 +00:00
2838617e0a
Update CHANGES.txt for HDFS-4739.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471775 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 23:32:50 +00:00
a0e8dbbb19
HDFS-4739. NN can miscalculate the number of extra edit log segments to retain. Contributed by Aaron T. Myers.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471773 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 23:32:13 +00:00
1efa9d84ab
HDFS-4434. Merge r1469644 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471703 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 21:41:56 +00:00
7ca417037f
HDFS-4340. Merge r1448502 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471698 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 21:35:47 +00:00
13df6b76d2
HDFS-4340. Merge r1443169 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471692 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 21:31:42 +00:00
909e52274c
YARN-605. Fix failing unit test in TestNMWebServices when versionInfo has parantheses like when running on a git checkout. Contributed by Hitesh Shah.
...
svn merge --ignore-ancestry -c 1471608 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471609 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 19:43:23 +00:00
2dbf0c2af5
HDFS-4243. Merge r1416709 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471603 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 19:21:05 +00:00
5ed3177570
HDFS-4346. Add a file missed in r1471598
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471602 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 19:12:38 +00:00
0dd2ca1389
HDFS-4346. Merge change r1428167 and r1428560 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471598 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 18:59:08 +00:00
9d7e92100b
HDFS-4339. Merge change r1465835 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471596 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 18:42:14 +00:00
05dc1ca3a5
HDFS-4296. Merge r1420700 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471590 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 18:29:00 +00:00
2620203b1a
HDFS-4334. Merge r1426429 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471582 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 18:20:09 +00:00
0b2af91bc6
HDFS-4209. Merge r1414447 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471574 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 18:16:25 +00:00
c68bb9cb51
HDFS-4151. Merge r1406006 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471567 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 18:01:46 +00:00
1fb58d2322
Merge -c 1471556 from trunk to branch-2 to fix MAPREDUCE-4737. Ensure that mapreduce APIs are semantically consistent with mapred API w.r.t Mapper.cleanup and Reducer.cleanup; in the sense that cleanup is now called even if there is an error. The old mapred API already ensures that Mapper.close and Reducer.close are invoked during error handling. Note that it is an incompatible change, however end-users can override Mapper.run and Reducer.run to get the old (inconsistent) behaviour. Contributed by Arun C. Murthy.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471557 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 17:39:28 +00:00
19198ea31d
HDFS-4215. Merge r1411947 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471530 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 16:46:50 +00:00
876c1c9098
HDFS-4206. Merge change r1410996 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471522 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 16:38:53 +00:00
b2b151139c
HDFS-4152. Merge r1406326 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471508 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 16:22:55 +00:00
c5227bd362
Remove duplicate HDFS-4112 entries in CHANGES.txt
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471503 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 16:14:51 +00:00
40aaaf000e
HDFS-4124. Merge r1403304 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471500 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 16:10:59 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Suresh Srinivas
Thomas White
Vinod Kumar Vavilapalli
Siddharth Seth
Arun Murthy
Aaron Myers
Robert Joseph Evans
Harsh J
Bikas Saha
Thomas Graves
Kihwal Lee
Alejandro Abdelnur