Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,232 Commits 326 Branches 371 Tags 1.5 GiB
Commit Graph

4232 Commits

Author SHA1 Message Date
Vinod Kumar Vavilapalli d5331b18a9 YARN-576. Modified ResourceManager to reject NodeManagers that don't satisy minimum resource requirements. Contributed by Kenji Kikushima. 
svn merge --ignore-ancestry -c 1476824 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476825 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-28 20:04:47 +00:00
Suresh Srinivas f76ad1af85 HDFS-4748. Merge r1476587 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476588 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-27 14:32:49 +00:00
Suresh Srinivas 091e5df455 HDFS-4768. Merge 1476579 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476581 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-27 14:11:41 +00:00
Jason Darrell Lowe 8f151832cc svn merge -c 1476487 FIXES: HADOOP-9504. MetricsDynamicMBeanBase has concurrency issues in createMBeanInfo. Contributed by Liang Xie 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476488 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-27 04:13:04 +00:00
Tsz-wo Sze b2927bd936 svn merge -c 1476399 from trunk for HDFS-4721. Speed up lease recovery by avoiding stale datanodes and choosing he datanode with the most recent heartbeat as the primary. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476400 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-26 20:52:29 +00:00
Vinod Kumar Vavilapalli ffe3368d94 YARN-562. Modified NM to reject any containers allocated by a previous ResourceManager. Contributed by Jian He. 
MAPREDUCE-5167. Update MR App after YARN-562 to use the new builder API for the container. Contributed by Jian He.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476346 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-26 19:08:44 +00:00
Vinod Kumar Vavilapalli 141fe2f5e5 YARN-363. Add webapps/proxy directory without which YARN proxy-server fails when started in stand-alone mode. Contributed by Kenji Kikushima. 
svn merge --ignore-ancestry -c 1476330 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476332 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-26 18:31:04 +00:00
Vinod Kumar Vavilapalli 27404b1190 YARN-591. Moved RM recovery related records out of public API as they do not belong there. Contributed by Vinod Kumar Vavilapalli. 
svn merge --ignore-ancestry -c 1476324 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476327 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-26 18:04:24 +00:00
Suresh Srinivas 14246f3d24 HDFS-4434. Reverting the merge to branch-2 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475972 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-25 21:28:51 +00:00
Tsz-wo Sze 874f58b23a svn merge -c 1475959 from trunk for HADOOP-9503. Remove sleep between IPC client connect timeouts. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475960 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-25 21:09:04 +00:00
Suresh Srinivas a51590e1c5 HDFS-4053. Merging change r1399908 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475848 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-25 16:44:59 +00:00
Suresh Srinivas 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
Thomas White 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
Thomas White 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
Vinod Kumar Vavilapalli 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
Suresh Srinivas 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
Suresh Srinivas 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
Siddharth Seth 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
Siddharth Seth 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
Arun Murthy 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
Aaron Myers 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
Aaron Myers 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
Suresh Srinivas 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
Suresh Srinivas 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
Suresh Srinivas 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
Vinod Kumar Vavilapalli 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
Suresh Srinivas 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
Suresh Srinivas 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
Suresh Srinivas 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
Suresh Srinivas 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
Suresh Srinivas 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
Suresh Srinivas 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
Suresh Srinivas 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
Suresh Srinivas 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
Arun Murthy 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
Suresh Srinivas 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
Suresh Srinivas 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
Suresh Srinivas 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
Suresh Srinivas 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
Suresh Srinivas 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
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