Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,957 Commits 326 Branches 371 Tags 1.5 GiB
Commit Graph

594 Commits

Author SHA1 Message Date
Zhijie Shen 296bbd8971 YARN-2709. Made timeline client getDelegationToken API retry if ConnectException happens. Contributed by Li Lu. 
(cherry picked from commit b2942762d7)
 2014-10-21 16:08:18 -07:00
Zhijie Shen fd7ba56f6a YARN-2717. Avoided duplicate logging when container logs are not found. Contributed by Xuan Gong. 
(cherry picked from commit 171f2376d2)
 2014-10-20 22:23:12 -07:00
Zhijie Shen f75570734b YARN-2582. Fixed Log CLI and Web UI for showing aggregated logs of LRS. Contributed Xuan Gong. 
(cherry picked from commit e90718fa5a)
 2014-10-20 13:42:22 -07:00
Zhijie Shen 42ceed8f20 YARN-2673. Made timeline client put APIs retry if ConnectException happens. Contributed by Li Lu. 
(cherry picked from commit 89427419a3)
 2014-10-20 12:23:10 -07:00
Vinod Kumar Vavilapalli 9915d52185 YARN-2504. Enhanced RM Admin CLI to support management of node-labels. Contribyted by Wangda Tan. 
(cherry picked from commit 8256766498)
 2014-10-18 12:08:28 -07:00
Vinod Kumar Vavilapalli ea841eb25d YARN-2676. Enhanced Timeline auth-filter to support proxy users. Contributed by Zhijie Shen. 
(cherry picked from commit 39063cd36f)
 2014-10-17 22:03:43 -07:00
Vinod Kumar Vavilapalli 1c52b6551b YARN-2705. Fixed bugs in ResourceManager node-label manager that were causing test-failures: added a dummy in-memory labels-manager. Contributed by Wangda Tan. 
(cherry picked from commit e9c66e8fd2)
 2014-10-17 18:27:04 -07:00
Vinod Kumar Vavilapalli 99ce4277a8 YARN-2699. Fixed a bug in CommonNodeLabelsManager that caused tests to fail when using ephemeral ports on NodeIDs. Contributed by Wangda Tan. 
(cherry picked from commit abae63caf9)
 2014-10-17 08:59:22 -07:00
Vinod Kumar Vavilapalli 76cf2250de YARN-2685. Fixed a bug in CommonNodeLabelsManager that caused wrong resource tracking per label when a host runs multiple node-managers. Contributed by Wangda Tan. 
(cherry picked from commit b3056c266a)
 2014-10-15 18:48:36 -07:00
Jian He f93d2ea27e YARN-2312. Deprecated old ContainerId#getId API and updated MapReduce to use ContainerId#getContainerId instead. Contributed by Tsuyoshi OZAWA 2014-10-15 15:28:26 -07:00
Karthik Kambatla 88455173e8 YARN-2566. DefaultContainerExecutor should pick a working directory randomly. (Zhihai Xu via kasha) 
(cherry picked from commit cc93e7e683)
 2014-10-13 16:32:42 -07:00
Zhijie Shen e51ae64761 YARN-2651. Spun off LogRollingInterval from LogAggregationContext. Contributed by Xuan Gong. 
(cherry picked from commit 4aed2d8e91)
 2014-10-13 10:55:09 -07:00
Vinod Kumar Vavilapalli 8ef83a9480 YARN-2494. Added NodeLabels Manager internal API and implementation. Contributed by Wangda Tan. 
(cherry picked from commit db7f165319)
 2014-10-10 11:45:15 -07:00
Zhijie Shen 1e6d81a886 YARN-2583. Modified AggregatedLogDeletionService to be able to delete rolling aggregated logs. Contributed by Xuan Gong. 
(cherry picked from commit cb81bac002)
 2014-10-10 00:16:34 -07:00
Zhijie Shen ad47a27dbf YARN-2617. Fixed ApplicationSubmissionContext to still set resource for backward compatibility. Contributed by Wangda Tan. 
(cherry picked from commit e532ed8faa)
 2014-10-09 18:00:01 -07:00
Karthik Kambatla 7e20187f91 YARN-2180. [YARN-1492] In-memory backing store for cache manager. (Chris Trezzo via kasha) 
(cherry picked from commit 4f426fe223)
 2014-10-09 17:16:45 -07:00
Vinod Kumar Vavilapalli d3125f3de5 YARN-2544. Added admin-API objects for using node-labels. Contributed by Wangda Tan. 
(cherry picked from commit 596702a025)
 2014-10-09 15:47:20 -07:00
Zhijie Shen 4d170d3db6 YARN-2629. Made the distributed shell use the domain-based timeline ACLs. Contributed by Zhijie Shen. 
(cherry picked from commit 1d4612f5ad)
 2014-10-09 13:01:44 -07:00
Vinod Kumar Vavilapalli b42cd54d7a YARN-2493. Added user-APIs for using node-labels. Contributed by Wangda Tan. 
(cherry picked from commit 180afa2f86)
 2014-10-09 11:27:17 -07:00
Steve Loughran d218ab58fc YARN-913 service registry: YARN-2652 add hadoop-yarn-registry package under hadoop-yarn 2014-10-08 12:55:47 -07:00
Jian He 43358be60b YARN-2615. Changed ClientToAMTokenIdentifier/RM(Timeline)DelegationTokenIdentifier to use protobuf as payload. Contributed by Junping Du 
(cherry picked from commit ea26cc0b4a)
 2014-10-06 10:48:27 -07:00
Chris Douglas 4ba102bdc3 YARN-1051. Add a system for creating reservations of cluster capacity. 
Contributed by Subru Krishnan and Carlo Curino.
(cherry picked from commit c8212bacb1)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
 2014-10-06 10:30:53 -07:00
subru ae0f16ccc8 YARN-2576. Making test patch pass in branch. Contributed by Subru Krishnan and Carlo Curino. 
(cherry picked from commit 90ac0be86b)
(cherry picked from commit 5e10a13bb4)
 2014-10-06 10:21:06 -07:00
subru 3a167056d1 YARN-1708. Public YARN APIs for creating/updating/deleting reservations. 
(cherry picked from commit 3f2e3b275b)
(cherry picked from commit c9266df404)
 2014-10-06 10:21:05 -07:00
Vinod Kumar Vavilapalli 7ed61e150c YARN-2468. Enhanced NodeManager to support log handling APIs (YARN-2569) for use by long running services. Contributed by Xuan Gong. 
(cherry picked from commit 34cdcaad71)
 2014-10-03 12:17:03 -07:00
Jian He 1c58ab9206 YARN-2562. Changed ContainerId#toString() to be more readable. Contributed by Tsuyoshi OZAWA 
(cherry picked from commit eb6ce5e97c)
 2014-10-03 11:04:46 -07:00
Zhijie Shen ecaae67ab3 YARN-2527. Fixed the potential NPE in ApplicationACLsManager and added test cases for it. Contributed by Benoy Antony. 
(cherry picked from commit 1c93025a1b)
 2014-10-02 14:57:27 -07:00
Vinod Kumar Vavilapalli 34dd2d1d1c YARN-2446. Augmented Timeline service APIs to start taking in domains as a parameter while posting entities and events. Contributed by Zhijie Shen. 
(cherry picked from commit 9e40de6af7)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
 2014-10-01 17:54:12 -07:00
junping_du 625456746c YARN-2613. Support retry in NMClient for rolling-upgrades. (Contributed by Jian He) 2014-10-01 17:08:55 -07:00
Karthik Kambatla b616c69835 YARN-2179. [YARN-1492] Initial cache manager structure and context. (Chris Trezzo via kasha) 
(cherry picked from commit 17d1202c35)

Conflicts:
	hadoop-yarn-project/hadoop-yarn/bin/yarn
 2014-09-30 19:05:10 -07:00
Jason Lowe a0305ba3fc YARN-2387. Resource Manager crashes with NPE due to lack of synchronization. Contributed by Mit Desai 
(cherry picked from commit feaf139b4f)
 2014-09-30 22:38:27 +00:00
Karthik Kambatla 21f920ab86 YARN-2610. Hamlet should close table tags. (Ray Chiang via kasha) 
(cherry picked from commit f7743dd07d)
 2014-09-30 11:47:01 -07:00
Jian He cb08ed1484 YARN-668. Changed NMTokenIdentifier/AMRMTokenIdentifier/ContainerTokenIdentifier to use protobuf object as the payload. Contributed by Junping Du. 
(cherry picked from commit 5391919b09)
 2014-09-26 17:53:35 -07:00
Zhijie Shen 3a2e400377 YARN-2581. Passed LogAggregationContext to NM via ContainerTokenIdentifier. Contributed by Xuan Gong. 
(cherry picked from commit c86674a3a4)
 2014-09-24 17:51:54 -07:00
Vinod Kumar Vavilapalli 5d251d99d6 YARN-2102. Added the concept of a Timeline Domain to handle read/write ACLs on Timeline service event data. Contributed by Zhijie Shen. 
(cherry picked from commit d78b452a4f)
 2014-09-24 11:29:01 -07:00
Zhijie Shen 19cfe2f800 YARN-2569. Added the log handling APIs for the long running services. Contributed by Xuan Gong. 
(cherry picked from commit 5338ac416a)
 2014-09-23 10:38:27 -07:00
Zhijie Shen b8d645539d MAPREDUCE-5279. Made MR headroom calculation honor cpu dimension when YARN scheduler resource type is memory plus cpu. Contributed by Peng Zhang and Varun Vasudev. 2014-09-22 10:41:55 -07:00
Allen Wittenauer 0037b8f67b YARN-2460. Remove obsolete entries from yarn-default.xml (Ray Chiang via aw) 2014-09-19 14:08:04 -07:00
Vinod Kumar Vavilapalli d24ef142b7 YARN-2001. Added a time threshold for RM to wait before starting container allocations after restart/failover. Contributed by Jian He. 
(cherry picked from commit 485c96e3cb)
 2014-09-18 11:04:27 -07:00
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 a3d9934f91)
 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 f4886111aa)

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 9f6891d9ef)
 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 14e2639fd0)
 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 3122daa802)

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 6b8b1608e6)
 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 4be95175cd)
 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 83be3ad444)
 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 b67d5ba784)
 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 0974f434c4)
 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 cbea1b10ef)
 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 5c14bc426b)

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 e2d0ff364a)
 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
Vinod Kumar Vavilapalli 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
Zhijie Shen 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
Sanford Ryza 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
Jason Darrell Lowe 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
Junping Du 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
Thomas Graves 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
Vinod Kumar Vavilapalli 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
Steve Loughran 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
Karthik Kambatla 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
Chris Nauroth 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
Vinod Kumar Vavilapalli 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
Vinod Kumar Vavilapalli 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
Jonathan Turner Eagles 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
Vinod Kumar Vavilapalli 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
Vinod Kumar Vavilapalli 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
Vinod Kumar Vavilapalli 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
Vinod Kumar Vavilapalli 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
Vinod Kumar Vavilapalli 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
Jonathan Turner Eagles 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
Jonathan Turner Eagles 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
Vinod Kumar Vavilapalli 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
Zhijie Shen 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
Vinod Kumar Vavilapalli 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
Christopher Douglas 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
Zhijie Shen 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
Vinod Kumar Vavilapalli 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
Karthik Kambatla 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
Haohui Mai 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
Vinod Kumar Vavilapalli 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
Vinod Kumar Vavilapalli 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
Vinod Kumar Vavilapalli 04474afc81 MAPREDUCE-5770. Fixed MapReduce ApplicationMaster to correctly redirect to the YARN's web-app proxy with the correct scheme prefix. Contributed by Jian He. 
svn merge --ignore-ancestry -c 1572711 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572712 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-27 19:24:49 +00:00
Vinod Kumar Vavilapalli 3406b14755 YARN-1588. Enhanced RM and the scheduling protocol to also send NMTokens of transferred containers from previous app-attempts to new AMs after YARN-1490. Contributed by Jian He. 
svn merge --ignore-ancestry -c 1572230 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572232 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-26 20:20:39 +00:00
Vinod Kumar Vavilapalli ece585643c YARN-1749. Updated application-history related configs to reflect the latest reality and to be consistently named. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1570948 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570949 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-23 02:05:28 +00:00
Vinod Kumar Vavilapalli 507ddad47f YARN-1687. Renamed user-facing records for the timeline-service to be simply named after 'timeline' instead of 'apptimeline'. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1570922 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570924 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-22 20:55:42 +00:00
Vinod Kumar Vavilapalli 0bbc1f4d95 YARN-1666. Modified RM HA handling of include/exclude node-lists to be available across RM failover by making using of a remote configuration-provider. Contributed by Xuan Gong. 
svn merge --ignore-ancestry -c 1569856 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569857 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-19 17:53:45 +00:00
Arun Murthy 1ccccb8534 Branching for hadoop-2.4 releases, also set version to 2.5.0-SNAPSHOT in branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569186 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-18 04:41:01 +00:00
Vinod Kumar Vavilapalli 7e252cdc9d YARN-1553. Modified YARN and MR to stop using HttpConfig.isSecure() and 
instead rely on the http policy framework. And also fix some bugs related
to https handling in YARN web-apps. Contributed by Haohui Mai.
svn merge --ignore-ancestry -c 1568501 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568503 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-14 20:01:32 +00:00
Sanford Ryza 81bff204c3 YARN-1496. Protocol additions to allow moving apps between queues (Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567479 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-12 01:00:08 +00:00
Zhijie Shen ae6a8f28a6 YARN-1706. Created an utility method to dump timeline records to JSON strings. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1566982 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1566983 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-11 04:41:45 +00:00
Vinod Kumar Vavilapalli 3cd8219519 YARN-1459. Changed ResourceManager to depend its service initialization on the configuration-provider mechanism during startup too. Contributed by Xuan Gong. 
svn merge --ignore-ancestry -c 1566791 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1566793 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-10 22:51:30 +00:00
Zhijie Shen c9b6c3c36c YARN-1635. Implemented a Leveldb based ApplicationTimelineStore. Contributed by Billie Rinaldi. 
svn merge --ignore-ancestry -c 1565868 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565869 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-08 02:18:06 +00:00
Vinod Kumar Vavilapalli 2ad6a71880 YARN-1660. Simplified the RM HA configuration to accept and be able to simply depend just on 
configuration properties of the form yarn.resourcemanager.hostname.RMID and use the default
ports for all service addresses. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1565523 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565524 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-07 03:19:04 +00:00
Vinod Kumar Vavilapalli c16df11991 YARN-1665. Simplify the configuration of RM HA by having better default values. Contributed by Xuan Gong. 
svn merge --ignore-ancestry -c 1565517 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565518 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-07 02:40:02 +00:00
Vinod Kumar Vavilapalli a30e1889a6 YARN-1636. Augmented Application-history server's web-services to also expose new APIs for retrieving and storing timeline information. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1564829 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564830 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-05 17:03:01 +00:00
Zhijie Shen 2017bac9e4 YARN-1461. Added tags for YARN applications and changed RM to handle them. Contributed by Karthik Kambatla. 
svn merge --ignore-ancestry -c 1564633 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564634 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-05 04:58:50 +00:00
Vinod Kumar Vavilapalli bb7e96ed31 YARN-1285. Changed the default value of yarn.acl.enable in yarn-default.xml to be consistent with what exists (false) in the code and documentation. Contributed by Kenji Kikushima. 
svn merge --ignore-ancestry -c 1564190 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564191 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-04 04:23:35 +00:00
Vinod Kumar Vavilapalli fb892d8f84 YARN-1659. Defined the ApplicationTimelineStore store as an abstraction for implementing different storage impls for storing timeline information. Contributed by Billie Rinaldi. 
svn merge --ignore-ancestry -c 1564037 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564038 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-03 20:07:55 +00:00
Vinod Kumar Vavilapalli bd84052ff6 YARN-1639. Modified RM HA configuration handling to have a way of not requiring separate configuration files for each RM. Contributed by Xuan Gong. 
svn merge --ignore-ancestry -c 1564032 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564033 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-03 19:55:58 +00:00
Vinod Kumar Vavilapalli d083be9bc5 YARN-1611. Introduced the concept of a configuration provider which can be used by ResourceManager to read configuration locally or from remote systems so as to help RM failover. Contributed by Xuan Gong. 
svn merge -c 1564002 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564003 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-03 19:08:26 +00:00
Karthik Kambatla ef4cbe7c15 HADOOP-10085. CompositeService should allow adding services while being inited. (Steve Loughran via kasha) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1563696 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-02 19:52:40 +00:00
Vinod Kumar Vavilapalli a420b40e00 YARN-1633. Defined user-facing entity, entity-info and event objects related to Application Timeline feature. Contributed by Zhijie Shen. 
svn merge -c 1563356 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1563357 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-01 00:10:26 +00:00
Jason Darrell Lowe bdb642032c svn merge -c 1562482 FIXES: YARN-1600. RM does not startup when security is enabled without spnego configured. Contributed by Haohui Mai 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562483 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-29 15:35:25 +00:00
Vinod Kumar Vavilapalli 65a9a46f2c YARN-1625. Fixed RAT warnings after YARN-321 merge. Contributed by Shinichi Yamashita. 
svn merge --ignore-ancestry -c 1561458 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562225 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-28 20:50:39 +00:00
Vinod Kumar Vavilapalli 1c8e403fdd YARN-1605. Fixed formatting issues in the new module on branch YARN-321. Contributed by Vinod Kumar Vavilapalli. 
svn merge --ignore-ancestry -c 1559004 ../YARN-321


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562219 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-28 20:19:53 +00:00
Vinod Kumar Vavilapalli 4a3b6b7367 YARN-1595. Made enabling history service configurable and fixed test failures on branch YARN-321. Contributed by Vinod Kumar Vavilapalli. 
svn merge --ignore-ancestry -c 1559001 ../YARN-321


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562218 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-28 20:18:42 +00:00
Vinod Kumar Vavilapalli a6dfb7b045 YARN-1413. Implemented serving of aggregated-logs in the ApplicationHistory server. Contributed by Mayank Bansal. 
svn merge --ignore-ancestry -c 1556752 ../YARN-321


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562206 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-28 20:03:04 +00:00
Vinod Kumar Vavilapalli b7a3d0ae93 YARN-967. Added the client and CLI interfaces for obtaining ApplicationHistory data. Contributed by Mayank Bansal. 
svn merge --ignore-ancestry -c 1556747  ../YARN-321


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562202 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-28 20:00:38 +00:00
Vinod Kumar Vavilapalli 2de75edd46 YARN-954. Added the previously missed .keep file. 
svn merge --ignore-ancestry -c 1556746 ../YARN-321


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562201 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-28 19:59:57 +00:00
Vinod Kumar Vavilapalli 20664c0460 YARN-954. Implemented web UI for the ApplicationHistoryServer and wired it into the HistoryStorage. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1556745 ../YARN-321


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562200 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-28 19:59:17 +00:00
Vinod Kumar Vavilapalli 3d227e9544 YARN-955. Implemented ApplicationHistoryProtocol handler. Contributed by Mayank Bansal. 
svn merge --ignore-ancestry -c 1556743 ../YARN-321


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562198 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-28 19:58:07 +00:00
Vinod Kumar Vavilapalli 7440b97256 YARN-1266. Added files that were forgotten in the last commit. 
svn merge --ignore-ancestry -c 1556740 ../YARN-321


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562197 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-28 19:57:33 +00:00
Vinod Kumar Vavilapalli 0f87e4928b YARN-953. Changed ResourceManager to start writing history data. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1556738 ../YARN-321


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562192 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-28 19:56:28 +00:00
Vinod Kumar Vavilapalli 0d2e62ae04 YARN-987. Added ApplicationHistoryManager responsible for exposing reports to all clients. Contributed by Mayank Bansal. 
svn merge --ignore-ancestry -c 1556736 ../YARN-321


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562189 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-28 19:53:54 +00:00
Vinod Kumar Vavilapalli e8a09094f5 YARN-979. Added more APIs for getting information about ApplicationAttempts and Containers from ApplicationHistoryProtocol. Contributed by Mayank Bansal and Zhijie Shen. 
svn merge --ignore-ancestry -c 1556731 ../YARN-321


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562187 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-28 19:52:48 +00:00
Vinod Kumar Vavilapalli cb52671a9b YARN-978. Updated patch for adding ApplicationAttemptReport and Protobuf implementation. Contributed by Mayank Bansal. 
svn merge --ignore-ancestry -c 1556729 ../YARN-321


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562186 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-28 19:52:14 +00:00
Vinod Kumar Vavilapalli 7dc256706e YARN-1123. Added a new ContainerReport and its Protobuf implementation. Contributed by Mayank Bansal. 
svn merge --ignore-ancestry -c 1556728 ../YARN-321


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562185 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-28 19:51:39 +00:00
Vinod Kumar Vavilapalli a47d981c6e YARN-975. Added a file-system implementation for HistoryStorage. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1556727 ../YARN-321


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562184 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-28 19:51:02 +00:00
Vinod Kumar Vavilapalli 3ec30a2941 YARN-934. Updated patch for HistoryWriter to split the write operations into a startOp and a finishOp. Contributed by Zhijie Shen. 
YARN-947. Updated patch to have separate data object for startOp and finishOp. Contributed by Zhijie Shen.
YARN-956. Updated patch for In-memory Storage after the above two changes.
svn merge --ignore-ancestry -c 1556726 ../YARN-321


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562182 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-28 19:50:28 +00:00
Karthik Kambatla d225ce1ce2 YARN-1642. RMDTRenewer#getRMClient should use ClientRMProxy (kasha) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561992 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-28 08:30:19 +00:00
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
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
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
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
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 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
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
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
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
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
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
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 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
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
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
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
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 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
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
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
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 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 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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Jonathan Turner Eagles e33f5dc85d YARN-819. ResourceManager and NodeManager should check for a minimum allowed version (Robert Parker via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526665 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-26 20:06:47 +00:00
Colin McCabe fa2a3c94f2 HADOOP-9998. Provide methods to clear only part of the DNSToSwitchMapping. (Junping Du via Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526568 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-26 15:24:40 +00:00
Siddharth Seth e23d5672a7 merge YARN-1229 from trunk. Define constraints on Auxiliary Service names. Change ShuffleHandler service name from mapreduce.shuffle to mapreduce_shuffle. Contributed by Xuan Gong. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526066 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-25 00:37:14 +00:00
Vinod Kumar Vavilapalli 2daddb610e YARN-1204. Added separate configuration properties for https for RM and NM without which servers enabled with https will also start on http ports. Contributed by Omkar Vinit Joshi. 
MAPREDUCE-5523. Added separate configuration properties for https for JHS without which even when https is enabled, it starts on http port itself. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1525947 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525948 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-24 17:20:48 +00:00
Hitesh Shah 2f97dced61 Merge 1524829 from trunk to branch-2 for YARN-353. Add Zookeeper-based store implementation for RMStateStore. Contributed by Bikas Saha, Jian He and Karthik Kambatla. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524831 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-19 20:40:52 +00:00
Bikas Saha db17c6ac06 Merge r1523750 from trunk to branch-2 for YARN-1027. Implement RMHAProtocolService (Karthik Kambatla via bikas) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523753 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-16 18:40:28 +00:00
Bikas Saha c5ef30971e Merge r1523376 from trunk to branch-2 for YARN-540. Race condition causing RM to potentially relaunch already unregistered AMs on RM restart (Jian He via bikas) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523377 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-15 01:07:11 +00:00
Bikas Saha a84e9321c4 Merge 1520135 from trunk to branch-2 for YARN-1065. NM should provide AuxillaryService data to the container (Xuan Gong via bikas) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520137 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-04 20:51:35 +00:00
Vinod Kumar Vavilapalli 2ddc961c85 YARN-981. Fixed YARN webapp so that /logs servlet works like before. Addendum patch to fix bugs in the first patch. Contributed by Jian He. 
svn merge --ignore-ancestry -c 1519208 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519210 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-31 20:02:30 +00:00
Sanford Ryza ab02296741 HADOOP-9918. Add addIfService to CompositeService (Karthik Kambatla via Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519130 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-31 02:13:11 +00:00
Vinod Kumar Vavilapalli 3fea164bb1 YARN-1117. Improved help messages for "yarn application" and "yarn node" commands. Contributed by Xuan Gong. 
svn merge --ignore-ancestry -c 1519117 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519118 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-30 23:26:36 +00:00
Bikas Saha 148db9d4f5 Merge 1519107. from trunk to branch-2 for YARN-771. AMRMClient support for resource blacklisting (Junping Du via bikas) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519112 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-30 23:03:44 +00:00
Vinod Kumar Vavilapalli fbcb35425d YARN-707. Added user information also in the YARN ClientToken so that AMs can implement authorization based on incoming users. Contributed by Jason Lowe. 
svn merge --ignore-ancestry -c 1518868 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518869 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-30 01:13:36 +00:00
Vinod Kumar Vavilapalli 8966d37557 YARN-1080. Improved help message for "yarn logs" command. Contributed by Xuan Gong. 
svn merge --ignore-ancestry -c 1518731 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518732 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-29 17:56:18 +00:00
Vinod Kumar Vavilapalli b156434fd5 YARN-981. Fixed YARN webapp so that /logs servlet works like before. Contributed by Jian He. 
svn merge --ignore-ancestry -c 1518030 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518031 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-27 23:39:16 +00:00
Vinod Kumar Vavilapalli ba89f8efc7 YARN-1085. Addendum patch to address issues with the earlier patch. 
svn merge --ignore-ancestry -c 1517721 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517722 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-26 23:01:23 +00:00
Vinod Kumar Vavilapalli 2d9c88f45e YARN-1074. Cleaned up YARN CLI application list to only display running applications by default. Contributed by Xuan Gong. 
svn merge --ignore-ancestry -c 1517196 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517197 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-24 21:17:11 +00:00
Vinod Kumar Vavilapalli a42a5e153c YARN-1085. Modified YARN and MR2 web-apps to do HTTP authentication in secure setup with kerberos. Contributed by Omkar Vinit Joshi. 
svn merge --ignore-ancestry -c 1517101 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517102 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-24 02:48:17 +00:00
Jason Darrell Lowe 35f60e71de svn merge -c 1517097 to revert MAPREDUCE-5475 and YARN-707 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517098 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-24 01:23:39 +00:00
Jason Darrell Lowe 07360a0d8d svn merge -c 1517073 FIXES: YARN-707. Add user info in the YARN ClientToken. Contributed by Vinod Kumar Vavilapalli 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517077 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-23 22:19:04 +00:00
Siddharth Seth d6049bd288 merge YARN-1045. Improve toString implementation for PBImpls. Contributed by Jian He. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514186 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-15 07:21:55 +00:00
Arun Murthy 77a60701c1 Merge -c 1514135 from trunk to branch-2 to fix YARN-1056. Remove dual use of string 'resourcemanager' in yarn.resourcemanager.connect.{max.wait.secs|retry_interval.secs}. Contributed by Karthik Kambatla. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514136 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-15 02:36:58 +00:00
Vinod Kumar Vavilapalli 6737f3d3a5 YARN-945. Removed setting of AMRMToken's service from ResourceManager and changed client libraries do it all the time and correctly. Contributed by Vinod Kumar Vavilapalli. 
svn merge --ignore-ancestry -c 1508232 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508233 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-29 23:18:10 +00:00
Alejandro Abdelnur 126337bba6 YARN-937. Fix unmanaged AM in non-secure/secure setup post YARN-701. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507708 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-27 20:08:59 +00:00
Tsz-wo Sze 4c045ebafd svn merge -c 1380921 from trunk for YARN-84. Use Builder to build RPC server. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507582 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-27 06:47:40 +00:00
Kihwal Lee b2b14eb45e svn merge -c 1506675 merging from trunk to branch-2 to fix YARN-968. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506678 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-24 19:45:49 +00:00
Vinod Kumar Vavilapalli f487f4eb19 YARN-926. Modified ContainerManagerProtcol APIs to take in requests for multiple containers. Contributed by Jian He. 
MAPREDUCE-5412. Update MR app to use multiple containers API of ContainerManager after YARN-926. Contributed by Jian He.
svn merge --ignore-ancestry -c 1506391 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506392 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-24 03:42:52 +00:00
Jason Darrell Lowe d6be90bccf svn merge -c 1506226 FIXES: MAPREDUCE-5356. Ability to refresh aggregated log retention period and check interval. Contributed by Ashwin Shankar 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506230 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-23 19:25:19 +00:00
Arun Murthy 83c776c85d Set version in branch-2 to 2.3.0-SNAPSHOT to reflect that we will only be adding new content to hadoop-2.3.0 and not hadoop-2.2.0. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504744 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-19 01:35:34 +00:00
Arun Murthy f7080007ad Merge -c 1504735 from trunk to branch-2 to fix YARN-918. Remove ApplicationAttemptId from RegisterApplicationMasterRequestProto. Contributed by Vinod K V. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504736 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-19 00:58:33 +00:00
Bikas Saha 3990e8b478 Merge r1503933 from trunk to branch-2 for YARN-513. Create common proxy client for communicating with RM (Xuan Gong & Jian He via bikas) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503935 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-16 22:54:55 +00:00
Christopher Douglas 495c24331e YARN-569. Add support for requesting and enforcing preemption requests via 
a capacity monitor. Contributed by Carlo Curino, Chris Douglas


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502084 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-11 01:20:37 +00:00
Chris Nauroth 9bd8745846 MAPREDUCE-4374. Merging change r1502046 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502048 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-10 23:08:34 +00:00
Hitesh Shah 1157061429 merge -c 1501599 from trunk to branch-2 to fix YARN-727, MAPREDUCE-5325. ClientRMProtocol.getAllApplications should accept ApplicationType as a parameter. Contributed by Xuan Gong. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1501600 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-09 23:07:15 +00:00
Vinod Kumar Vavilapalli 16841d50c5 YARN-791. Changed RM APIs and web-services related to nodes to ensure that both are consistent with each other. Contributed by Sandy Ryza. 
svn merge --ignore-ancestry -c 1500994 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1500995 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-08 22:33:43 +00:00
Arun Murthy 9efe263b78 Merge -c 1496751 from trunk to branch-2 to fix YARN-869. Move ResourceManagerAdministrationProtocol out of main YARN api. Contributed by Vinod K V. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496754 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-26 06:03:24 +00:00
Alejandro Abdelnur 620f7b0c02 YARN-736. Add a multi-resource fair sharing metric. (sandyr via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496154 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-24 18:35:59 +00:00
Bikas Saha a6b923e4d1 Merge r1495533 from trunk to branch-2 for YARN-827. Need to make Resource arithmetic methods accessible (Jian He via bikas) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1495538 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-21 18:51:17 +00:00
Jonathan Turner Eagles 5112a228cc YARN-478. fix coverage org.apache.hadoop.yarn.webapp.log (Aleksey Gorshkov via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1495132 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-20 19:04:30 +00:00
Vinod Kumar Vavilapalli 9c307dcbf4 YARN-854. Fixing YARN bugs that are failing applications in secure environment. Contributed by Omkar Vinit Joshi. 
svn merge --ignore-ancestry -c 1494845 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494846 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-20 03:42:13 +00:00
Chris Nauroth e597eaf136 YARN-852. Merging change r1494733 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494735 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-19 18:54:50 +00:00
Chris Nauroth 84e902a0d3 YARN-597. Merging change r1482149 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494713 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-19 18:03:13 +00:00