Commit Graph

70 Commits

Author SHA1 Message Date
Thomas White 348faf8f36 Merge -r 1402656:1402657 from trunk to branch-2. Fixes: YARN-145. Add a Web UI to the fair share scheduler. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1402659 13f79535-47bb-0310-9956-ffa450edef68
2012-10-26 21:03:20 +00:00
Jason Darrell Lowe b702473f5c svn merge -c 1401726 FIXES: YARN-139. Interrupted Exception within AsyncDispatcher leads to user confusion. Contributed by Vinod Kumar Vavilapalli
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401729 13f79535-47bb-0310-9956-ffa450edef68
2012-10-24 15:25:22 +00:00
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
Robert Joseph Evans bc6fbf8b74 svn merge -c 1401698 FIXES: YARN-178. Fix custom ProcessTree instance creation (Radim Kolar via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401700 13f79535-47bb-0310-9956-ffa450edef68
2012-10-24 14:08:28 +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
Vinod Kumar Vavilapalli 9c70dfcf25 YARN-174. Modify NodeManager to pass the user's configuration even when rebooting. Contributed by Vinod Kumar Vavilapalli.
svn merge --ignore-ancestry -c 1401086 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401088 13f79535-47bb-0310-9956-ffa450edef68
2012-10-22 21:25:56 +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
Robert Joseph Evans 767897d631 svn merge -c 1400189 FIXES: YARN-163. Retrieving container log via NM webapp can hang with multibyte characters in log (jlowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400190 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 17:36:26 +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
Vinod Kumar Vavilapalli 7c550ccb09 YARN-161. Fix multiple compiler warnings for unchecked operations in YARN common. Contributed by Chris Nauroth.
svn merge --ignore-ancestry -c 1399056 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399057 13f79535-47bb-0310-9956-ffa450edef68
2012-10-17 00:32:37 +00:00
Suresh Srinivas 3a9aadc3c7 HADOOP-8911. CRLF characters in source and text files (trunk equivalent patch). Contributed Raja Aluri.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1397435 13f79535-47bb-0310-9956-ffa450edef68
2012-10-12 04:48:40 +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
Vinod Kumar Vavilapalli 011046e778 YARN-94. Modify DistributedShell to point to main-class by default, clean up the help message, and hard-code the AM class. Contributed by Hitesh Shah.
svn merge --ignore-ancestry -c 1396226 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396253 13f79535-47bb-0310-9956-ffa450edef68
2012-10-09 19:56:32 +00:00
Siddharth Seth 9f60339854 merge YARN-33 from trunk. Change LocalDirsHandlerService to validate the configured local and log dirs. (Contributed by Mayank Bansal)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395845 13f79535-47bb-0310-9956-ffa450edef68
2012-10-09 02:27:18 +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 1b099a7cbf YARN-40. Fixed CHANGES.txt from previous commit.
svn merge --ignore-ancestry -c 1395799 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395800 13f79535-47bb-0310-9956-ffa450edef68
2012-10-08 22:36:47 +00:00
Vinod Kumar Vavilapalli 8792f157a4 YARN-40. Provided support for missing YARN commands Contributed by Devaraj K and Vinod Kumar Vavilapalli.
svn merge --ignore-ancestry -c 1395793 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395794 13f79535-47bb-0310-9956-ffa450edef68
2012-10-08 22:19:43 +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
Robert Joseph Evans 76aa144c64 Preparing for release 0.23.4
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1391806 13f79535-47bb-0310-9956-ffa450edef68
2012-09-29 14:18:27 +00:00
Robert Joseph Evans b2db4b2917 svn merge -c 1391649 FIXES: YARN-106. Nodemanager needs to set permissions of local directories (jlowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1391651 13f79535-47bb-0310-9956-ffa450edef68
2012-09-28 20:53:14 +00:00
Robert Joseph Evans aa94aea3c2 svn merge -c 1382072 FIXES: YARN-57. Allow process-tree based resource calculation et al. to be pluggable to support it on multiple platforms. Contributed by Radim Kolar.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1391094 13f79535-47bb-0310-9956-ffa450edef68
2012-09-27 16:38:54 +00:00
Arun Murthy c51c5c1297 Merge -c 1390218 from trunk to branch-2 to fix YARN-9. Rename YARN_HOME to HADOOP_YARN_HOME. Contributed by Vinod K V.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1390219 13f79535-47bb-0310-9956-ffa450edef68
2012-09-25 23:40:14 +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
Siddharth Seth 4212596dc6 merge YARN-88 from trunk. DefaultContainerExecutor can fail to set proper permissions. (Contributed by Jason Lowe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1388583 13f79535-47bb-0310-9956-ffa450edef68
2012-09-21 17:36:18 +00:00
Siddharth Seth 72ce7d1945 merge YARN-82 from trunk. Change the default local and log dirs to be based on hadoop.tmp.dir and yarn.log.dir. (Contributed by Hemanth Yamijala)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1388343 13f79535-47bb-0310-9956-ffa450edef68
2012-09-21 06:40:56 +00:00
Vinod Kumar Vavilapalli 02416b04ea YARN-28. Fixed TestCompositeService to not depend on test-order and thus made it pass on JDK7. Contributed by Thomas Graves.
svn merge --ignore-ancestry -c 1386907 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1386937 13f79535-47bb-0310-9956-ffa450edef68
2012-09-18 00:41:44 +00:00
Robert Joseph Evans bd85d36592 svn merge -c 1386838 FIXES: YARN-108. FSDownload can create cache directories with the wrong permissions (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1386841 13f79535-47bb-0310-9956-ffa450edef68
2012-09-17 21:11:56 +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
Vinod Kumar Vavilapalli ddf8691f03 YARN-78. Changed UnManagedAM application to use YarnClient. Contributed by Bikas Saha.
svn merge --ignore-ancestry -c 1383705 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1383706 13f79535-47bb-0310-9956-ffa450edef68
2012-09-12 00:50:25 +00:00
Arun Murthy c76e05c1b7 Set date for hadoop-2.0.2-alpha
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1382198 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 22:37:55 +00:00
Arun Murthy d47f6bb16e Preparing for hadoop-2.0.2-alpha release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1382195 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 22:34:25 +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 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
Vinod Kumar Vavilapalli f5f0349cc5 YARN-15. Fixing CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381803 13f79535-47bb-0310-9956-ffa450edef68
2012-09-06 23:37:33 +00:00
Vinod Kumar Vavilapalli 7301174579 YARN-15. Updated default classpath for YARN applications to reflect split of YARN into a sub-project. Contributed by Arun C Murthy.
svn merge -c 1381794 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381796 13f79535-47bb-0310-9956-ffa450edef68
2012-09-06 23:13:22 +00:00
Thomas Graves 4b9c47375d merge -r 1381458:1381459 from trunk. FIXES: YARN-87
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381460 13f79535-47bb-0310-9956-ffa450edef68
2012-09-06 02:11:00 +00:00
Robert Joseph Evans 36a45e3995 svn merge -c 1381317 FIXES: YARN-68. NodeManager will refuse to shutdown indefinitely due to container log aggregation (daryn via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381318 13f79535-47bb-0310-9956-ffa450edef68
2012-09-05 19:41:21 +00:00
Vinod Kumar Vavilapalli e7082c371b YARN-83. Change package of YarnClient to org.apache.hadoop. Contributed by Bikas Saha.
svn merge --ignore-ancestry -c 1381273 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381275 13f79535-47bb-0310-9956-ffa450edef68
2012-09-05 17:55:53 +00:00