5addc7d50e
Merge r1604949 from trunk. YARN-2191. Added a new test to ensure NM will clean up completed applications in the case of RM restart. Contributed by Wangda Tan
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604950 13f79535-47bb-0310-9956-ffa450edef68
2014-06-23 22:54:15 +00:00
e79f3f194b
YARN-2187. FairScheduler: Disable max-AM-share check by default. (Robert Kanter via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604322 13f79535-47bb-0310-9956-ffa450edef68
2014-06-21 07:33:04 +00:00
0873304b90
svn merge -c 160639 FIXES: YARN-2167. LeveldbIterator should get closed in NMLeveldbStateStoreService#loadLocalizationState() within finally block. Contributed by Junping Du
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603040 13f79535-47bb-0310-9956-ffa450edef68
2014-06-17 02:14:29 +00:00
771e157b66
Merge r1603036 from trunk: YARN-1339. Recover DeletionService state upon nodemanager restart. (Contributed by Jason Lowe)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603037 13f79535-47bb-0310-9956-ffa450edef68
2014-06-17 01:10:49 +00:00
d79919f175
Merge r1603028 from trunk. YARN-1885. Fixed a bug that RM may not send application-clean-up signal to NMs where the completed applications previously ran in case of RM restart. Contributed by Wangda Tan
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603030 13f79535-47bb-0310-9956-ffa450edef68
2014-06-17 00:02:57 +00:00
ce88f5d63a
YARN-2159. Better logging in SchedulerNode#allocateContainer. (Ray Chiang via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603011 13f79535-47bb-0310-9956-ffa450edef68
2014-06-16 22:18:40 +00:00
3278b6cc39
Preparing to release hadoop-2.4.1.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602887 13f79535-47bb-0310-9956-ffa450edef68
2014-06-16 15:11:14 +00:00
a7b760eae8
YARN-1702. Added kill app functionality to RM web services. Contributed by Varun Vasudev.
...
svn merge --ignore-ancestry -c 1602298 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602300 13f79535-47bb-0310-9956-ffa450edef68
2014-06-12 21:33:03 +00:00
c43ab7f08e
YARN-2155. FairScheduler: Incorrect threshold check for preemption. (Wei Yan via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602297 13f79535-47bb-0310-9956-ffa450edef68
2014-06-12 21:26:39 +00:00
48520b43ff
YARN-2075. Fixed the test failure of TestRMAdminCLI. Contributed by Kenji Kikushima.
...
svn merge --ignore-ancestry -c 1602071https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602073 13f79535-47bb-0310-9956-ffa450edef68
2014-06-12 06:48:49 +00:00
fe66a3b00b
Merge 1602043 from trunk to branch-2 for YARN-2148. TestNMClient failed due more exit code values added and passed to AM (Wangda Tan via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602045 13f79535-47bb-0310-9956-ffa450edef68
2014-06-11 22:49:19 +00:00
279c5a3752
Merge r1601980 from trunk. YARN-2125. Changed ProportionalCapacityPreemptionPolicy to log CSV in debug level. Contributed by Wangda Tan
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601981 13f79535-47bb-0310-9956-ffa450edef68
2014-06-11 18:32:48 +00:00
e4f775755c
Merge r1601964 from trunk. YARN-2124. Fixed NPE in ProportionalCapacityPreemptionPolicy. Contributed by Wangda Tan
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601965 13f79535-47bb-0310-9956-ffa450edef68
2014-06-11 17:31:35 +00:00
dc5ee5ff7c
Merge 1601762 from trunk to branch-2 for YARN-2091. Add more values to ContainerExitStatus and pass it from NM to RM and then to app masters (Tsuyoshi OZAWA via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601763 13f79535-47bb-0310-9956-ffa450edef68
2014-06-10 20:13:23 +00:00
d4d1ccc992
YARN-1424. RMAppAttemptImpl should return the DummyApplicationResourceUsageReport for all invalid accesses. (Ray Chiang via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601745 13f79535-47bb-0310-9956-ffa450edef68
2014-06-10 19:06:32 +00:00
8be4504d9a
Merge r1601537 from trunk. YARN-2030. Augmented RMStateStore with state machine. Contributed by Binglin Chang
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601539 13f79535-47bb-0310-9956-ffa450edef68
2014-06-10 01:02:19 +00:00
e6a03e2fc0
Merge r1601491 from trunk. YARN-2030. Augmented RMStateStore with state machine. Contributed by Binglin Chang
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601492 13f79535-47bb-0310-9956-ffa450edef68
2014-06-09 19:46:48 +00:00
319e422733
YARN-1368. Added core functionality of recovering container state into schedulers after ResourceManager Restart so as to preserve running work in the cluster. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1601303 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601304 13f79535-47bb-0310-9956-ffa450edef68
2014-06-09 03:10:06 +00:00
d5379b29a2
YARN-2132. ZKRMStateStore.ZKAction#runWithRetries doesn't log the exception it encounters. (Vamsee Yarlagadda via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601066 13f79535-47bb-0310-9956-ffa450edef68
2014-06-07 06:13:22 +00:00
cd031015cd
YARN-2128. FairScheduler: Incorrect calculation of amResource usage. (Wei Yan via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601051 13f79535-47bb-0310-9956-ffa450edef68
2014-06-07 01:23:23 +00:00
233ca3e2a5
YARN-2122. In AllocationFileLoaderService, the reloadThread should be created in init() and started in start(). (Robert Kanter via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601046 13f79535-47bb-0310-9956-ffa450edef68
2014-06-07 00:51:50 +00:00
3cc1cddffb
YARN-2121. Fixed NPE handling in Timeline Server's TimelineAuthenticator. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1601000 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601001 13f79535-47bb-0310-9956-ffa450edef68
2014-06-06 20:33:10 +00:00
683d4bdbd9
YARN-2117. Fixed the issue that secret file reader is potentially not closed in TimelineAuthenticationFilterInitializer. Contributed by Chen He.
...
svn merge --ignore-ancestry -c 1600994 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1600995 13f79535-47bb-0310-9956-ffa450edef68
2014-06-06 20:10:14 +00:00
32a71b6f34
YARN-2118. Fixed the type mismatch in Map#containsKey check of TimelineWebServices#injectOwnerInfo. Contributed by Ted Yu.
...
svn merge --ignore-ancestry -c 1600967 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1600969 13f79535-47bb-0310-9956-ffa450edef68
2014-06-06 17:49:48 +00:00
3438bf531d
Merge r1600644 from trunk: YARN-1977. Add tests on getApplicationRequest with filtering start time range. (Contributed by Junping Du)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1600648 13f79535-47bb-0310-9956-ffa450edef68
2014-06-05 13:24:22 +00:00
fa57c0f5b8
YARN-2061. Revisit logging levels in ZKRMStateStore. (Ray Chiang via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1600514 13f79535-47bb-0310-9956-ffa450edef68
2014-06-04 21:40:37 +00:00
33439defa1
YARN-2119. DEFAULT_PROXY_ADDRESS should use DEFAULT_PROXY_PORT. (Anubhav Dhoot via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1600487 13f79535-47bb-0310-9956-ffa450edef68
2014-06-04 20:18:49 +00:00
f9c5c308e4
YARN-1913. With Fair Scheduler, cluster can logjam when all resources are consumed by AMs (Wei Yan via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599401 13f79535-47bb-0310-9956-ffa450edef68
2014-06-03 00:58:09 +00:00
a84fd44ee4
YARN-1877. Updated CHANGES.txt to fix the JIRA number. It was previously committed as YARN-2010.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599349 13f79535-47bb-0310-9956-ffa450edef68
2014-06-02 20:28:50 +00:00
4159721e0a
YARN-1550. NPE in FairSchedulerAppsBlock#render. (Anubhav Dhoot via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599346 13f79535-47bb-0310-9956-ffa450edef68
2014-06-02 20:24:58 +00:00
2b98e9cfd9
Merge r1599115 from trunk: YARN-2103. Inconsistency between viaProto flag and initial value of SerializedExceptionProto.Builder (Contributed by Binglin Chang)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599121 13f79535-47bb-0310-9956-ffa450edef68
2014-06-02 08:27:08 +00:00
cb3dbb4880
YARN-1474. Make sechedulers services. (Tsuyoshi Ozawa via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599025 13f79535-47bb-0310-9956-ffa450edef68
2014-06-01 19:11:23 +00:00
a73447fa07
YARN-2115. Replaced RegisterNodeManagerRequest's ContainerStatus with a new NMContainerStatus which has more information that is needed for work-preserving RM-restart. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1598790 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598791 13f79535-47bb-0310-9956-ffa450edef68
2014-05-31 00:21:47 +00:00
2a5f932bdb
YARN-1868. Merging change r1598686 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598690 13f79535-47bb-0310-9956-ffa450edef68
2014-05-30 18:18:18 +00:00
9f76296358
Merge r1598640 from trunk: YARN-1338. Recover localized resource cache state upon nodemanager restart (Contributed by Jason Lowe)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598652 13f79535-47bb-0310-9956-ffa450edef68
2014-05-30 16:09:36 +00:00
49f6a1d7a6
YARN-2010. Document yarn.resourcemanager.zk-auth and its scope. (Robert Kanter via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598637 13f79535-47bb-0310-9956-ffa450edef68
2014-05-30 15:32:53 +00:00
4c4ebe2353
YARN-2054. Better defaults for YARN ZK configs for retries and retry-inteval when HA is enabled. (kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598632 13f79535-47bb-0310-9956-ffa450edef68
2014-05-30 15:25:27 +00:00
d1b7433a62
HADOOP-9968 and HADOOP-10448. Merging r1570934 and 1598396 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598440 13f79535-47bb-0310-9956-ffa450edef68
2014-05-29 23:38:07 +00:00
0071e48d21
YARN-2112. Fixed yarn-common's pom.xml to include jackson dependencies so that both Timeline Server and client can access them. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1598373 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598374 13f79535-47bb-0310-9956-ffa450edef68
2014-05-29 19:07:16 +00:00
7895ecccac
HADOOP-10602. Merging change r1598337 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598338 13f79535-47bb-0310-9956-ffa450edef68
2014-05-29 17:33:10 +00:00
ed77c8925d
YARN-596. Use scheduling policies throughout the queue hierarchy to decide which containers to preempt (Wei Yan via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598198 13f79535-47bb-0310-9956-ffa450edef68
2014-05-29 04:03:04 +00:00
57c01b1bda
YARN-2107. Refactored timeline classes into o.a.h.y.s.timeline package. Contributed by Vinod Kumar Vavilapalli.
...
svn merge --ignore-ancestry -c 1598094 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598095 13f79535-47bb-0310-9956-ffa450edef68
2014-05-28 18:11:45 +00:00
15e4e7dc94
YARN-2105. Fix TestFairScheduler after YARN-2012. (Ashwin Shankar via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1597903 13f79535-47bb-0310-9956-ffa450edef68
2014-05-27 23:46:45 +00:00
2994e2ac96
YARN-2071. Modified levelDB store permissions to be readable only by the server user. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1597231 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1597232 13f79535-47bb-0310-9956-ffa450edef68
2014-05-24 01:25:04 +00:00
c605487979
YARN-2096. Race in TestRMRestart#testQueueMetricsOnRMRestart. (Anubhav Dhoot via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1597225 13f79535-47bb-0310-9956-ffa450edef68
2014-05-23 23:51:52 +00:00
87bc454e86
YARN-2073. Fair Scheduler: Add a utilization threshold to prevent preempting resources when cluster is free (Karthik Kambatla via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1597210 13f79535-47bb-0310-9956-ffa450edef68
2014-05-23 22:53:17 +00:00
1f47d35523
YARN-2059. Added admin ACLs support to Timeline Server. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1597207 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1597208 13f79535-47bb-0310-9956-ffa450edef68
2014-05-23 22:41:24 +00:00
98c6a60864
YARN-2012. Fair Scheduler: allow default queue placement rule to take an arbitrary queue (Ashwin Shankar via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1597205 13f79535-47bb-0310-9956-ffa450edef68
2014-05-23 22:39:41 +00:00
0296d3fff1
YARN-1937. Added owner-only ACLs support for Timeline Client and server. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1597186 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1597188 13f79535-47bb-0310-9956-ffa450edef68
2014-05-23 21:20:07 +00:00
65a5e2cc46
YARN-1936. Added security support for the Timeline Client. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1597153 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1597154 13f79535-47bb-0310-9956-ffa450edef68
2014-05-23 18:49:21 +00:00
18457f8ed0
YARN-2049. Added delegation-token support for the Timeline Server. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1597130 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1597131 13f79535-47bb-0310-9956-ffa450edef68
2014-05-23 17:10:22 +00:00
f1af79db71
YARN-2089. FairScheduler: QueuePlacementPolicy and QueuePlacementRule are missing audience annotations. (Zhihai Xu via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596766 13f79535-47bb-0310-9956-ffa450edef68
2014-05-22 06:14:00 +00:00
38b14291e9
YARN-2017. Merged some of the common scheduler code. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1596753 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596754 13f79535-47bb-0310-9956-ffa450edef68
2014-05-22 05:33:00 +00:00
e4f164245a
YARN-2081. Fixed TestDistributedShell failure after YARN-1962. Contributed by Zhiguo Hong.
...
svn merge --ignore-ancestry -c 1596724 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596725 13f79535-47bb-0310-9956-ffa450edef68
2014-05-22 01:19:00 +00:00
e3fae25785
YARN-1938. Added kerberos login for the Timeline Server. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1596710 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596711 13f79535-47bb-0310-9956-ffa450edef68
2014-05-21 23:20:40 +00:00
dfd4a7398b
svn merge -c 1596310 FIXES: YARN-2050. Fix LogCLIHelpers to create the correct FileContext. Contributed by Ming Ma
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596311 13f79535-47bb-0310-9956-ffa450edef68
2014-05-20 16:21:30 +00:00
644743599c
Merge r1595413 from trunk: Wrong field is referenced in GetApplicationsRequestPBImpl#mergeLocalToBuilder (Contributed by Hong Zhiguo)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595416 13f79535-47bb-0310-9956-ffa450edef68
2014-05-17 01:50:15 +00:00
2125caaa2f
MAPREDUCE 5874. Creating MapReduce REST API section. Contributed by Tsuyoshi Ozawa
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595268 13f79535-47bb-0310-9956-ffa450edef68
2014-05-16 17:11:01 +00:00
0e30502841
Merge r1595126 from trunk. Relocate entry in CHANGES.txt
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595128 13f79535-47bb-0310-9956-ffa450edef68
2014-05-16 07:12:09 +00:00
f442377539
Merge r1595116 from trunk. YARN-2053. Fixed a bug in AMS to not add null NMToken into NMTokens list from previous attempts for work-preserving AM restart. Contributed by Wangda Tan
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595117 13f79535-47bb-0310-9956-ffa450edef68
2014-05-16 06:24:10 +00:00
25118a97d8
YARN-2042. String shouldn't be compared using == in QueuePlacementRule#NestedUserQueue#getQueueForApp (Chen He via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594486 13f79535-47bb-0310-9956-ffa450edef68
2014-05-14 06:56:00 +00:00
6fcfde13f3
YARN-1986. In Fifo Scheduler, node heartbeat in between creating app and attempt causes NPE (Hong Zhiguo via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594478 13f79535-47bb-0310-9956-ffa450edef68
2014-05-14 06:44:52 +00:00
ffb0d24fef
Merge r1594421 from trunk: YARN-1362. Distinguish between nodemanager shutdown for decommission vs shutdown for restart. (Contributed by Jason Lowe
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594422 13f79535-47bb-0310-9956-ffa450edef68
2014-05-14 00:25:08 +00:00
2d932cb8aa
YARN-1957. Consider the max capacity of the queue when computing the ideal
...
capacity for preemption. Contributed by Carlo Curino
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594415 13f79535-47bb-0310-9956-ffa450edef68
2014-05-13 23:15:41 +00:00
a943350eb9
YARN-1981. Nodemanager version is not updated when a node reconnects (Jason Lowe via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594361 13f79535-47bb-0310-9956-ffa450edef68
2014-05-13 20:08:18 +00:00
155e816bc2
YARN-1861. Fixed a bug in RM to reset leader-election on fencing that was causing both RMs to be stuck in standby mode when automatic failover is enabled. Contributed by Karthik Kambatla and Xuan Gong.
...
svn merge --ignore-ancestry -c 1594356 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594357 13f79535-47bb-0310-9956-ffa450edef68
2014-05-13 20:03:52 +00:00
890cd33bf7
svn merge -c 1594326 FIXES: MAPREDUCE-5814. fat jar with *-default.xml may fail when mapreduce.job.classloader=true. Contributed by Gera Shegalov
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594328 13f79535-47bb-0310-9956-ffa450edef68
2014-05-13 18:59:56 +00:00
e463efc4cb
svn merge -c 1594275 FIXES: YARN-1751. Improve MiniYarnCluster for log aggregation testing. Contributed by Ming Ma
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594276 13f79535-47bb-0310-9956-ffa450edef68
2014-05-13 16:44:58 +00:00
77dc706480
Merge r1594123 from trunk. YARN-1976. Fix CHANGES.txt for YARN-1976.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594124 13f79535-47bb-0310-9956-ffa450edef68
2014-05-13 04:50:49 +00:00
634485191e
Merge r1594085 from trunk. YARN-2016. Fix a bug in GetApplicationsRequestPBImpl to add the missed fields to proto. Contributed by Junping Du
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594086 13f79535-47bb-0310-9956-ffa450edef68
2014-05-12 20:48:23 +00:00
d2314c583d
Merge r1593874 from trunk. YARN-1975. Fix yarn application CLI to print the scheme of the tracking url of failed/killed applications. Contributed by Junping Du
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593875 13f79535-47bb-0310-9956-ffa450edef68
2014-05-12 00:45:43 +00:00
62497eb64f
Merge r1593804 from trunk: YARN-2011. Fix typo and warning in TestLeafQueue (Contributed by Chen He)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593805 13f79535-47bb-0310-9956-ffa450edef68
2014-05-11 15:16:32 +00:00
884ff10d48
YARN-1987. Wrapper for leveldb DBIterator to aid in handling database exceptions. (Jason Lowe via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593758 13f79535-47bb-0310-9956-ffa450edef68
2014-05-11 06:20:00 +00:00
a098b692f4
YARN-1962. Changed Timeline Service client configuration to be off by default given the non-readiness of the feature yet. Contributed by Mohammad Kamrul Islam.
...
svn merge --ignore-ancestry -c 1593750 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593751 13f79535-47bb-0310-9956-ffa450edef68
2014-05-11 00:15:48 +00:00
914c871296
YARN-1982. Renamed the daemon name to be TimelineServer instead of History Server and deprecated the old usage. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1593748 ../../trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593749 13f79535-47bb-0310-9956-ffa450edef68
2014-05-11 00:05:31 +00:00
4b27c6882a
Merge r1593660 from trunk: YARN-766. TestNodeManagerShutdown in branch-2 should use Shell to form the output path and a format issue in trunk. (Contributed by Siddharth Seth)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593661 13f79535-47bb-0310-9956-ffa450edef68
2014-05-10 03:47:43 +00:00
29a124d09d
YARN-2036. Document yarn.resourcemanager.hostname in ClusterSetup (Ray Chiang via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593632 13f79535-47bb-0310-9956-ffa450edef68
2014-05-09 22:19:14 +00:00
cf42886750
YARN-1701. Improved default paths of the timeline store and the generic history store. Contributed by Tsuyoshi Ozawa.
...
svn merge --ignore-ancestry -c 1593481 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593484 13f79535-47bb-0310-9956-ffa450edef68
2014-05-09 04:26:36 +00:00
4518a0db27
YARN-1864. Fair Scheduler Dynamic Hierarchical User Queues (Ashwin Shankar via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593192 13f79535-47bb-0310-9956-ffa450edef68
2014-05-08 07:23:19 +00:00
c03108299b
YARN-2018: Merging r1592783 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592784 13f79535-47bb-0310-9956-ffa450edef68
2014-05-06 15:47:01 +00:00
ffb4fc03c2
Merge r1592197 from trunk: YARN-1201. TestAMAuthorization fails with local hostname cannot be resolved. (Wangda Tan via junping_du)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592198 13f79535-47bb-0310-9956-ffa450edef68
2014-05-03 13:06:32 +00:00
0a914b61e0
YARN-1696. Added documentation for ResourceManager fail-over. Contributed by Karthik Kambatla, Masatake Iwasaki, Tsuyoshi OZAWA.
...
svn merge --ignore-ancestry -c 1591416 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591417 13f79535-47bb-0310-9956-ffa450edef68
2014-04-30 18:01:05 +00:00
4c1f66d7fa
YARN-1929. Fixed a deadlock in ResourceManager that occurs when failover happens right at the time of shutdown. Contributed by Karthik Kambatla.
...
svn merge --ignore-ancestry -c 1591071 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591072 13f79535-47bb-0310-9956-ffa450edef68
2014-04-29 19:50:17 +00:00
413d84fabb
svn merge -c 1591030 FIXES: YARN-738. TestClientRMTokens is failing irregularly while running all yarn tests. Contributed by Ming Ma
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591031 13f79535-47bb-0310-9956-ffa450edef68
2014-04-29 17:49:09 +00:00
44d9ee78e9
YARN-483. Improve documentation on log aggregation in yarn-default.xml (Akira Ajisaka via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1590151 13f79535-47bb-0310-9956-ffa450edef68
2014-04-25 21:14:25 +00:00
fa6c972283
HADOOP-10535. Merge r1589905 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589906 13f79535-47bb-0310-9956-ffa450edef68
2014-04-24 23:05:25 +00:00
fa9fea80e2
svn merge -c 1589859 FIXES: YARN-1975. Used resources shows escaped html in CapacityScheduler and FairScheduler page. Contributed by Mit Desai
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589860 13f79535-47bb-0310-9956-ffa450edef68
2014-04-24 20:06:44 +00:00
de1f0bf3e4
YARN-1970. Merging change r1589001 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589004 13f79535-47bb-0310-9956-ffa450edef68
2014-04-21 23:39:16 +00:00
2fb649a668
YARN-1865 Merging change r1588693 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588696 13f79535-47bb-0310-9956-ffa450edef68
2014-04-19 19:00:42 +00:00
1b0ed842d0
svn merge -c 1588572 FIXES: YARN-1932. Javascript injection on the job status page. Contributed by Mit Desai
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588573 13f79535-47bb-0310-9956-ffa450edef68
2014-04-18 21:46:14 +00:00
ccec38b801
svn merge -c 1588546 FIXES: YARN-1940. deleteAsUser() terminates early without deleting more files on error. Contributed by Rushabh S Shah
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588549 13f79535-47bb-0310-9956-ffa450edef68
2014-04-18 19:36:18 +00:00
1aad26034b
YARN-1281. Fixed TestZKRMStateStoreZKClientConnections to not fail intermittently due to ZK-client timeouts. Contributed by Tsuyoshi Ozawa.
...
svn merge --ignore-ancestry -c 1588369 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588371 13f79535-47bb-0310-9956-ffa450edef68
2014-04-17 20:58:23 +00:00
e39ce638b6
Merge r1588365 from trunk: YARN-1947. TestRMDelegationTokens#testRMDTMasterKeyStateOnRollingMasterKey is failing intermittently. (Jian He via junping_du)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588367 13f79535-47bb-0310-9956-ffa450edef68
2014-04-17 20:30:30 +00:00
8c23c3295a
Merge r1588343 from trunk: YARN-1750. TestNodeStatusUpdater#testNMRegistration is incorrect in test case. (Wangda Tan via junping_du)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588347 13f79535-47bb-0310-9956-ffa450edef68
2014-04-17 19:13:17 +00:00
d0db2c2b78
Merge r1588324 from trunk: YARN-1870. FileInputStream is not closed in ProcfsBasedProcessTree#constructProcessSMAPInfo. (Fengdong Yu via junping_du)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588328 13f79535-47bb-0310-9956-ffa450edef68
2014-04-17 18:09:32 +00:00
bbabbe5ccb
Merge 1588281 to branch-2. YARN-1931. Private API change in YARN-1824 in 2.4 broke compatibility with previous releases (Sandy Ryza via tgraves)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588283 13f79535-47bb-0310-9956-ffa450edef68
2014-04-17 15:25:27 +00:00
838602d23a
Merge r1587776 from trunk. YARN-1934. Fixed a potential NPE in ZKRMStateStore caused by handling Disconnected event from ZK. Contributed by Karthik Kambatla
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587778 13f79535-47bb-0310-9956-ffa450edef68
2014-04-16 02:03:54 +00:00
7c7d00d779
YARN-1892. Improved some logs in the scheduler. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1587717 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587718 13f79535-47bb-0310-9956-ffa450edef68
2014-04-15 20:40:53 +00:00
1134ccdb0d
YARN-1928. Fixed a race condition in TestAMRMRPCNodeUpdates which caused it to fail occassionally. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1587114 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587115 13f79535-47bb-0310-9956-ffa450edef68
2014-04-13 22:40:43 +00:00
2595a27092
YARN-1933. Fixed test issues with TestAMRestart and TestNodeHealthService. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1587104 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587105 13f79535-47bb-0310-9956-ffa450edef68
2014-04-13 21:52:09 +00:00
755e8c684c
YARN-1923. Make Fair Scheduler resource ratio calculations terminate faster (Anubhav Dhoot via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586795 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 23:23:33 +00:00
0f6040a27b
YARN-1833. Relocating CHANGES.txt entry in trunk and branch-2 to the right location.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586769 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 20:28:27 +00:00
dcabf5ceeb
YARN-1907. Merged into branch-2.4 also.
...
svn merge --ignore-ancestry -c 1585992 ../../trunk/ onto branch-2.4.
Fixed CHANGES.txt entries too.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586767 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 20:23:09 +00:00
757a2e8249
YARN-1883. Merged into branch-2.4 also.
...
svn merge --ignore-ancestry -c 1582862 ../../trunk/ onto branch-2.4.
Fixed CHANGES.txt entries too.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586766 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 20:16:10 +00:00
fbc9db6954
HADOOP-8826. Docs still refer to 0.20.205 as stable line (Mit Desai via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586687 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 15:38:06 +00:00
799774859d
YARN-1926. Changed DistributedShell to use appIDs as unique identifiers for HDFS paths and thus avoid test failures on Windows. Contributed by Varun Vasudev.
...
svn merge --ignore-ancestry -c 1586562 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586564 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 04:07:11 +00:00
befba101f3
YARN-1924. Made ZKRMStateStore updateApplication(Attempt)StateInternal work when Application(Attempt) state hasn't been stored before. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1586547 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586548 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 03:38:27 +00:00
9df6ddd282
Merge r1586522 from trunk. YARN-1903. Set exit code and diagnostics when container is killed at NEW/LOCALIZING state. Contributed by Zhijie Shen
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586523 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 01:28:22 +00:00
51a39fdbb9
YARN-1914. Fixed resource-download on NodeManagers to skip permission verification of public cache files in Windows+local file-system environment. Contribued by Varun Vasudev.
...
svn merge --ignore-ancestry -c 1586434 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586435 13f79535-47bb-0310-9956-ffa450edef68
2014-04-10 19:28:56 +00:00
874b4979d0
YARN-1920. Fixed TestFileSystemApplicationHistoryStore failure on windows. Contributed by Vinod Kumar Vavilapalli.
...
svn merge --ignore-ancestry -c 1586414 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586420 13f79535-47bb-0310-9956-ffa450edef68
2014-04-10 18:59:44 +00:00
614faccf1d
YARN-1910. Fixed a race condition in TestAMRMTokens that causes the test to fail more often on Windows. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1586192 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586193 13f79535-47bb-0310-9956-ffa450edef68
2014-04-10 01:37:22 +00:00
f10bf59e6e
svn merge -c 1585992 merging from trunk to branch-2 to fix:YARN-1907. TestRMApplicationHistoryWriter#testRMWritingMassiveHistory intermittently fails. Contributed by Mit Desai.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585993 13f79535-47bb-0310-9956-ffa450edef68
2014-04-09 15:35:13 +00:00
770aef5053
HADOOP-10104. Update jackson to 1.9.13 (Akira Ajisaka via stevel)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585933 13f79535-47bb-0310-9956-ffa450edef68
2014-04-09 11:11:31 +00:00
fa3c632fb2
YARN-1784. TestContainerAllocation assumes CapacityScheduler. (Robert Kanter via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585895 13f79535-47bb-0310-9956-ffa450edef68
2014-04-09 05:55:11 +00:00
ade0ff5b06
YARN-1908. Fixed DistributedShell to not fail in secure clusters. Contributed by Vinod Kumar Vavilapalli and Jian He.
...
svn merge --ignore-ancestry -c 1585849 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585850 13f79535-47bb-0310-9956-ffa450edef68
2014-04-08 22:12:17 +00:00
a2cdf208dd
YARN-1757. NM Recovery. Auxiliary service support. (Jason Lowe via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585784 13f79535-47bb-0310-9956-ffa450edef68
2014-04-08 17:17:59 +00:00
48ad73577b
YARN-1905. Merging change r1585376 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585378 13f79535-47bb-0310-9956-ffa450edef68
2014-04-07 03:08:54 +00:00
243bb224a2
Merge -c 1584954 from trunk to branch-2 to fix YARN-1898. Addendum patch to ensure /jmx and /metrics are re-directed to Active RM.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1584955 13f79535-47bb-0310-9956-ffa450edef68
2014-04-05 02:52:35 +00:00
85c733feee
Merge r1584862 from trunk. YARN-1837. Fixed TestMoveApplication#testMoveRejectedByScheduler failure. Contributed by Hong Zhiguo
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1584863 13f79535-47bb-0310-9956-ffa450edef68
2014-04-04 18:43:59 +00:00
d5f1c9a044
YARN-1898. Made Standby RM links conf, stacks, logLevel, metrics, jmx, logs and static not be redirected to Active RM. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1583833 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583835 13f79535-47bb-0310-9956-ffa450edef68
2014-04-02 00:05:15 +00:00
06d62b1982
YARN-1889. In Fair Scheduler, avoid creating objects on each call to AppSchedulable comparator (Hong Zhiguo via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583494 13f79535-47bb-0310-9956-ffa450edef68
2014-03-31 23:53:58 +00:00
21a1744039
Preparing for hadoop-2.4.0 release.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583246 13f79535-47bb-0310-9956-ffa450edef68
2014-03-31 07:39:04 +00:00
39871241a0
Merge r1583203 from trunk. YARN-1893. Mark AtMostOnce annotation to ApplicationMasterProtocol#allocate. Contributed by Xuan Gong
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583205 13f79535-47bb-0310-9956-ffa450edef68
2014-03-30 21:38:27 +00:00
ce4d860308
Merge r1582913 from trunk. YARN-1017. Added documentation for ResourceManager Restart.(jianhe)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582917 13f79535-47bb-0310-9956-ffa450edef68
2014-03-28 23:41:44 +00:00
0ed1651028
YARN-1891. Added documentation for NodeManager health-monitoring. Contributed by Varun Vasudev.
...
svn merge --ignore-ancestry -c 1582891 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582893 13f79535-47bb-0310-9956-ffa450edef68
2014-03-28 21:54:52 +00:00
a467e88ae4
YARN-1883. TestRMAdminService fails due to inconsistent entries in UserGroups (Mit Desai via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582865 13f79535-47bb-0310-9956-ffa450edef68
2014-03-28 19:45:05 +00:00
a6c405b99f
svn merge -c 1582856 from trunk for HDFS-6168. Remove a deprecated constructor and the deprecated methods reportChecksumFailure, getDelegationToken(Text), renewDelegationToken and cancelDelegationToken from DistributedFileSystem.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582857 13f79535-47bb-0310-9956-ffa450edef68
2014-03-28 18:36:20 +00:00
40c110c530
YARN-1873. Fixed TestDistributedShell failure when the test cases are out of order. Contributed by Mit Desai.
...
svn merge --ignore-ancestry -c 1582060https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582062 13f79535-47bb-0310-9956-ffa450edef68
2014-03-26 21:20:23 +00:00
859f27040d
Merge r1581678 from trunk. YARN-1521. Mark Idempotent/AtMostOnce annotations to the APIs in ApplicationClientProtcol, ResourceManagerAdministrationProtocol and ResourceTrackerProtocol so that they work in HA scenario. Contributed by Xuan Gong
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581679 13f79535-47bb-0310-9956-ffa450edef68
2014-03-26 03:48:46 +00:00
7bd77e23d7
YARN-1867. Fixed a bug in ResourceManager that was causing invalid ACL checks in the web-services after fail-over. Contributed by Vinod Kumar Vavilapalli.
...
svn merge --ignore-ancestry -c 1581662 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581664 13f79535-47bb-0310-9956-ffa450edef68
2014-03-26 03:04:02 +00:00
4c91a402f5
YARN-1452. Added documentation about the configuration and usage of generic application history and the timeline data service. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1581656 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581657 13f79535-47bb-0310-9956-ffa450edef68
2014-03-26 02:54:00 +00:00
dd8a9bbadf
YARN-1866. Fixed an issue with renewal of RM-delegation tokens on restart or fail-over. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1581448 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581450 13f79535-47bb-0310-9956-ffa450edef68
2014-03-25 18:22:59 +00:00
45d6277ec2
YARN-1850. Introduced the ability to optionally disable sending out timeline-events in the TimelineClient. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1581189 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581190 13f79535-47bb-0310-9956-ffa450edef68
2014-03-25 02:23:08 +00:00
cb9fcd7f03
Merge r1580997 from trunk. YARN-1852. Fixed RMAppAttempt to not resend AttemptFailed/AttemptKilled events to already recovered Failed/Killed RMApps. Contributed by Rohith Sharmaks
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581001 13f79535-47bb-0310-9956-ffa450edef68
2014-03-24 19:06:50 +00:00
c2d8ab6085
YARN-1670. aggregated log writer can write more log data then it says is the log length (Mit Desai via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580963 13f79535-47bb-0310-9956-ffa450edef68
2014-03-24 18:17:02 +00:00
5f0f16c0f6
YARN-1838. Enhanced timeline service getEntities API to get entities from a given entity ID or insertion timestamp. Contributed by Billie Rinaldi.
...
svn merge --ignore-ancestry -c 1580960 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580961 13f79535-47bb-0310-9956-ffa450edef68
2014-03-24 18:16:27 +00:00
b78c43d421
Relocate wrongly place entries in YARNs's CHANGES.txt (vinodkv)
...
svn merge --ignore-ancestry -c 1580400 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580401 13f79535-47bb-0310-9956-ffa450edef68
2014-03-23 01:09:24 +00:00
ebd254117d
YARN-1577. Made UnmanagedAMLauncher do launchAM after the attempt reaches the LAUNCHED state. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1580164 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580165 13f79535-47bb-0310-9956-ffa450edef68
2014-03-22 04:37:46 +00:00
21b5ec140a
Merge r1580154 from trunk. YARN-1776. Fixed DelegationToken renewal to survive RM failover. Contributed by Zhijie Shen
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580156 13f79535-47bb-0310-9956-ffa450edef68
2014-03-22 04:14:42 +00:00
1bb24f2c18
YARN-1536. Cleanup: Get rid of ResourceManager#get*SecretManager() methods and use the RMContext methods instead. (Anubhav Dhoot via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580129 13f79535-47bb-0310-9956-ffa450edef68
2014-03-22 02:38:23 +00:00
8f3f0caee1
YARN-1854. Fixed test failure in TestRMHA#testStartAndTransitions. Contributed by Rohith Sharma KS.
...
svn merge --ignore-ancestry -c 1580097 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580098 13f79535-47bb-0310-9956-ffa450edef68
2014-03-22 00:30:11 +00:00
b51df9d67d
YARN-1863. Fixed test failure in TestRMFailover after YARN-1859. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1580094 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580095 13f79535-47bb-0310-9956-ffa450edef68
2014-03-22 00:25:51 +00:00
08a194fb55
YARN-1775. Enhanced ProcfsBasedProcessTree to optionally add the ability to use smaps for obtaining used memory information. Contributed by Rajesh Balamohan.
...
svn merge --ignore-ancestry -c 1580087 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580088 13f79535-47bb-0310-9956-ffa450edef68
2014-03-22 00:02:26 +00:00
b701a84d37
Merge r1580077 from trunk. YARN-1849. Fixed NPE in ResourceTrackerService#registerNodeManager for UAM. Contributed by Karthik Kambatla
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580078 13f79535-47bb-0310-9956-ffa450edef68
2014-03-21 22:57:09 +00:00
d1f2d89a43
YARN-1670. Fixed a bug in log-aggregation that can cause the writer to write more log-data than the log-length that it records. Contributed by Mit Desai.
...
svn merge --ignore-ancestry -c 1580005 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580006 13f79535-47bb-0310-9956-ffa450edef68
2014-03-21 18:36:25 +00:00
e1bda693dd
YARN-1811. Fixed AMFilters in YARN to correctly accept requests from either web-app proxy or the RMs when HA is enabled. Contributed by Robert Kanter.
...
svn merge --ignore-ancestry -c 1579877 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579878 13f79535-47bb-0310-9956-ffa450edef68
2014-03-21 04:21:14 +00:00
c7b39f75ba
YARN-1859. Fixed WebAppProxyServlet to correctly handle applications absent on the ResourceManager. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1579866 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579867 13f79535-47bb-0310-9956-ffa450edef68
2014-03-21 02:03:41 +00:00
2f8d99f642
YARN-1855. Made Application-history server to be optional in MiniYARNCluster and thus avoid the failure of TestRMFailover#testRMWebAppRedirect. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1579838 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579839 13f79535-47bb-0310-9956-ffa450edef68
2014-03-21 00:18:56 +00:00
1bd3b792dd
YARN-1570. Fixed formatting of the lines in YarnCommands.apt.vm docs source. Contributed by Akira Ajisaka.
...
svn merge --ignore-ancestry -c 1579797 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579798 13f79535-47bb-0310-9956-ffa450edef68
2014-03-20 22:14:39 +00:00
6aa3081681
HDFS-6131. Move HDFSHighAvailabilityWithNFS.apt.vm and HDFSHighAvailabilityWithQJM.apt.vm from Yarn to HDFS. Contributed by Jing Zhao.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579736 13f79535-47bb-0310-9956-ffa450edef68
2014-03-20 21:03:42 +00:00
af6b5b8e9a
YARN-1640. Fixed manual failover of ResourceManagers to work correctly in secure clusters. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1579510 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579511 13f79535-47bb-0310-9956-ffa450edef68
2014-03-20 02:40:54 +00:00
e39ccf3b24
YARN-1690. Made DistributedShell send timeline entities+events. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1579123 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579124 13f79535-47bb-0310-9956-ffa450edef68
2014-03-19 03:51:27 +00:00
d33b320214
YARN-1705. Reset cluster-metrics on transition to standby. (Rohith via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579015 13f79535-47bb-0310-9956-ffa450edef68
2014-03-18 19:03:24 +00:00
de68e1d6de
YARN-1846. TestRM#testNMTokenSentForNormalContainer assumes CapacityScheduler. (Robert Kanter via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578767 13f79535-47bb-0310-9956-ffa450edef68
2014-03-18 07:00:29 +00:00
0c6db6af6e
YARN-1512. Enhanced CapacityScheduler to be able to decouple scheduling from node-heartbeats. Contributed by Arun C Murthy.
...
svn merge --ignore-ancestry -c 1578722 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578724 13f79535-47bb-0310-9956-ffa450edef68
2014-03-18 02:53:50 +00:00
80f3726024
YARN-1839. Fixed handling of NMTokens in ResourceManager such that containers launched by AMs running on the same machine as the AM are correctly propagated. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1578631 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578632 13f79535-47bb-0310-9956-ffa450edef68
2014-03-17 22:22:58 +00:00
597c7d054f
YARN-1591. Fixed AsyncDispatcher to handle interrupts on shutdown in a sane manner and thus fix failure of TestResourceTrackerService. Contributed by Tsuyoshi Ozawa.
...
svn merge --ignore-ancestry -c 1578628 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578629 13f79535-47bb-0310-9956-ffa450edef68
2014-03-17 22:18:09 +00:00
69835b9651
Merge r1578614 from trunk. Fixed AM container log to show on NM web page after application finishes if log-aggregation is disabled. Contributed by Rohith Sharmaks
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578618 13f79535-47bb-0310-9956-ffa450edef68
2014-03-17 21:52:41 +00:00
6aae750762
YARN-1685. Fixed few bugs related to handling of containers' log-URLs on ResourceManager and history-service. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1578602 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578603 13f79535-47bb-0310-9956-ffa450edef68
2014-03-17 21:36:51 +00:00
8e38068076
YARN-1136. Replace junit.framework.Assert with org.junit.Assert (Chen He via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578546 13f79535-47bb-0310-9956-ffa450edef68
2014-03-17 20:20:22 +00:00
ed83fe61e2
Merge r1578486 from trunk. YARN-1830. Fixed TestRMRestart#testQueueMetricsOnRMRestart failure due to race condition when app is submitted. Contributed by Zhijie Shen
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578487 13f79535-47bb-0310-9956-ffa450edef68
2014-03-17 18:06:17 +00:00
92db0d3558
YARN-1845. Elapsed time for failed tasks that never started is wrong (Rushabh S Shah via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578460 13f79535-47bb-0310-9956-ffa450edef68
2014-03-17 16:56:43 +00:00
d470c7b71a
YARN-1824. Improved NodeManager and clients to be able to handle cross platform application submissions. Contributed by Jian He.
...
MAPREDUCE-4052. Improved MapReduce clients to use NodeManagers' ability to handle cross platform application submissions. Contributed by Jian He.
svn merge --ignore-ancestry -c 1578135 ../../trunk/ with a couple of minor edits for working in branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578139 13f79535-47bb-0310-9956-ffa450edef68
2014-03-16 19:13:16 +00:00
a49f818a75
YARN-1520. update capacity scheduler docs to include necessary parameters (Chen He via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577779 13f79535-47bb-0310-9956-ffa450edef68
2014-03-15 04:11:39 +00:00
b3b33de0d2
YARN-1833. TestRMAdminService Fails in trunk and branch-2 (Mit Desais via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577743 13f79535-47bb-0310-9956-ffa450edef68
2014-03-14 22:15:02 +00:00
f1947fcb28
YARN-1717. Enabled periodically discarding old data in LeveldbTimelineStore. Contributed by Billie Rinaldi.
...
svn merge --ignore-ancestry -c 1577693 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577695 13f79535-47bb-0310-9956-ffa450edef68
2014-03-14 20:37:10 +00:00
3ac3e5f897
YARN-1658. Modified web-app framework to let standby RMs redirect web-service calls to the active RM. Contributed by Cindy Li.
...
svn merge --ignore-ancestry -c 1577408 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577409 13f79535-47bb-0310-9956-ffa450edef68
2014-03-14 02:40:28 +00:00
9695bc7af6
YARN-1771. Reduce the number of NameNode operations during localization of
...
public resources using a cache. Contributed by Sangjin Lee
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577392 13f79535-47bb-0310-9956-ffa450edef68
2014-03-14 00:31:08 +00:00
7834c7f193
YARN-1389. Made ApplicationClientProtocol and ApplicationHistoryProtocol expose analogous getApplication(s)/Attempt(s)/Container(s) APIs. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1577052 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577053 13f79535-47bb-0310-9956-ffa450edef68
2014-03-13 07:45:30 +00:00
16669efeea
svn merge -c 1576960 FIXES: YARN-1789. ApplicationSummary does not escape newlines in the app name. Contributed by Tsuyoshi OZAWA
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576962 13f79535-47bb-0310-9956-ffa450edef68
2014-03-12 22:27:01 +00:00
eac9b53bd8
YARN-1816. Fixed ResourceManager to get RMApp correctly handle ATTEMPT_FINISHED event at ACCEPTED state that can happen after RM restarts. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1576911 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576913 13f79535-47bb-0310-9956-ffa450edef68
2014-03-12 21:19:22 +00:00
15744c614b
YARN-1812. Fixed ResourceManager to synchrously renew tokens after recovery and thus recover app itself synchronously and avoid races with resyncing NodeManagers. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1576843 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576844 13f79535-47bb-0310-9956-ffa450edef68
2014-03-12 18:26:53 +00:00
8c4578e894
Merge -c 1576751 from trunk to branch-2 to fix YARN-1444. Fix CapacityScheduler to deal with cases where applications specify host/rack requests without off-switch request. Contributed by Wangda Tan.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576752 13f79535-47bb-0310-9956-ffa450edef68
2014-03-12 14:37:27 +00:00
d5120ccc6b
YARN-1800. Fixed NodeManager to gracefully handle RejectedExecutionException in the public-localizer thread-pool. Contributed by Varun Vasudev.
...
svn merge --ignore-ancestry -c 1576545 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576546 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 23:34:20 +00:00
6f4d705a63
YARN-1821. NPE on registerNodeManager if the request has containers for UnmanagedAMs (kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576527 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 22:19:30 +00:00
cbe653f9a2
YARN-1764. Modified YarnClient to correctly handle failover of ResourceManager after the submitApplication call goes through. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1576160 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576162 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 00:52:33 +00:00
8a3978b18a
YARN-1788. Fixed a bug in ResourceManager to set the apps-completed and apps-killed metrics correctly for killed applications. Contributed by Varun Vasudev.
...
svn merge --ignore-ancestry -c 1576072 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576073 13f79535-47bb-0310-9956-ffa450edef68
2014-03-10 20:37:09 +00:00
8d6fb7e920
Merge r1576023 from trunk. Fixed ClientRMService#forceKillApplication not killing unmanaged application. Contributed by Karthik Kambatla
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576026 13f79535-47bb-0310-9956-ffa450edef68
2014-03-10 18:03:47 +00:00
d220391721
YARN-1790. Fair Scheduler UI not showing apps table (bc Wong via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575488 13f79535-47bb-0310-9956-ffa450edef68
2014-03-08 05:13:04 +00:00
fca260d0db
YARN-1787. Fixed help messages for applicationattempt and container sub-commands in bin/yarn. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1575482 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575483 13f79535-47bb-0310-9956-ffa450edef68
2014-03-08 04:50:20 +00:00
71a8953ae9
YARN-1410. Added tests to validate that clients can fail-over to a new RM
...
after getting an application-ID but before submission and can still submit
to the newly active RM with no issues. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1575478 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575479 13f79535-47bb-0310-9956-ffa450edef68
2014-03-08 04:44:02 +00:00
2fbec50fed
YARN-1781. Modified NodeManagers to allow admins to specify max disk utilization for local disks so as to be able to offline full disks. Contributed by Varun Vasudev.
...
svn merge --ignore-ancestry -c 1575463 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575464 13f79535-47bb-0310-9956-ffa450edef68
2014-03-08 00:52:32 +00:00
78f1a475c8
YARN-1783. Fixed a bug in NodeManager's status-updater that was losing completed container statuses when NodeManager is forced to resync by the ResourceManager. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1575437 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575438 13f79535-47bb-0310-9956-ffa450edef68
2014-03-07 22:37:12 +00:00
f3a95ed841
YARN-1774. FS: Submitting to non-leaf queue throws NPE. (Anubhav Dhoot and Karthik Kambatla via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575417 13f79535-47bb-0310-9956-ffa450edef68
2014-03-07 21:34:51 +00:00
09671ddb46
YARN-1525. Web UI should redirect to active RM when HA is enabled. (Cindy Li via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575167 13f79535-47bb-0310-9956-ffa450edef68
2014-03-07 04:35:01 +00:00
f70da813f0
YARN-1780. Improved logging in the Timeline client and server. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1575141 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575145 13f79535-47bb-0310-9956-ffa450edef68
2014-03-07 03:53:31 +00:00
94ac5ba669
Merge r1574716 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574717 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 23:12:22 +00:00
4bdb4a9b16
YARN-1761. Modified RMAdmin CLI to check whether HA is enabled or not before it executes any of the HA admin related commands. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1574661 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574662 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 21:08:20 +00:00
296ad40766
Merge r1574623 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574625 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 19:09:01 +00:00
a2e3fab710
YARN-1785. FairScheduler treats app lookup failures as ERRORs. (bc Wong via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574605 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 18:23:24 +00:00
b5e010ca0d
YARN-1768. Fixed error message being too verbose when killing a non-existent application. Contributed by Tsuyoshi Ozawa
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574403 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 09:45:28 +00:00
75f0ecee01
YARN-1766. Fixed a bug in ResourceManager to use configuration loaded from the configuration-provider when booting up. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1574252 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574253 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 23:35:51 +00:00
7c17cff55c
YARN-986. Changed client side to be able to figure out the right RM Delegation token for the right ResourceManager when HA is enabled. Contributed by Karthik Kambatla.
...
svn merge --ignore-ancestry -c 1574190 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574191 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 20:39:33 +00:00
f2d48add16
YARN-1730. Implemented simple write-locking in the LevelDB based timeline-store. Contributed by Billie Rinaldi.
...
svn merge --ignore-ancestry -c 1574145 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574146 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 17:34:01 +00:00
289be46e09
YARN-1729. Made TimelineWebServices deserialize the string primary- and secondary-filters param into the JSON-compatible object. Contributed by Billie Rinaldi.
...
svn merge --ignore-ancestry -c 1573825 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573826 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 00:23:23 +00:00
ecb6019688
YARN-1748. Excluded core-site.xml from hadoop-yarn-server-tests package's jar and thus avoid breaking downstream tests. Contributed by Sravya Tirukkovalur.
...
svn merge --ignore-ancestry -c 1573795 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573796 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 23:09:31 +00:00
595121a601
YARN-1765. Added test cases to verify that killApplication API works across ResourceManager failover. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1573735 ../../trunk/
svn merge --ignore-ancestry -c 1573736 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573737 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 20:39:34 +00:00
5ea4206137
YARN-1704. Modified LICENSE and NOTICE files to reflect newly used levelDB related libraries. Contributed by Billie Rinaldi.
...
svn merge --ignore-ancestry -c 1573702 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573704 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 19:53:53 +00:00
dd0942a90d
YARN-1758. Fixed ResourceManager to not mandate the presence of site specific configuration files and thus fix failures in downstream tests. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1573695 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573697 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 19:42:24 +00:00
d85cce539d
YARN-1760. Addendum patch. TestRMAdminService assumes Capacity Scheduler.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573135 13f79535-47bb-0310-9956-ffa450edef68
2014-03-01 08:47:02 +00:00
Jian He
Karthik Kambatla
Jason Darrell Lowe
Junping Du
Arun Murthy
Vinod Kumar Vavilapalli
Zhijie Shen
Bikas Saha
Sanford Ryza
Chris Nauroth
Arpit Agarwal
Ravi Prakash
Christopher Douglas
Jonathan Turner Eagles
Jing Zhao
Ivan Mitic
Thomas Graves
Kihwal Lee
Steve Loughran
Tsz-wo Sze
Haohui Mai