Commit Graph

954 Commits

Author SHA1 Message Date
Suresh Srinivas afc40e8a66 HADOOP-10255. Merge 1561959 and 1561961 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561966 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 07:47:37 +00:00
Arpit Agarwal d1d74049aa HDFS-5297. Merging r1561849 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561854 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 21:19:16 +00:00
Jason Darrell Lowe 4fe4190b1d svn merge -c 1561110 FIXES: YARN-1575. Public localizer crashes with "Localized unkown resource". Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561112 13f79535-47bb-0310-9956-ffa450edef68
2014-01-24 18:59:54 +00:00
Konstantin Boudnik f3136cd6b9 HADOOP-10167. Mark hadoop-common source as UTF-8 in Maven pom files / refactoring. Contributed by Mikhail Antonov.
Conflicts:

	hadoop-common-project/hadoop-common/CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560832 13f79535-47bb-0310-9956-ffa450edef68
2014-01-23 22:31:27 +00:00
Karthik Kambatla b650f912ad YARN-1573. ZK store should use a private password for root-node-acls. (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560595 13f79535-47bb-0310-9956-ffa450edef68
2014-01-23 06:26:23 +00:00
Sanford Ryza b227defc4c YARN-1623. Include queue name in RegisterApplicationMasterResponse (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560555 13f79535-47bb-0310-9956-ffa450edef68
2014-01-22 22:45:33 +00:00
Sanford Ryza 0377619e7d YARN-1607. TestRM relies on the scheduler assigning multiple containers in a single node update (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560534 13f79535-47bb-0310-9956-ffa450edef68
2014-01-22 22:08:37 +00:00
Sanford Ryza 700a81d9ba YARN-1624. QueuePlacementPolicy format is not easily readable via a JAXB parser (Aditya Acharya via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560471 13f79535-47bb-0310-9956-ffa450edef68
2014-01-22 18:52:25 +00:00
Jason Darrell Lowe 033d60a28f svn merge -c 1560148 FIXES: MAPREDUCE-5693. Restore MRv1 behavior for log flush. Contributed by Gera Shegalov
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560149 13f79535-47bb-0310-9956-ffa450edef68
2014-01-21 19:27:57 +00:00
Karthik Kambatla a560488df6 YARN-1616. RMFatalEventDispatcher should log the cause of the event (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1559903 13f79535-47bb-0310-9956-ffa450edef68
2014-01-21 02:02:24 +00:00
Jason Darrell Lowe 0fa22b8120 svn merge -c 1558948 FIXES: MAPREDUCE-5672. Provide optional RollingFileAppender for container log4j (syslog). Contributed by Gera Shegalov
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558957 13f79535-47bb-0310-9956-ffa450edef68
2014-01-16 23:13:17 +00:00
Karthik Kambatla 5040a1e171 YARN-1606. Fix the default value of yarn.resourcemanager.zk-timeout-ms in yarn-default.xml (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558884 13f79535-47bb-0310-9956-ffa450edef68
2014-01-16 18:55:25 +00:00
Karthik Kambatla 7eb1ca53b3 YARN-1608. LinuxContainerExecutor has a few DEBUG messages at INFO level (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558875 13f79535-47bb-0310-9956-ffa450edef68
2014-01-16 18:44:35 +00:00
Sanford Ryza f5e4562408 YARN-1351. Invalid string format in Fair Scheduler log warn message (Konstantin Weitz via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558602 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 23:23:01 +00:00
Alejandro Abdelnur e1595527c0 YARN-1601. 3rd party JARs are missing from hadoop-dist output. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558466 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 17:01:03 +00:00
Junping Du 534c8ce4c8 Merge 1558340 from trunk: YARN-1603. Remove two *.orig files which were unexpectedly committed. (Zhijie Shen via junping_du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558342 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 11:12:28 +00:00
Karthik Kambatla 1561f56b30 YARN-1598. HA-related rmadmin commands don't work on a secure cluster (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558253 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 01:00:19 +00:00
Sanford Ryza 04c7b8afb5 YARN-1567. In Fair Scheduler, allow empty queues to change between leaf and parent on allocation file reload (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558229 13f79535-47bb-0310-9956-ffa450edef68
2014-01-14 22:38:23 +00:00
Konstantin Boudnik c9e403f652 Adding 2.0.6-alpha release to the CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558216 13f79535-47bb-0310-9956-ffa450edef68
2014-01-14 21:52:06 +00:00
Vinod Kumar Vavilapalli f35f702426 YARN-888. Cleaned up POM files so that non-leaf modules don't include any dependencies and thus compact the dependency list for leaf modules. Contributed by Alejandro Abdelnur.
svn merge --ignore-ancestry -c 1557801 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557802 13f79535-47bb-0310-9956-ffa450edef68
2014-01-13 18:34:39 +00:00
Vinod Kumar Vavilapalli 859ff0e192 YARN-1566. Changed Distributed Shell to retain containers across application attempts. Contributed by Jian He.
svn merge --ignore-ancestry -c 1557322 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557323 13f79535-47bb-0310-9956-ffa450edef68
2014-01-11 07:42:47 +00:00
Vinod Kumar Vavilapalli cb3d61bbe7 YARN-1041. Added the ApplicationMasterProtocol API for applications to use the ability in ResourceManager to optionally not kill containers when the ApplicationMaster exits. Contributed by Jian He.
svn merge --ignore-ancestry -c 1557318 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557319 13f79535-47bb-0310-9956-ffa450edef68
2014-01-11 07:08:06 +00:00
Jian He 0bdfb9f754 Merge r1557296 from trunk. YARN-1166. Fixed app-specific and attempt-specific QueueMetrics to be triggered by accordingly app event and attempt event. Contributed by Zhijie Shen
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557297 13f79535-47bb-0310-9956-ffa450edef68
2014-01-11 01:18:55 +00:00
Karthik Kambatla a7632fa9e2 YARN-1574. RMDispatcher should be reset on transition to standby. (Xuan Gong via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557249 13f79535-47bb-0310-9956-ffa450edef68
2014-01-10 20:20:01 +00:00
Karthik Kambatla aa9e5b5b1a YARN-1033. Expose RM active/standby state to Web UI and REST API (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557183 13f79535-47bb-0310-9956-ffa450edef68
2014-01-10 16:40:45 +00:00
Vinod Kumar Vavilapalli 76fc12eadf YARN-1490. Introduced the ability to make ResourceManager optionally not kill all containers when an ApplicationMaster exits. Contributed by Jian He.
svn merge --ignore-ancestry -c 1557143 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557144 13f79535-47bb-0310-9956-ffa450edef68
2014-01-10 15:05:18 +00:00
Karthik Kambatla 9619fc7740 YARN-1579. ActiveRMInfoProto fields should be optional (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557002 13f79535-47bb-0310-9956-ffa450edef68
2014-01-10 00:49:50 +00:00
Chris Nauroth cf3ac1a59e YARN-1138. Merging change r1556978 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556979 13f79535-47bb-0310-9956-ffa450edef68
2014-01-09 23:10:43 +00:00
Karthik Kambatla 72d69856d5 YARN-1568. Rename clusterid to clusterId in ActiveRMInfoProto (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556436 13f79535-47bb-0310-9956-ffa450edef68
2014-01-08 03:31:36 +00:00
Vinod Kumar Vavilapalli c15f25363b YARN-1482. Modified WebApplicationProxy to make it work across ResourceManager fail-over. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1556380 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556381 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 22:17:00 +00:00
Jian He 5c47b8d78a Merge r1556318 from trunk. YARN-1293. Fixed TestContainerLaunch#testInvalidEnvSyntaxDiagnostics failure caused by non-English system locale. Contributed by Tsuyoshi OZAWA.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556319 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 19:03:50 +00:00
Jason Darrell Lowe b8f59ebeaa svn merge -c 1556282 FIXES: YARN-1409. NonAggregatingLogHandler can throw RejectedExecutionException. Contributed by Tsuyoshi OZAWA
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556284 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 17:23:50 +00:00
Vinod Kumar Vavilapalli 9b38eb2c2e YARN-1029. Added embedded leader election in the ResourceManager. Contributed by Karthik Kambatla.
svn merge --ignore-ancestry -c 1556103 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556105 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 01:56:56 +00:00
Jian He 0d0ccfd7c1 Merge r1555975 from trunk. YARN-1560. Fixed TestYarnClient#testAMMRTokens failure with null AMRM token. (Contributed by Ted Yu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1555977 13f79535-47bb-0310-9956-ffa450edef68
2014-01-06 19:03:43 +00:00
Karthik Kambatla db2afa8bae YARN-1559. Race between ServerRMProxy and ClientRMProxy setting RMProxy#INSTANCE. (kasha and vinodkv via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1555971 13f79535-47bb-0310-9956-ffa450edef68
2014-01-06 18:43:09 +00:00
Vinod Kumar Vavilapalli 8e135fc73c YARN-1493. Changed ResourceManager and Scheduler interfacing to recognize app-attempts separately from apps. Contributed by Jian He.
svn merge --ignore-ancestry -c 1554896 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1554898 13f79535-47bb-0310-9956-ffa450edef68
2014-01-02 20:21:03 +00:00
Vinod Kumar Vavilapalli 48e255ff5d YARN-1549. Fixed a bug in ResourceManager's ApplicationMasterService that was causing unamanged AMs to not finish correctly. Contributed by haosdent.
svn merge --ignore-ancestry -c 1554886 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1554887 13f79535-47bb-0310-9956-ffa450edef68
2014-01-02 19:54:34 +00:00
Vinod Kumar Vavilapalli 5f698ffb57 YARN-1121. Addendum patch. Fixed AsyncDispatcher hang issue during stop due to a race condition caused by the previous patch. Contributed by Jian He.
svn merge --ignore-ancestry -c 1554344 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1554345 13f79535-47bb-0310-9956-ffa450edef68
2013-12-31 01:10:29 +00:00
Vinod Kumar Vavilapalli e81796015a YARN-1522. Fixed a race condition in the test TestApplicationCleanup that was causing it to randomly fail. Contributed by Liyin Liang.
svn merge --ignore-ancestry -c 1554328 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1554329 13f79535-47bb-0310-9956-ffa450edef68
2013-12-30 22:22:24 +00:00
Karthik Kambatla b81315077c YARN-1481. Reverting addendum patch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1553995 13f79535-47bb-0310-9956-ffa450edef68
2013-12-29 05:44:41 +00:00
Karthik Kambatla 875a0d55f8 YARN-1463. Tests should avoid starting http-server where possible or creates spnego keytab/principals (vinodkv via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1553792 13f79535-47bb-0310-9956-ffa450edef68
2013-12-28 06:58:50 +00:00
Vinod Kumar Vavilapalli ee20593b64 YARN-1541. Changed ResourceManager to invalidate ApplicationMaster host/port information once an AM crashes. Contributed by Jian He.
svn merge --ignore-ancestry -c 1553772 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1553773 13f79535-47bb-0310-9956-ffa450edef68
2013-12-28 01:10:02 +00:00
Karthik Kambatla 05ff546482 YARN-1481. Addendum patch to fix synchronization in AdminService
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1553741 13f79535-47bb-0310-9956-ffa450edef68
2013-12-27 21:11:12 +00:00
Karthik Kambatla b99dd5de74 YARN-1523. Use StandbyException instead of RMNotYetReadyException (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1553620 13f79535-47bb-0310-9956-ffa450edef68
2013-12-27 03:32:05 +00:00
Jian He 59df96e4e3 Merge r1553596 from trunk. Fixed yarn rmadmin command to print the correct usage info. Contributed by Akira AJISAKA.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1553597 13f79535-47bb-0310-9956-ffa450edef68
2013-12-26 22:15:41 +00:00
Karthik Kambatla 4d85f9a0ed YARN-1172. Convert SecretManagers in RM to services (Tsuyoshi OZAWA via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1553432 13f79535-47bb-0310-9956-ffa450edef68
2013-12-26 00:25:05 +00:00
Karthik Kambatla 2dc61dea3c YARN-1028. Addendum patch. Added FailoverProxyProvider capability to ResourceManager to help with RM failover.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1552921 13f79535-47bb-0310-9956-ffa450edef68
2013-12-21 16:30:06 +00:00
Jonathan Turner Eagles 5aad90b97d YARN-1180. Update capacity scheduler docs to include types on the configs (Chen He via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1552789 13f79535-47bb-0310-9956-ffa450edef68
2013-12-20 19:24:43 +00:00
Vinod Kumar Vavilapalli ba1286fec1 YARN-1307. Redesign znode structure for Zookeeper based RM state-store for better organization and scalability. Contributed by Tsuyoshi OZAWA.
svn merge --ignore-ancestry -c 1552209 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1552210 13f79535-47bb-0310-9956-ffa450edef68
2013-12-19 02:33:33 +00:00
Steve Loughran 9c2534506f HADOOP-9611 mvn-rpmbuild against google-guice > 3.0 yields missing cglib dependency
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551915 13f79535-47bb-0310-9956-ffa450edef68
2013-12-18 11:14:30 +00:00
Vinod Kumar Vavilapalli 237310d89a YARN-1028. Added FailoverProxyProvider capability to ResourceManager to help with RM failover. Contributed by Karthik Kambatla.
svn merge --ignore-ancestry -c 1551739 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551740 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 22:33:16 +00:00
Jing Zhao 88d09130e8 HDFS-5545. Merge change r1546151 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551703 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 20:59:27 +00:00
Vinod Kumar Vavilapalli 4aeef4181d YARN-1446. Changed client API to retry killing application till RM acknowledges so as to account for RM crashes/failover. Contributed by Jian He.
svn merge --ignore-ancestry -c 1551444 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551445 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 02:16:59 +00:00
Karthik Kambatla fb0bcec05b YARN-1451. TestResourceManager relies on the scheduler assigning multiple containers in a single node update. (Sandy Ryza via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551441 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 01:48:15 +00:00
Vinod Kumar Vavilapalli e3f9b1457e YARN-312. Introduced ResourceManagerAdministrationProtocol changes to support changing resources on node. Contributed by Junping Du.
svn merge --ignore-ancestry -c 1551403 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551404 13f79535-47bb-0310-9956-ffa450edef68
2013-12-16 23:38:25 +00:00
Vinod Kumar Vavilapalli f7f79f93ab YARN-1145. Fixed a potential file-handle leak in the web interface for displaying aggregated logs. Contributed by Rohith Sharma.
svn merge --ignore-ancestry -c 1551326 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551327 13f79535-47bb-0310-9956-ffa450edef68
2013-12-16 19:28:20 +00:00
Vinod Kumar Vavilapalli 38274ce9e0 YARN-1505. Fixed Webapplication proxy server to not hardcode its bind address. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1551314 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551315 13f79535-47bb-0310-9956-ffa450edef68
2013-12-16 19:10:17 +00:00
Zhijie Shen 17a4c75855 YARN-1435. Modified Distributed Shell to accept either the command or the custom script. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1550867 ../../trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550869 13f79535-47bb-0310-9956-ffa450edef68
2013-12-14 02:05:52 +00:00
Vinod Kumar Vavilapalli 690ae75385 YARN-1485. Modified RM HA configuration validation to also ensure that service-address configuration are configured for every RM. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1550854 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550855 13f79535-47bb-0310-9956-ffa450edef68
2013-12-13 23:55:31 +00:00
Jian He 2b3af36c65 Merge r1550613 and r1550615 from trunk to branch-2 to fix YARN-1311. Fixed app specific scheduler-events' names to be app-attempt based. Contributed by Vinod Kumar Vavilapalli
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550618 13f79535-47bb-0310-9956-ffa450edef68
2013-12-13 02:07:21 +00:00
Jian He f6a716bd50 Merge r1550594 from trunk to branch-2 to revert YARN-1311. Fixed app specific scheduler-events' names to be app-attempt based. Contributed by Vinod Kumar Vavilapalli
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550596 13f79535-47bb-0310-9956-ffa450edef68
2013-12-12 23:53:45 +00:00
Jian He abcacc1fc6 Merge r1550579 from trunk to branch-2 to fix YARN-1311. Fixed app specific scheduler-events' names to be app-attempt based. Contributed by Vinod Kumar Vavilapalli
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550584 13f79535-47bb-0310-9956-ffa450edef68
2013-12-12 23:14:03 +00:00
Vinod Kumar Vavilapalli 3033fad821 YARN-1325. Modified RM HA configuration validation to also ensure that multiple RMs are configured. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1550524 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550527 13f79535-47bb-0310-9956-ffa450edef68
2013-12-12 20:50:43 +00:00
Vinod Kumar Vavilapalli 05c923a455 YARN-408. Change CapacityScheduler to not disable delay-scheduling by default. Contributed by Mayank Bansal.
svn merge --ignore-ancestry -c 1550245 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550246 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 20:15:47 +00:00
Jonathan Turner Eagles dd09c71894 YARN-1491. Upgrade JUnit3 TestCase to JUnit 4 (Chen He via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550208 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 18:09:55 +00:00
Karthik Kambatla 4e5ba02d6b YARN-1481. Move internal services logic from AdminService to ResourceManager. (vinodkv via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550168 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 15:15:35 +00:00
Jonathan Turner Eagles b43308af0b MAPREDUCE-5052. Job History UI and web services confusing job start time and job submit time (Chen He via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1549903 13f79535-47bb-0310-9956-ffa450edef68
2013-12-10 17:28:45 +00:00
Sanford Ryza 53dc832641 YARN-1448. AM-RM protocol changes to support container resizing (Wangda Tan via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1549629 13f79535-47bb-0310-9956-ffa450edef68
2013-12-09 17:48:00 +00:00
Vinod Kumar Vavilapalli eeeca16747 YARN-1405. Fixed ResourceManager to not hang when init/start fails with an exception w.r.t state-store. Contributed by Jian He.
svn merge --ignore-ancestry -c 1548992 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548993 13f79535-47bb-0310-9956-ffa450edef68
2013-12-08 04:30:58 +00:00
Vinod Kumar Vavilapalli 82f1335e36 YARN-1378. Implemented a cleaner of old finished applications from the RM state-store. Contributed by Jian He.
svn merge --ignore-ancestry -c 1548990 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548991 13f79535-47bb-0310-9956-ffa450edef68
2013-12-08 04:19:16 +00:00
Sanford Ryza cee74196c2 YARN-807. When querying apps by queue, iterating over all apps is inefficient and limiting (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548985 13f79535-47bb-0310-9956-ffa450edef68
2013-12-08 03:14:43 +00:00
Vinod Kumar Vavilapalli fb14656ec7 YARN-1450. Fixed test failure in TestUnmanagedAMLauncher by removing its dependency on distributed-shell. Contributed by Binglin Chang.
svn merge --ignore-ancestry -c 1548619 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548622 13f79535-47bb-0310-9956-ffa450edef68
2013-12-06 17:54:46 +00:00
Sanford Ryza 339c11b406 YARN-546. Allow disabling the Fair Scheduler event log. (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548362 13f79535-47bb-0310-9956-ffa450edef68
2013-12-06 01:34:42 +00:00
Arun Murthy 2c217482e8 Merge -c 1548336 from trunk to branch-2 to fix YARN-1438. Ensure container diagnostics includes exception from container launch. Contributed by Steve Loughran.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548337 13f79535-47bb-0310-9956-ffa450edef68
2013-12-06 00:26:03 +00:00
Karthik Kambatla 2ed6ee6fe0 YARN-1181. Augment MiniYARNCluster to support HA mode (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548333 13f79535-47bb-0310-9956-ffa450edef68
2013-12-06 00:10:03 +00:00
Sanford Ryza 7505baf49f YARN-1447. Common PB type definitions for container resizing. (Wangda Tan via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548321 13f79535-47bb-0310-9956-ffa450edef68
2013-12-05 22:27:53 +00:00
Sanford Ryza 51d3c26b99 YARN-1403. Separate out configuration loading from QueueManager in the Fair Scheduler (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548007 13f79535-47bb-0310-9956-ffa450edef68
2013-12-05 03:30:17 +00:00
Vinod Kumar Vavilapalli 2e30ca92f3 YARN-1454. Fixed test failure issue with TestRMRestart. Contributed by Karthik Kambatla.
svn merge --ignore-ancestry -c 1547651 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547653 13f79535-47bb-0310-9956-ffa450edef68
2013-12-04 00:22:52 +00:00
Sanford Ryza cf465c26a8 YARN-1332. In TestAMRMClient, replace assertTrue with assertEquals where possible (Sebastian Wong via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547642 13f79535-47bb-0310-9956-ffa450edef68
2013-12-03 23:23:49 +00:00
Vinod Kumar Vavilapalli 45bfbbbabe YARN-895. Changed RM state-store to not crash immediately if RM restarts while the state-store is down. Contributed by Jian He.
svn merge --ignore-ancestry -c 1547538 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547539 13f79535-47bb-0310-9956-ffa450edef68
2013-12-03 19:28:42 +00:00
Vinod Kumar Vavilapalli 92cf368172 YARN-1318. Promoted AdminService to an Always-On service and merged it into RMHAProtocolService. Contributed by Karthik Kambatla.
svn merge --ignore-ancestry -c 1547212 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547214 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 22:19:43 +00:00
Arun Murthy 439a690ad1 Setting version to 2.4.0-SNAPSHOT in branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547165 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 19:40:42 +00:00
Arun Murthy f5dc7b0c6b Renamed releases. 2.2.1 -> 2.3.0 & 2.3.0 -> 2.4.0
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547140 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 18:43:55 +00:00
Sanford Ryza ce913ffd49 YARN-1241. In Fair Scheduler, maxRunningApps does not work for non-leaf queues. (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1546626 13f79535-47bb-0310-9956-ffa450edef68
2013-11-29 19:14:36 +00:00
Vinod Kumar Vavilapalli db027316e6 YARN-1239. Modified ResourceManager state-store implementations to start storing version numbers. Contributed by Jian He.
svn merge --ignore-ancestry -c 1546229 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1546230 13f79535-47bb-0310-9956-ffa450edef68
2013-11-27 23:23:01 +00:00
Vinod Kumar Vavilapalli c2ff57f804 YARN-1314. Fixed DistributedShell to not fail with multiple arguments for a shell command separated by spaces. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1545486 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1545487 13f79535-47bb-0310-9956-ffa450edef68
2013-11-26 01:10:51 +00:00
Vinod Kumar Vavilapalli 43d4537dcb YARN-1416. Fixed a few invalid transitions in RMApp, RMAppAttempt and in some tests. Contributed by Jian He.
svn merge --ignore-ancestry -c 1545448 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1545449 13f79535-47bb-0310-9956-ffa450edef68
2013-11-25 23:11:01 +00:00
Sanford Ryza c0bcf404d5 YARN-1423. Support queue placement by secondary group in the Fair Scheduler (Ted Malaska via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1545158 13f79535-47bb-0310-9956-ffa450edef68
2013-11-25 06:17:27 +00:00
Vinod Kumar Vavilapalli c282e06097 YARN-1320. Fixed Distributed Shell application to respect custom log4j properties file. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1544364 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544365 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 23:17:48 +00:00
Vinod Kumar Vavilapalli 83e907c32c YARN-1303. Reverted the wrong patch committed earlier and committing the correct patch now. In one go.
svn merge --ignore-ancestry -c 1544029 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544030 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 04:11:22 +00:00
Vinod Kumar Vavilapalli 8f5ec0f5f8 YARN-1303. Fixed DistributedShell to not fail with multiple commands separated by a semi-colon as shell-command. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1544023 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544024 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 03:47:27 +00:00
Bikas Saha eb97badbcd Merge r1543973 from trunk to branch-2 for YARN-1053. Diagnostic message from ContainerExitEvent is ignored in ContainerImpl (Omkar Vinit Joshi via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543974 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 22:29:16 +00:00
Bikas Saha 0bf221368f Merge r1543952 from trunk to branch-2 for YARN-1425. TestRMRestart fails because MockRM.waitForState(AttemptId) uses current attempt instead of the attempt passed as argument (Omkar Vinit Joshi via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543954 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 21:22:34 +00:00
Bikas Saha 49377f273e Merge r1543707 from trunk to branch-2 for YARN-744. Race condition in ApplicationMasterService.allocate .. It might process same allocate request twice resulting in additional containers getting allocated. (Omkar Vinit Joshi via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543709 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 05:22:40 +00:00
Sanford Ryza 20c176fe27 Move YARN-1407 under 2.2.1 in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543682 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 00:52:39 +00:00
Sanford Ryza da6d4dbc13 YARN-1407. RM Web UI and REST APIs should uniformly use YarnApplicationState (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543678 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 00:49:34 +00:00
Sanford Ryza b98b50b46c YARN-786: Addendum so that RMAppAttemptImpl#getApplicationResourceUsageReport won't return null
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543600 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 22:26:12 +00:00
Sanford Ryza 86fd96080d YARN-584. In scheduler web UIs, queues unexpand on refresh. (Harshit Daga via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543352 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 09:03:31 +00:00
Vinod Kumar Vavilapalli 0b57905309 YARN-674. Fixed ResourceManager to renew DelegationTokens on submission asynchronously to work around potential slowness in state-store. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1543312 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543313 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 05:21:45 +00:00
Vinod Kumar Vavilapalli 8613e7ef3d YARN-1210. Changed RM to start new app-attempts on RM restart only after ensuring that previous AM exited or after expiry time. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1543310 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543311 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 05:17:56 +00:00
Vinod Kumar Vavilapalli a70140e1ba YARN-709. Added tests to verify validity of delegation tokens and logging of appsummary after RM restart. Contributed by Jian He.
svn merge --ignore-ancestry -c 1543269 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543271 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 00:52:04 +00:00
Jason Darrell Lowe 40129be1fe svn merge -c 1543117 FIXES: YARN-1419. TestFifoScheduler.testAppAttemptMetrics fails intermittently under jdk7. Contributed by Jonathan Eagles
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543121 13f79535-47bb-0310-9956-ffa450edef68
2013-11-18 19:29:29 +00:00
Bikas Saha 0cab547b2d Merge r1542367 from trunk to branch-2 for YARN-1411. HA config shouldn't affect NodeManager RPC addresses (Karthik Kambatla via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1542380 13f79535-47bb-0310-9956-ffa450edef68
2013-11-15 19:48:12 +00:00
Sanford Ryza 516e657ac7 YARN-1392. Allow sophisticated app-to-queue placement policies in the Fair Scheduler (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1542108 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 22:20:38 +00:00
Sanford Ryza cfcb4a716f YARN-1401. With zero sleep-delay-before-sigkill.ms, no signal is ever sent (Gera Shegalov via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1542047 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 19:59:05 +00:00
Bikas Saha 63115de6fd Merging r1541995 from trunk to branch-2 for YARN-1222. Make improvements in ZKRMStateStore for fencing (Karthik Kambatla via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1542026 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 19:09:40 +00:00
Steve Loughran a7bfe3efe3 MAPREDUCE-6524 Move grizzly-test and junit dependencies to test scope
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541699 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 20:43:04 +00:00
Jonathan Turner Eagles 1884c3a0b9 YARN-1386. NodeManager mistakenly loses resources and relocalizes them (Jason Lowe via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541376 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 03:26:20 +00:00
Chris Nauroth 9b3b133edf YARN-1400. Merging change r1540938 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540940 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 03:59:33 +00:00
Sanford Ryza fd1dd57fc5 YARN-1387. RMWebServices should use ClientRMService for filtering applications (Karthik Kambatla via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540856 13f79535-47bb-0310-9956-ffa450edef68
2013-11-11 21:52:07 +00:00
Chris Nauroth 01808fa1b5 YARN-1395. Merging change r1540839 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540842 13f79535-47bb-0310-9956-ffa450edef68
2013-11-11 20:52:22 +00:00
Vinod Kumar Vavilapalli ec91e5da1b YARN-1121. Changed ResourceManager's state-store to drain all events on shut-down. Contributed by Jian He.
svn merge --ignore-ancestry -c 1540232 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540233 13f79535-47bb-0310-9956-ffa450edef68
2013-11-09 00:56:26 +00:00
Luke Lu 9b1122e0eb YARN-311. RM/scheduler support for dynamic resource configuration. (Junping Du via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539132 13f79535-47bb-0310-9956-ffa450edef68
2013-11-05 21:20:05 +00:00
Vinod Kumar Vavilapalli c8d2faab1b YARN-1374. Changed ResourceManager to start the preemption policy monitors as active services. Contributed by Karthik Kambatla.
svn merge --ignore-ancestry -c 1539089 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539090 13f79535-47bb-0310-9956-ffa450edef68
2013-11-05 18:26:07 +00:00
Sanford Ryza cc280ad063 YARN-1388. Fair Scheduler page always displays blank fair share (Liyin Liang via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538856 13f79535-47bb-0310-9956-ffa450edef68
2013-11-05 02:16:51 +00:00
Sanford Ryza 01876ec36b YARN-1323. Set HTTPS webapp address along with other RPC addresses in HAUtil (Karthik Kambatla via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538852 13f79535-47bb-0310-9956-ffa450edef68
2013-11-05 01:57:07 +00:00
Sanford Ryza ba85796267 YARN-786. Expose application resource usage in RM REST API (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537811 13f79535-47bb-0310-9956-ffa450edef68
2013-11-01 03:03:24 +00:00
Sanford Ryza 7ff13102d5 YARN-1290. Let continuous scheduling achieve more balanced task assignment (Wei Yan via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537735 13f79535-47bb-0310-9956-ffa450edef68
2013-10-31 22:07:09 +00:00
Sanford Ryza 3c0ad2500d YARN-1381. Same relaxLocality appears twice in exception message of AMRMClientImpl#checkLocalityRelaxationConflict() (Ted Yu via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537636 13f79535-47bb-0310-9956-ffa450edef68
2013-10-31 20:53:56 +00:00
Vinod Kumar Vavilapalli ad46e707f4 YARN-891. Modified ResourceManager state-store to remember completed applications so that clients can get information about them post RM-restart. Contributed by Jian He.
svn merge --ignore-ancestry -c 1537560 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537561 13f79535-47bb-0310-9956-ffa450edef68
2013-10-31 17:25:37 +00:00
Alejandro Abdelnur 5ac97bbe25 YARN-1343. NodeManagers additions/restarts are not reported as node updates in AllocateResponse responses to AMs. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537369 13f79535-47bb-0310-9956-ffa450edef68
2013-10-31 02:57:33 +00:00
Vinod Kumar Vavilapalli 924f0429b7 YARN-1321. Changed NMTokenCache to support both singleton and an instance usage. Contributed by Alejandro Abdelnur.
svn merge --ignore-ancestry -c 1537334 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537335 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 22:38:38 +00:00
Chris Nauroth bbda888b57 YARN-1358. Merging change r1537305 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537307 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 21:16:13 +00:00
Chris Nauroth f6bb3ce621 YARN-1357. Merging change r1537293 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537296 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 20:53:16 +00:00
Sanford Ryza 6902aea705 YARN-1306. Clean up hadoop-sls sample-conf according to YARN-1228 (Wei Yan via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536990 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 06:57:41 +00:00
Bikas Saha 330ada83eb Merge r1536888 from trunk to branch-2 for YARN-1068. Add admin support for HA operations (Karthik Kambatla via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536899 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 21:21:06 +00:00
Sanford Ryza 67365f3172 YARN-1109. Demote NodeManager "Sending out status for container" logs to debug (haosdent via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536574 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 00:57:03 +00:00
Chris Nauroth dc6d54e911 YARN-1349. Merging change r1536443 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536445 13f79535-47bb-0310-9956-ffa450edef68
2013-10-28 17:51:00 +00:00
Bikas Saha eab6a16ce6 Merge r1536248 from trunk to branch-2 for YARN-1022. Unnecessary INFO logs in AMRMClientAsync (haosdent via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536250 13f79535-47bb-0310-9956-ffa450edef68
2013-10-28 04:51:23 +00:00
Sanford Ryza 2301e3a163 YARN-1333. Support blacklisting in the Fair Scheduler (Tsuyoshi Ozawa via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535902 13f79535-47bb-0310-9956-ffa450edef68
2013-10-26 00:34:14 +00:00
Sanford Ryza 81d6bead1e YARN-1335. Move duplicate code from FSSchedulerApp and FiCaSchedulerApp into SchedulerApplication (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535583 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 23:17:45 +00:00
Jonathan Turner Eagles d93e30e3a2 HADOOP-9598. Improve code coverage of RMAdminCLI (Aleksey Gorshkov and Andrey Klochkov via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534906 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 04:15:16 +00:00
Bikas Saha 7f27c99a44 Merge r1534884 from trunk to branch-2 YARN-1305. RMHAProtocolService#serviceInit should handle HAUtil's IllegalArgumentException (Tsuyoshi Ozawa via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534887 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 01:16:05 +00:00
Sanford Ryza 6d2ef587d0 YARN-1330. Fair Scheduler: defaultQueueSchedulingPolicy does not take effect (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534862 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 23:58:15 +00:00
Jonathan Turner Eagles 2f8b662fc6 YARN-1183. MiniYARNCluster shutdown takes several minutes intermittently (Andrey Klochkov via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534806 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 21:37:03 +00:00
Sanford Ryza 0d445fe01f YARN-1315. TestQueueACLs should also test FairScheduler (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534510 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 06:33:11 +00:00
Chris Nauroth c534b8f0ba YARN-1331. Merging change r1534499 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534500 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 05:41:33 +00:00
Sanford Ryza 829fc289cf YARN-1288. Make Fair Scheduler ACLs more user friendly (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534316 13f79535-47bb-0310-9956-ffa450edef68
2013-10-21 18:46:14 +00:00
Sanford Ryza a822f68858 YARN-1258: Move to 2.2.1 in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534311 13f79535-47bb-0310-9956-ffa450edef68
2013-10-21 18:39:57 +00:00
Vinod Kumar Vavilapalli 06d24042b6 YARN-1185. Fixed FileSystemRMStateStore to not leave partial files that prevent subsequent ResourceManager recovery. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1533803 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533805 13f79535-47bb-0310-9956-ffa450edef68
2013-10-19 18:15:18 +00:00
Sanford Ryza 3b0a6e6edd YARN-1295. In UnixLocalWrapperScriptBuilder, using bash -c can cause Text file busy errors. (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532533 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 21:15:38 +00:00
Sanford Ryza b130cdbed0 YARN-1182. MiniYARNCluster creates and inits the RM/NM only on start() (Karthik Kambatla via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532113 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 21:49:55 +00:00
Sanford Ryza 59e7d9f5c2 YARN-1259. In Fair Scheduler web UI, queue num pending and num active apps switched. (Robert Kanter via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532096 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 21:07:55 +00:00
Chris Nauroth 4e4e958213 HADOOP-10040. Merging change r1531977 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531978 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 17:06:42 +00:00
Sanford Ryza 37d80b1629 YARN-305. Fair scheduler logs too many "Node offered to app" messages. (Lohit Vijayarenu via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531818 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 08:52:56 +00:00
Chris Nauroth 4f3386420c HADOOP-10040. Merging change r1531491 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531492 13f79535-47bb-0310-9956-ffa450edef68
2013-10-12 03:16:45 +00:00
Sanford Ryza ae42ecbc01 YARN-1044. used/min/max resources do not display info in the scheduler page (Sangjin Lee via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531449 13f79535-47bb-0310-9956-ffa450edef68
2013-10-11 22:17:24 +00:00
Sanford Ryza f3e4452e31 YARN-1300. SLS tests fail because conf puts YARN properties in fair-scheduler.xml (Ted Yu via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531427 13f79535-47bb-0310-9956-ffa450edef68
2013-10-11 21:28:41 +00:00
Sanford Ryza c6ea1d9cc9 Move YARN-1284 from 2.3 to 2.2.1 in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531424 13f79535-47bb-0310-9956-ffa450edef68
2013-10-11 21:24:00 +00:00
Luke Lu 6071dcb575 YARN-7. Support CPU resource for DistributedShell. (Junping Du via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531221 13f79535-47bb-0310-9956-ffa450edef68
2013-10-11 08:17:08 +00:00
Sanford Ryza 5c0382166f YARN-1265. Fair Scheduler chokes on unhealthy node reconnect (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531147 13f79535-47bb-0310-9956-ffa450edef68
2013-10-10 22:54:01 +00:00
Devarajulu K 989d6fffcd YARN-879. Fixed tests w.r.t o.a.h.y.server.resourcemanager.Application. Contributed by Junping Du.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530904 13f79535-47bb-0310-9956-ffa450edef68
2013-10-10 09:50:32 +00:00
Vinod Kumar Vavilapalli 82c4a9438d YARN-1283. Fixed RM to give a fully-qualified proxy URL for an application so that clients don't need to do scheme-mangling. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1530819 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530820 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 22:49:50 +00:00
Alejandro Abdelnur 5f2d5faa7f Amending yarn CHANGES.txt moving YARN-1284 to 2.2.1
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530715 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 17:10:29 +00:00
Daryn Sharp 2031005eeb HADOOP-9470. eliminate duplicate FQN tests in different Hadoop modules (Ivan A. Veselovsky via daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530671 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 15:10:43 +00:00
Sanford Ryza a909a261e6 YARN-1258. Allow configuring the Fair Scheduler root queue (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530543 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 09:21:23 +00:00
Sanford Ryza dc0ccacb53 Fix position of YARN-461 in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530506 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 06:49:48 +00:00
Sanford Ryza 5e602d10d9 YARN-976. Document the meaning of a virtual core. (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530501 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 05:57:08 +00:00
Sanford Ryza 86bacb6b43 Add missing file TestCgroupsLCEResourcesHandler for YARN-1284.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530495 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 05:12:26 +00:00
Sanford Ryza b57b4252bf YARN-1284. LCE: Race condition leaves dangling cgroups entries for killed containers. (Alejandro Abdelnur via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530494 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 05:08:17 +00:00
Arun Murthy c3dff760d9 Moving recent bug-fixes to hadoop-2.2.1.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530129 13f79535-47bb-0310-9956-ffa450edef68
2013-10-08 02:05:03 +00:00
Jason Darrell Lowe 6c2d04b409 svn merge -c 1530095 FIXES: YARN-465. fix coverage org.apache.hadoop.yarn.server.webproxy. Contributed by Aleksey Gorshkov and Andrey Klochkov
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530097 13f79535-47bb-0310-9956-ffa450edef68
2013-10-07 22:26:48 +00:00
Arun Murthy 3b514585f1 Preparing for hadoop-2.2.0 release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529752 13f79535-47bb-0310-9956-ffa450edef68
2013-10-07 05:32:18 +00:00
Vinod Kumar Vavilapalli 4b32d6ad9a YARN-1277. Added a policy based configuration for http/https in common HttpServer and using the same in YARN - related
to per project https config support via HADOOP-10022. Contributed by Suresh Srinivas and Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1529662 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529663 13f79535-47bb-0310-9956-ffa450edef68
2013-10-06 18:44:27 +00:00
Vinod Kumar Vavilapalli 763521305d YARN-1278. Fixed NodeManager to not delete local resources for apps on resync command from RM - a bug caused by YARN-1149. Contributed by Hitesh Shah.
svn merge --ignore-ancestry -c 1529657 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529658 13f79535-47bb-0310-9956-ffa450edef68
2013-10-06 18:33:37 +00:00
Vinod Kumar Vavilapalli 85bed752d5 YARN-1274. Fixed NodeManager's LinuxContainerExecutor to create user, app-dir and log-dirs correctly even when there are no resources to localize for the container. Contributed by Siddharth Seth.
svn merge --ignore-ancestry -c 1529555 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529556 13f79535-47bb-0310-9956-ffa450edef68
2013-10-06 00:15:51 +00:00
Arun Murthy f16e39ecb1 Merge -c 1529538 from trunk to branch-2 to fix YARN-1090. Fixed CS UI to better reflect applications as non-schedulable and not as pending. Contributed by Jian He.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529539 13f79535-47bb-0310-9956-ffa450edef68
2013-10-05 22:27:35 +00:00
Arun Murthy 3fa40ca807 Merge -c 1529534 from trunk to branch-2 to fix YARN-1032. Fixed NPE in RackResolver. Contributed by Lohit Vijayarenu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529535 13f79535-47bb-0310-9956-ffa450edef68
2013-10-05 22:21:22 +00:00
Sanford Ryza b5df25e3a8 YARN-1268. TestFairScheduler.testContinuousScheduling is flaky (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529533 13f79535-47bb-0310-9956-ffa450edef68
2013-10-05 22:12:24 +00:00
Vinod Kumar Vavilapalli 5c246b999c YARN-1273. Fixed Distributed-shell to account for containers that failed to start. Contributed by Hitesh Shah.
svn merge --ignore-ancestry -c 1529389 ../../trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529390 13f79535-47bb-0310-9956-ffa450edef68
2013-10-05 06:10:00 +00:00
Vinod Kumar Vavilapalli c91addb743 YARN-1271. Addendum patch to remove unused method in ContainerExecutor. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529386 13f79535-47bb-0310-9956-ffa450edef68
2013-10-05 05:14:05 +00:00
Vinod Kumar Vavilapalli ea3c2d28f7 YARN-1254. Fixed NodeManager to not pollute container's credentials. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1529382 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529383 13f79535-47bb-0310-9956-ffa450edef68
2013-10-05 04:26:37 +00:00
Vinod Kumar Vavilapalli c2cc6b6c4f YARN-1167. Fixed Distributed Shell to not incorrectly show empty hostname on RM UI. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1529376 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529377 13f79535-47bb-0310-9956-ffa450edef68
2013-10-05 01:44:46 +00:00
Hitesh Shah 5d0671027c Merge 1529369 from trunk to branch-2 for YARN-1251. TestDistributedShell#TestDSShell failed with timeout. Contributed by Xuan Gong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529370 13f79535-47bb-0310-9956-ffa450edef68
2013-10-05 00:48:56 +00:00
Alejandro Abdelnur 4de1616b82 YARN-1253. Changes to LinuxContainerExecutor to run containers as a single dedicated user in non-secure mode. (rvs via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529326 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 22:00:01 +00:00
Bikas Saha 449f3b9457 Merge r1529251 from trunk to branch-2 for YARN-1232. Configuration to support multiple RMs (Karthik Kambatla via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529285 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 20:37:47 +00:00
Chris Nauroth 453f066dd5 YARN-1219. Merging change r1529084 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529085 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 06:04:29 +00:00
Hitesh Shah 2cc1005b92 Merge 1529068 from trunk to branch-2 for YARN-1131. logs command should return an appropriate error message if YARN application is still running. Contributed by Siddharth Seth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529069 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 02:38:17 +00:00
Sanford Ryza c03521fd86 YARN-1271. Text file busy errors launching containers again (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529060 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 01:31:26 +00:00
Bikas Saha 7b2cd4b411 Merge r1529039 and r1529048 from trunk to branch-2 for YARN-1256. NM silently ignores non-existent service in StartContainerRequest (Xuan Gong via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529049 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 01:04:26 +00:00
Hitesh Shah 75aeb6070a Merge 1529043 from trunk to branch-2 for YARN-1149. NM throws InvalidStateTransitonException: Invalid event: APPLICATION_LOG_HANDLING_FINISHED at RUNNING. Contributed by Xuan Gong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529044 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 00:46:18 +00:00
Sanford Ryza 33b56c4866 YARN-1236. FairScheduler setting queue name in RMApp is not working. (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529035 13f79535-47bb-0310-9956-ffa450edef68
2013-10-03 23:32:38 +00:00
Vinod Kumar Vavilapalli afd459fc3b YARN-621. Changed YARN web app to not add paths that can cause duplicate additions of authenticated filters there by causing kerberos replay errors. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1529030 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529031 13f79535-47bb-0310-9956-ffa450edef68
2013-10-03 23:22:08 +00:00
Arun Murthy ee5313214c Merge -c 1529015 from trunk to branch-2 to fix YARN-890. Ensure CapacityScheduler doesn't round-up metric for available resources. Contributed by Xuan Gong & Hitesh Shah.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529018 13f79535-47bb-0310-9956-ffa450edef68
2013-10-03 21:55:17 +00:00
Jonathan Turner Eagles 8a93fa55b6 YARN-1199. Make NM/RM Versions Available (Mit Desai via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529008 13f79535-47bb-0310-9956-ffa450edef68
2013-10-03 21:18:18 +00:00
Jonathan Turner Eagles 562af72497 Revert YARN-677. Increase coverage to FairScheduler (Vadim Bondarev and Dennis Y via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528915 13f79535-47bb-0310-9956-ffa450edef68
2013-10-03 15:54:09 +00:00
Sanford Ryza 25d3c021d2 YARN-1213. Restore config to ban submitting to undeclared pools in the Fair Scheduler. (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528697 13f79535-47bb-0310-9956-ffa450edef68
2013-10-03 01:21:47 +00:00
Sanford Ryza 9ba48807df YARN-876. Node resource is added twice when node comes back from unhealthy. (Peng Zhang via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528661 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 22:35:37 +00:00
Jonathan Turner Eagles ffe45a5129 YARN-425. coverage fix for yarn api (Aleksey Gorshkov via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528644 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 21:57:00 +00:00
Bikas Saha 7b09794cd7 Merge r1528632 from trunk to branch-2 for YARN-1141. Updating resource requests should be decoupled with updating blacklist (Zhijie Shen via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528640 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 21:50:20 +00:00
Jonathan Turner Eagles f0979ca9fa YARN-677. Increase coverage to FairScheduler (Vadim Bondarev and Dennis Y via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528528 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 15:52:22 +00:00
Vinod Kumar Vavilapalli 69b6d8458e YARN-1260. Added webapp.http.address to yarn-default.xml so that default install with https enabled doesn't have broken link on NM UI. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1528312 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528313 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 06:31:53 +00:00
Sanford Ryza 2c329793c6 YARN-1262. TestApplicationCleanup relies on all containers assigned in a single heartbeat (Karthik Kambatla via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528249 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 22:46:41 +00:00
Chris Nauroth 90abcc481a YARN-1215. Merging change r1528239 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528240 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 22:38:49 +00:00
Chris Nauroth f5951d2695 YARN-1215. Merging change r1528233 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528234 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 22:33:23 +00:00
Sanford Ryza d8ade0804d YARN-1228. Clean up Fair Scheduler configuration loading. (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528203 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 20:16:30 +00:00
Sanford Ryza 01ecec1cd2 YARN-1010. FairScheduler: decouple container scheduling from nodemanager heartbeats. (Wei Yan via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528195 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 19:57:40 +00:00
Vinod Kumar Vavilapalli 80dd306450 YARN-1070. Fixed race conditions in NodeManager during container-kill. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1527827 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527828 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 00:18:42 +00:00
Alejandro Abdelnur 15ee08ef6c YARN-1247. test-container-executor has gotten out of sync with the changes to container-executor. (rvs via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527814 13f79535-47bb-0310-9956-ffa450edef68
2013-09-30 22:55:51 +00:00
Sanford Ryza 099c4eef3f YARN-1221. With Fair Scheduler, reserved MB reported in RM web UI increases indefinitely (Siqi Li via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527795 13f79535-47bb-0310-9956-ffa450edef68
2013-09-30 22:03:06 +00:00