805 Commits

Author SHA1 Message Date
Vinod Kumar Vavilapalli
514bfeafd9 YARN-1779. Fixed AMRMClient to handle AMRMTokens correctly across ResourceManager work-preserving-restart or failover. Contributed by Jian He.
(cherry picked from commit a3d9934f916471a845dc679449d08f94dead550d)
2014-09-18 10:17:24 -07:00
Jian He
3746b1e905 YARN-2558. Updated ContainerTokenIdentifier#read/write to use ContainerId#getContainerId. Contributed by Tsuyoshi OZAWA.
(cherry picked from commit f4886111aa573ec928de69e8ca9328d480bf673e)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
2014-09-17 15:22:02 -07:00
Vinod Kumar Vavilapalli
9d34dc87e1 YARN-2531. Added a configuration for admins to be able to override app-configs and enforce/not-enforce strict control of per-container cpu usage. Contributed by Varun Vasudev.
(cherry picked from commit 9f6891d9ef7064d121305ca783eb62586c8aa018)
2014-09-16 10:15:37 -07:00
Vinod Kumar Vavilapalli
5cdb24d4b1 YARN-611. Added an API to let apps specify an interval beyond which AM failures should be ignored towards counting max-attempts. Contributed by Xuan Gong.
(cherry picked from commit 14e2639fd0d53f7e0b58f2f4744af44983d4e867)
2014-09-13 18:05:02 -07:00
Jian He
f21a5236e5 YARN-2229. Changed the integer field of ContainerId to be long type. Contributed by Tsuyoshi OZAWA
(cherry picked from commit 3122daa80261b466e309e88d88d1e2c030525e3f)

Conflicts:
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/preemption/CheckpointAMPreemptionPolicy.java
2014-09-12 10:45:42 -07:00
junping_du
efa9ab3638 YARN-2033. Merging generic-history into the Timeline Store (Contributed by Zhijie Shen)
(cherry picked from commit 6b8b1608e64e300e4e1d23c60476febaca29ca38)
2014-09-12 10:08:06 +08:00
Vinod Kumar Vavilapalli
a2a61eec6d YARN-2440. Enabled Nodemanagers to limit the aggregate cpu usage across all containers to a preconfigured limit. Contributed by Varun Vasudev.
(cherry picked from commit 4be95175cdb58ff12a27ab443d609d3b46da7bfa)
2014-09-10 19:24:14 -07:00
Jian He
ceae7be6b2 YARN-415. Capture aggregate memory allocation at the app-level for chargeback. Contributed by Eric Payne & Andrey Klochkov
(cherry picked from commit 83be3ad44484bf8a24cb90de4b9c26ab59d226a8)
2014-09-10 18:22:07 -07:00
Vinod Kumar Vavilapalli
b4b59ef749 YARN-2448. Changed ApplicationMasterProtocol to expose RM-recognized resource types to the AMs. Contributed by Varun Vasudev.
(cherry picked from commit b67d5ba7842cc10695d987f217027848a5a8c3d8)
2014-09-10 10:17:30 -07:00
Jian He
c17810a84c YARN-2515. Updated ConverterUtils#toContainerId to parse epoch. Contributed by Tsuyoshi OZAWA
(cherry picked from commit 0974f434c47ffbf4b77a8478937fd99106c8ddbd)
2014-09-07 18:31:07 -07:00
cnauroth
af1d389157 YARN-2519. Credential Provider related unit tests failed on Windows. Contributed by Xiaoyu Yao.
(cherry picked from commit cbea1b10efd871d04c648af18449dc724685db74)
2014-09-06 20:06:44 -07:00
Jian He
38853c97c2 YARN-1506. Changed RMNode/SchedulerNode to update resource with event notification. Contributed by Junping Du
(cherry picked from commit 5c14bc426b4be381383018ebc2236be83eef15cd)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
2014-08-29 23:39:58 -07:00
Jian He
5c63482aaa YARN-2182. Updated ContainerId#toString() to append RM Epoch number. Contributed by Tsuyoshi OZAWA
(cherry-picked from commit e2d0ff364a84a4de10e7b11fe83cd3dab155a571)
2014-08-27 10:11:24 -07:00
Jason Darrell Lowe
23b4c0b6c1 HADOOP-10893. isolated classloader on the client side. Contributed by Sangjin Lee
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619605 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 21:41:24 +00:00
Allen Wittenauer
5d965f2f3c YARN-2424. LCE should support non-cgroups, non-secure mode (Chris Douglas via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619424 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 14:57:53 +00:00
Jason Darrell Lowe
8991c7d1b2 svn merge -c 1619176 FIXES: YARN-2034. Description for yarn.nodemanager.localizer.cache.target-size-mb is incorrect. Contributed by Chen He
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619178 13f79535-47bb-0310-9956-ffa450edef68
2014-08-20 17:40:55 +00:00
Jian He
146d00eb0f Merge r1619160 from trunk. YARN-2174. Enable HTTPs for the writer REST API of TimelineServer. Contributed by Zhijie Shen
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619162 13f79535-47bb-0310-9956-ffa450edef68
2014-08-20 17:07:12 +00:00
Allen Wittenauer
b07e476da7 YARN-1918. Typo in description and error message for yarn.resourcemanager.cluster-id (Anandha L Ranganathan via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618072 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 21:54:02 +00:00
Jian He
ebf92e44f9 Merge r1617555 from trunk. YARN-2373. Changed WebAppUtils to use Configuration#getPassword for accessing SSL passwords. Contributed by Larry McCay
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617557 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 18:30:57 +00:00
Xuan Gong
4365c4530b YARN-2212 ApplicationMaster needs to find a way to update the AMRMToken periodically. Contributed by Xuan Gong
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616891 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 21:37:35 +00:00
Jian He
06a0772d62 Merge r1616580 from trunk. YARN-2008. Fixed CapacityScheduler to calculate headroom based on max available capacity instead of configured max capacity. Contributed by Craig Welch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616581 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 20:01:14 +00:00
Junping Du
8abd45b5bb Merge r1616100 from trunk: YARN-2298. Move TimelineClient to yarn-common project (Zhijie Shen via junping_du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616102 13f79535-47bb-0310-9956-ffa450edef68
2014-08-06 05:56:34 +00:00
Junping Du
75349f2d83 Merge r1615025 from trunk: YARN-2051. Fix bug in PBimpls and add more unit tests with reflection. (Contributed by Binglin Chang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615027 13f79535-47bb-0310-9956-ffa450edef68
2014-08-01 04:25:49 +00:00
Xuan Gong
ecc257e384 YARN-1994. Expose YARN/MR endpoints on multiple interfaces. Contributed by Craig Welch, Milan Potocnik and Arpit Agarwal
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615010 13f79535-47bb-0310-9956-ffa450edef68
2014-07-31 21:29:01 +00:00
Zhijie Shen
b41896f0a2 YARN-2247. Made RM web services authenticate users via kerberos and delegation token. Contributed by Varun Vasudev.
svn merge --ignore-ancestry -c 1613821 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613822 13f79535-47bb-0310-9956-ffa450edef68
2014-07-27 17:57:44 +00:00
Zhijie Shen
170504a15c YARN-2270. Made TestFSDownload#testDownloadPublicWithStatCache be skipped when there’s no ancestor permissions. Contributed by Akira Ajisaka.
svn merge --ignore-ancestry -c 1612460 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612461 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 05:02:26 +00:00
Xuan Gong
5b0492f7c5 YARN-2208. AMRMTokenManager need to have a way to roll over AMRMToken. Contributed by Xuan Gong
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611819 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 21:44:40 +00:00
Jian He
1c2fec20c9 Merge r1611126 from trunk. YARN-2264. Fixed a race condition in DrainDispatcher which may cause random test failures. Contributed by Li Lu
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611127 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 18:27:09 +00:00
Vinod Kumar Vavilapalli
bfefa9301f YARN-2228. Augmented TimelineServer to load pseudo authentication filter when authentication = simple. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1610575 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1610576 13f79535-47bb-0310-9956-ffa450edef68
2014-07-15 04:34:16 +00:00
Xuan Gong
b588da4eb4 YARN-2269. Remove external links from YARN UI. Contributed by Craig Welch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609591 13f79535-47bb-0310-9956-ffa450edef68
2014-07-10 23:32:36 +00:00
Jian He
7cfc7e39a4 Merge r1609584 from trunk. YARN-2088. Fixed a bug in GetApplicationsRequestPBImpl#mergeLocalToBuilder. Contributed by Binglin Chang
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609585 13f79535-47bb-0310-9956-ffa450edef68
2014-07-10 22:38:51 +00:00
Junping Du
b81b6b6366 Merge r1607833 from Trunk: YARN-2251. Avoid negative elapsed time in JHS/MRAM web UI and services (Contributed by Zhijie Shen)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607834 13f79535-47bb-0310-9956-ffa450edef68
2014-07-04 11:20:43 +00:00
Karthik Kambatla
9133e3142c Preparing for 2.6.0 development. Updated versions.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607541 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 06:11:57 +00:00
Vinod Kumar Vavilapalli
8f1f458729 YARN-1713. Added get-new-app and submit-app functionality to RM web services. Contributed by Varun Vasudev.
svn merge --ignore-ancestry -c 1607216 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607217 13f79535-47bb-0310-9956-ffa450edef68
2014-07-02 00:23:49 +00:00
Ravi Prakash
b2e3e76e2f YARN 2163. WebUI: Order of AppId in apps table should be consistent with ApplicationId.compareTo()
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605965 13f79535-47bb-0310-9956-ffa450edef68
2014-06-27 06:45:57 +00:00
Vinod Kumar Vavilapalli
a2e2c8ad97 YARN-2152. Added missing information into ContainerTokenIdentifier so that NodeManagers can report the same to RM when RM restarts. Contributed Jian He.
svn merge --ignore-ancestry -c 1605205 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605206 13f79535-47bb-0310-9956-ffa450edef68
2014-06-24 21:44:00 +00:00
Vinod Kumar Vavilapalli
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
Junping Du
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
Chris Nauroth
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
Karthik Kambatla
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
Karthik Kambatla
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
Vinod Kumar Vavilapalli
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
Zhijie Shen
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
Vinod Kumar Vavilapalli
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
Vinod Kumar Vavilapalli
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
Vinod Kumar Vavilapalli
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
Jason Darrell Lowe
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
Junping Du
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
Jason Darrell Lowe
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
Jian He
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