Commit Graph

938 Commits

Author SHA1 Message Date
Robert Joseph Evans c4defd0cff svn merge -c 1401703 FIXES: YARN-180. Capacity scheduler - containers that get reserved create container token to early (acmurthy and bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401705 13f79535-47bb-0310-9956-ffa450edef68
2012-10-24 14:20:09 +00:00
Thomas Graves 1ef0ff3af5 merge -r 1401667:1401668 from trunk. FIXES: YARN-177
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401669 13f79535-47bb-0310-9956-ffa450edef68
2012-10-24 13:25:19 +00:00
Vinod Kumar Vavilapalli e49fb14997 YARN-181. Fixed eclipse settings broken by capacity-scheduler.xml move via YARN-140. Contributed by Siddharth Seth.
svn merge --ignore-ancestry -c 1401504 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401508 13f79535-47bb-0310-9956-ffa450edef68
2012-10-23 22:49:37 +00:00
Siddharth Seth 243966374b merge YARN-179 from trunk. Fix some unit test failures. (Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401482 13f79535-47bb-0310-9956-ffa450edef68
2012-10-23 21:07:42 +00:00
Alejandro Abdelnur e0ced0a835 YARN-140. Add capacity-scheduler-default.xml to provide a default set of configurations for the capacity scheduler. (ahmed via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400337 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 23:18:00 +00:00
Siddharth Seth aafad662be merge YARN-136 from trunk. Make ClientToAMTokenSecretManager part of RMContext (Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400279 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 20:39:41 +00:00
Vinod Kumar Vavilapalli 9b7e8c4274 YARN-32. Fix TestApplicationTokens to not depend on test order and thus pass on JDK7. Contributed by Vinod Kumar Vavilapali.
svn merge --ignore-ancestry -c 1399795 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399796 13f79535-47bb-0310-9956-ffa450edef68
2012-10-18 19:12:53 +00:00
Vinod Kumar Vavilapalli 32d3e4e9f5 YARN-43. Fix TestResourceTrackerService to not depend on test order and thus pass on JDK7. Contributed by Thomas Graves.
svn merge --ignore-ancestry -c 1399066 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399067 13f79535-47bb-0310-9956-ffa450edef68
2012-10-17 01:29:12 +00:00
Thomas White 0aad6f2dac Merge -r 1396971:1396972 from trunk to branch-2. Fixes: YARN-146. Add unit tests for computing fair share in the fair scheduler. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396977 13f79535-47bb-0310-9956-ffa450edef68
2012-10-11 10:30:53 +00:00
Siddharth Seth 13fe2bd483 merge YARN-150 from trunk. Fixes AppRejectedTransition does not unregister a rejected app-attempt from the ApplicationMasterService (Contributed by Bikas Saha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396430 13f79535-47bb-0310-9956-ffa450edef68
2012-10-10 00:09:29 +00:00
Vinod Kumar Vavilapalli 9d7c8f5d89 YARN-30. Fixed tests verifying web-services to work on JDK7. Contributed by Thomas Graves.
svn merge --ignore-ancestry -c 1396391 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396392 13f79535-47bb-0310-9956-ffa450edef68
2012-10-09 22:55:11 +00:00
Siddharth Seth b98a3a3787 merge YARN-134 from trunk. Fixes ClientToAMSecretManager creates keys without checking for validity of the appID. (Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395843 13f79535-47bb-0310-9956-ffa450edef68
2012-10-09 01:58:07 +00:00
Vinod Kumar Vavilapalli 59da1ac1fc YARN-127. Move RMAdmin tool to its correct location - the client module. Contributed by Vinod Kumar Vavilapalli.
svn merge --ignore-ancestry -c 1395781 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395782 13f79535-47bb-0310-9956-ffa450edef68
2012-10-08 21:24:37 +00:00
Alejandro Abdelnur ae68ae6919 YARN-23. FairScheduler: FSQueueSchedulable#updateDemand() - potential redundant aggregation. (kkambatl via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1394322 13f79535-47bb-0310-9956-ffa450edef68
2012-10-04 23:02:28 +00:00
Siddharth Seth 60a5f6b520 merge YARN-102 from trunk. Move the apache header to the top of the file in MemStore.java. (Contributed by Devaraj K)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1393771 13f79535-47bb-0310-9956-ffa450edef68
2012-10-03 21:20:10 +00:00
Siddharth Seth 9f3f66375e merge YARN-131 from trunk. Fix incorrect ACL properties in capacity scheduler documentation. (Contributed by Ahmed Radwan)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1393263 13f79535-47bb-0310-9956-ffa450edef68
2012-10-03 02:57:25 +00:00
Arun Murthy 41aa8aeb07 Merge -c 1391944 from trunk to branch-2 to fix YARN-138. Ensure default values for minimum/maximum container sizes is sane. Contributed by Harsh J and Siddharth Seth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1391945 13f79535-47bb-0310-9956-ffa450edef68
2012-09-30 03:46:51 +00:00
Arun Murthy 7418b5f357 Merge -c 1391929 from trunk to branch-2 to fix YARN-137. Change the default YARN scheduler to be the CapacityScheduler. Contributed by Siddharth Seth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1391930 13f79535-47bb-0310-9956-ffa450edef68
2012-09-30 00:44:15 +00:00
Siddharth Seth 060e4f256d merge YARN-116 from trunk. Add the ability to change the RM include/exclude file without a restart. (Contributed by xieguiming and Harsh J)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1391913 13f79535-47bb-0310-9956-ffa450edef68
2012-09-29 22:40:58 +00:00
Vinod Kumar Vavilapalli f1749af465 Fix NodeManager to verify the application's user-name
svn merge --ignore-ancestry -c 1390825 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1390826 13f79535-47bb-0310-9956-ffa450edef68
2012-09-27 03:45:05 +00:00
Vinod Kumar Vavilapalli e7b414289c YARN-53. Added the missing getGroups API to ResourceManager. Contributed by Bo Wang.
svn merge --ignore-ancestry -c 1389176 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1389177 13f79535-47bb-0310-9956-ffa450edef68
2012-09-24 00:52:55 +00:00
Vinod Kumar Vavilapalli 1415f8490d YARN-93. Fixed RM to propagate diagnostics from applications that have finished but failed Contributed by Jason Lowe.
svn merge --ignore-ancestry -c 1384169 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1384170 13f79535-47bb-0310-9956-ffa450edef68
2012-09-13 00:47:54 +00:00
Arun Murthy f403be7569 Set version in branch-2 to 2.0.3-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1382809 13f79535-47bb-0310-9956-ffa450edef68
2012-09-10 12:57:48 +00:00
Arun Murthy 69d9fa75bc Merge -c r1381868 from trunk to branch-2 to fix YARN-80. Add support for delaying rack-local containers in CapacityScheduler. Contributed by Arun C. Murthy.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381873 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 05:11:46 +00:00
Vinod Kumar Vavilapalli 3f22ec2960 YARN-75. Fixing spurious patch apply.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381822 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 00:29:26 +00:00
Vinod Kumar Vavilapalli 445a340593 YARN-75. Modified ResourceManager's RMContainer to handle a valid RELEASE event at RUNNING state. Contributed by Siddharth Seth.
svn merge -r 1381806:1381809 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381816 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 00:21:36 +00:00
Robert Joseph Evans cde65024a2 YARN-60: Fix minor merge conflict (bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379558 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 19:28:21 +00:00
Vinod Kumar Vavilapalli bbfbbf31c8 YARN-60. Fixed a bug in ResourceManager which causes all NMs to get NPEs and thus causes all containers to be rejected. Contributed by Vinod Kumar Vavilapalli.
svn merge --ignore-ancestry -c 1379550 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379551 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 19:12:57 +00:00
Robert Joseph Evans 7287665955 svn merge -c 1379498. FIXES: YARN-63. RMNodeImpl is missing valid transitions from the UNHEALTHY state (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379500 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 16:34:33 +00:00
Vinod Kumar Vavilapalli 57c4f237e2 YARN-31. Fix TestDelegationTokenRenewer to not depend on test order so as to pass tests on jdk7. Contributed by Thomas Graves.
svn merge --ignore-ancestry -c 1377961 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377963 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 03:33:20 +00:00
Siddharth Seth d2b4457eaf merge YARN-37 from trunk. Change TestRMAppTransitions to use the DrainDispatcher. (Contributed by Mayank Bansal)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377805 13f79535-47bb-0310-9956-ffa450edef68
2012-08-27 19:38:24 +00:00
Siddharth Seth bf08346d3c merge YARN-39 from trunk. RM-NM secret-keys should be randomly generated and rolled every so often. (Contributed by Vinod Kumar Vavilapalli and Siddharth Seth)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377181 13f79535-47bb-0310-9956-ffa450edef68
2012-08-25 02:25:12 +00:00
Thomas Graves d6c75fbbb1 merge -r 1375082:1375083 from trunk. FIXES: YARN-27
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1375084 13f79535-47bb-0310-9956-ffa450edef68
2012-08-20 16:06:25 +00:00
Thomas Graves 8a5ab9229d merge -r 1375065:1375066 from trunk. FIXES: YARN-27
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1375067 13f79535-47bb-0310-9956-ffa450edef68
2012-08-20 15:37:43 +00:00
Alejandro Abdelnur b344870bdd HADOOP-8681. add support for HTTPS to the web UIs. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1372642 13f79535-47bb-0310-9956-ffa450edef68
2012-08-13 21:56:31 +00:00
Todd Lipcon 3960c66081 YARN-13. Fix pom versions for YARN in branch-2. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1370933 13f79535-47bb-0310-9956-ffa450edef68
2012-08-08 20:12:38 +00:00
Arun Murthy 9337abd0b0 Merge -c 1370889 from trunk to branch-2 to fix YARN-12. Fix findbugs warnings in FairScheduler. Contributed by Junping Du.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1370890 13f79535-47bb-0310-9956-ffa450edef68
2012-08-08 18:54:26 +00:00
Arun Murthy 92a99de731 Merge -c 1370666 from trunk to branch-2 to fix YARN-1. Promote YARN to be a sub-project of Apache Hadoop.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1370667 13f79535-47bb-0310-9956-ffa450edef68
2012-08-08 05:33:56 +00:00