Commit Graph

1783 Commits

Author SHA1 Message Date
Zhijie Shen 1880a5a7c3 YARN-2505. Supported get/add/remove/change labels in RM REST API. Contributed by Craig Welch.
(cherry picked from commit 9a4e0d343e)
2014-11-07 20:39:53 -08:00
Vinod Kumar Vavilapalli b865a95f06 YARN-2826. Fixed user-groups mappings' refresh bug caused by YARN-2826. Contributed by Wangda Tan.
(cherry picked from commit df36edf751)
2014-11-07 19:44:52 -08:00
Xuan 7d26cffb0c YARN-2819. NPE in ATS Timeline Domains when upgrading from 2.4 to 2.6. Contributed by Zhijie Shen
(cherry picked from commit 4a114dd67a)
2014-11-07 16:12:45 -08:00
Jason Lowe 9447235527 YARN-2632. Document NM Restart feature. Contributed by Junping Du and Vinod Kumar Vavilapalli
(cherry picked from commit 1e215e8ba2)
2014-11-07 23:41:29 +00:00
Jason Lowe a5764cb783 YARN-2825. Container leak on NM. Contributed by Jian He
(cherry picked from commit c3d475070a)
2014-11-07 23:17:34 +00:00
Vinod Kumar Vavilapalli a50345f654 YARN-2753. Fixed a bunch of bugs in the NodeLabelsManager classes. Contributed by Zhihai xu.
(cherry picked from commit 4cfd5bc7c1)
2014-11-07 14:16:54 -08:00
cnauroth c16f718293 YARN-2803. MR distributed cache not working correctly on Windows after NodeManager privileged account changes. Contributed by Craig Welch.
(cherry picked from commit 06b797947c)
2014-11-07 12:36:42 -08:00
Vinod Kumar Vavilapalli 7b19079657 YARN-2827. Fixed bugs in "yarn queue" CLI. Contributed by Wangda Tan. 2014-11-07 12:00:49 -08:00
Vinod Kumar Vavilapalli d5d2905262 YARN-2824. Fixed Capacity Scheduler to not crash when some node-labels are not mapped to queues by making default capacities per label to be zero. Contributed by Wangda Tan.
(cherry picked from commit 2ac1be7dec)
2014-11-07 10:44:25 -08:00
Xuan bf79541868 YARN-2810. TestRMProxyUsersConf fails on Windows VMs. Contributed by Varun Vasudev
(cherry picked from commit 1e97f2f094)
2014-11-07 09:46:04 -08:00
Vinod Kumar Vavilapalli eb01c602ed YARN-2823. Fixed ResourceManager app-attempt state machine to inform schedulers about previous finished attempts of a running appliation to avoid expectation mismatch w.r.t transferred containers. Contributed by Jian He.
(cherry picked from commit a5657182a7)
2014-11-07 09:30:04 -08:00
Vinod Kumar Vavilapalli b1521c7c3c YARN-2647. Added a queue CLI for getting queue information. Contributed by Sunil Govind.
(cherry picked from commit 61effcbebc)

Conflicts:
	hadoop-yarn-project/hadoop-yarn/bin/yarn
2014-11-06 20:57:55 -08:00
Vinod Kumar Vavilapalli 52e57a95d9 YARN-2744. Fixed CapacityScheduler to validate node-labels correctly against queues. Contributed by Wangda Tan.
(cherry picked from commit a3839a9fbf)
2014-11-06 17:29:12 -08:00
Steve Loughran 5924e74d55 YARN-2768 Improved Yarn Registry service record structure (stevel) 2014-11-06 20:21:25 +00:00
Vinod Kumar Vavilapalli 0f9199fb07 YARN-2818. Removed the now unnecessary user entity injection from Timeline service given we now have domains. Contributed by Zhijie Shen.
(cherry picked from commit f5b19bed7d)
2014-11-06 11:49:44 -08:00
Xuan 4aa98d5991 YARN-2812. TestApplicationHistoryServer is likely to fail on less powerful machine. Contributed by Zhijie Shen
(cherry picked from commit b0b52c4e11)
2014-11-05 20:44:07 -08:00
Xuan e26be1d85c YARN-2813. Fixed NPE from MemoryTimelineStore.getDomains. Contributed by Zhijie Shen 2014-11-05 18:26:07 -08:00
Jian He f92ff24f5e YARN-2579. Fixed a deadlock issue when EmbeddedElectorService and FatalEventDispatcher try to transition RM to StandBy at the same time. Contributed by Rohith Sharmaks
(cherry picked from commit 395275af86)
2014-11-05 17:03:01 -08:00
Vinod Kumar Vavilapalli 3bc31e35a6 YARN-2805. Fixed ResourceManager to load HA configs correctly before kerberos login. Contributed by Wangda Tan.
(cherry picked from commit 834e931d8e)
2014-11-05 15:31:41 -08:00
Zhijie Shen f3ed97de3a YARN-2767. Added a test case to verify that http static user cannot kill or submit apps in the secure mode. Contributed by Varun Vasudev.
(cherry picked from commit 7a4c92a9d55fcecef066053ac30dff0fcd4ec90c)
2014-11-05 10:59:05 -08:00
Vinod Kumar Vavilapalli 56ab333161 YARN-2804. Fixed Timeline service to not fill the logs with JAXB bindings exceptions. Contributed by Zhijie Shen.
(cherry picked from commit b76179895d)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
2014-11-04 18:03:17 -08:00
Haohui Mai fa92b40f09 HADOOP-11230. Add missing dependency of bouncycastle for kms, httpfs, hdfs, MR and YARN. Contributed by Robert Kanter. 2014-11-04 17:53:00 -08:00
Karthik Kambatla 3e4b280de7 YARN-2010. Handle app-recovery failures gracefully. (Jian He and Karthik Kambatla via kasha)
(cherry picked from commit b2cd269802)
2014-11-04 17:48:49 -08:00
Karthik Kambatla 6f9484221e Adding release 2.5.2 to CHANGES.txt
(cherry picked from commit 4de56d27fb)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
2014-11-04 16:51:54 -08:00
Zhijie Shen e06c23a6c9 YARN-2752. Made ContainerExecutor append "nice -n" arg only when priority adjustment flag is set. Contributed by Xuan Gong. 2014-11-04 15:50:10 -08:00
Haohui Mai aa09c4c342 HADOOP-10563. Remove the dependency of jsp in trunk. Contributed by Haohui Mai. 2014-11-04 14:52:51 -08:00
Vinod Kumar Vavilapalli 9c76dcadaf YARN-1922. Fixed NodeManager to kill process-trees correctly in the presence of races between the launch and the stop-container call and when root processes crash. Contributed by Billie Rinaldi.
(cherry picked from commit c5a46d4c8c)
2014-11-03 16:40:37 -08:00
Vinod Kumar Vavilapalli 277141b82d YARN-2795. Fixed ResourceManager to not crash loading node-label data from HDFS in secure mode. Contributed by Wangda Tan.
(cherry picked from commit ec6cbece8e)
2014-11-03 13:45:31 -08:00
Vinod Kumar Vavilapalli 715c81ef6d YARN-2788. Fixed backwards compatiblity issues with log-aggregation feature that were caused when adding log-upload-time via YARN-2703. Contributed by Xuan Gong.
(cherry picked from commit 58e9f24e0f)
2014-11-03 13:19:34 -08:00
Vinod Kumar Vavilapalli 52c58115d2 YARN-2798. Fixed YarnClient to populate the renewer correctly for Timeline delegation tokens. Contributed by Zhijie Shen.
(cherry picked from commit 71fbb474f5)
2014-11-03 12:50:39 -08:00
Jason Lowe 8091ea54d5 YARN-2730. DefaultContainerExecutor runs only one localizer at a time. Contributed by Siqi Li
(cherry picked from commit 6157ace547)
2014-11-03 20:39:14 +00:00
Zhijie Shen caae0a0a08 YARN-2785. Fixed intermittent TestContainerResourceUsage failure. Contributed by Varun Vasudev.
(cherry picked from commit 27715ec63b)
2014-11-02 15:22:54 -08:00
Vinod Kumar Vavilapalli 6627f67bf5 YARN-2790. Fixed a NodeManager bug that was causing log-aggregation to fail beyond HFDS delegation-token expiry even when RM is a proxy-user (YARN-2704). Contributed by Jian He.
(cherry picked from commit 5c0381c96a)
2014-11-01 16:33:35 -07:00
Zhijie Shen d9ac25454c YARN-2711. Fixed TestDefaultContainerExecutor#testContainerLaunchError failure on Windows. Contributed by Varun Vasudev.
(cherry picked from commit 1cd088fd9d)
2014-10-31 17:45:05 -07:00
Jason Lowe ada40aa933 YARN-2707. Potential null dereference in FSDownload. Contributed by Gera Shegalov
(cherry picked from commit 7bc179f9f5)
2014-10-31 22:54:49 +00:00
Vinod Kumar Vavilapalli 6d4a04a033 YARN-2789. Re-instated the NodeReport.newInstance private unstable API modified in YARN-2698 so that tests in YARN frameworks don't break. Contributed by Wangda Tan.
(cherry picked from commit 6ce32f593b)
2014-10-31 15:33:41 -07:00
Xuan 902566741e YARN-2701. Addendum patch. Potential race condition in startLocalizer when using LinuxContainerExecutor. Contributed by Xuan Gong 2014-10-31 14:39:06 -07:00
Jian He a87f827ae4 YARN-2770. Added functionality to renew/cancel TimeLineDelegationToken. Contributed by Zhijie Shen
(cherry picked from commit 1b4be91866)
2014-10-31 13:17:19 -07:00
Karthik Kambatla 268af259b5 YARN-2186. [YARN-1492] Node Manager uploader service for cache manager. (Chris Trezzo and Sangjin Lee via kasha)
(cherry picked from commit 256697acd5)
2014-10-31 13:01:25 -07:00
Vinod Kumar Vavilapalli 9b879d713a YARN-2778. Moved node-lables' reports to the yarn nodes CLI from the admin CLI. Contributed by Wangda Tan.
(cherry picked from commit b6c1188b85)
2014-10-31 10:19:14 -07:00
Vinod Kumar Vavilapalli 97694e78ad YARN-2779. Fixed ResourceManager to not require delegation tokens for communicating with Timeline Service. Contributed by Zhijie Shen.
(cherry picked from commit d1828d9443)
2014-10-30 23:17:16 -07:00
Vinod Kumar Vavilapalli 0ba8d8c19c YARN-2698. Moved some node label APIs to be correctly placed in client protocol. Contributed by Wangda Tan.
(cherry picked from commit e0233c16eb)
2014-10-30 23:02:06 -07:00
Steve Loughran cd24075343 YARN-2677 registry punycoding of usernames doesn't fix all usernames to be DNS-valid (stevel) 2014-10-30 22:32:20 +00:00
Jason Lowe 3e8544c5f2 YARN-2755. NM fails to clean up usercache_DEL_<timestamp> dirs after YARN-661. Contributed by Siqi Li
(cherry picked from commit 73e626ad91)
2014-10-30 15:11:57 +00:00
Karthik Kambatla d2ba115f06 YARN-2712. TestWorkPreservingRMRestart: Augment FS tests with queue and headroom checks. (Tsuyoshi Ozawa via kasha)
(cherry picked from commit 179cab81e0)
2014-10-30 00:39:34 -07:00
Zhijie Shen d2a5c386c1 YARN-2769. Fixed the problem that timeline domain is not set in distributed shell AM when using shell_command on Windows. Contributed by Varun Vasudev.
(cherry picked from commit 72496311def320987c31822776e8fbb73dfcc726)
2014-10-29 12:14:48 -07:00
Karthik Kambatla e88832dfb3 YARN-2742. FairSchedulerConfiguration should allow extra spaces between value and unit. (Wei Yan via kasha)
(cherry picked from commit 782971ae7a)
2014-10-29 10:25:29 -07:00
Zhijie Shen 734cbe7de2 YARN-2747. Fixed the test failure of TestAggregatedLogFormat when native I/O is enabled. Contributed by Xuan Gong.
(cherry picked from commit ec63a3ffbd)
2014-10-28 22:45:20 -07:00
Jian He 720de7eb4c YARN-2503. Added node lablels in web UI. Contributed by Wangda Tan
(cherry picked from commit d5e0a09721)
2014-10-28 18:00:59 -07:00
Zhijie Shen f40389ae08 YARN-2741. Made NM web UI serve logs on the drive other than C: on Windows. Contributed by Craig Welch.
(cherry picked from commit 8984e9b177)
2014-10-28 14:12:09 -07:00
Xuan 43b1878f86 YARN-2758. Update TestApplicationHistoryClientService to use the new generic history store. Contributed by Zhijie Shen 2014-10-28 13:30:55 -07:00
Xuan 43a53f2b65 YARN-2279. Add UTs to cover timeline server authentication. Contributed by Zhijie Shen 2014-10-28 11:18:35 -07:00
Karthik Kambatla 3f7edeb055 YARN-2760. Remove 'experimental' from FairScheduler docs. (Harsh J via kasha)
(cherry picked from commit ade3727ecb)
2014-10-28 08:49:34 -07:00
Jian He a1c7a707ca YARN-2502. Changed DistributedShell to support node labels. Contributed by Wangda Tan
(cherry picked from commit f6b963fdfc)
2014-10-27 20:13:53 -07:00
Vinod Kumar Vavilapalli 0ad33e1483 YARN-2704. Changed ResourceManager to optionally obtain tokens itself for the sake of localization and log-aggregation for long-running services. Contributed by Jian He.
(cherry picked from commit a16d022ca4)
2014-10-27 15:50:51 -07:00
Jian He 2d3c64943d YARN-2591. Fixed AHSWebServices to return FORBIDDEN(403) if the request user doesn't have access to the history data. Contributed by Zhijie Shen
(cherry picked from commit c05b581a55)
2014-10-27 10:46:37 -07:00
Xuan 3a77838535 YARN-2726. CapacityScheduler should explicitly log when an accessible label has no capacity. Contributed by Wangda Tan 2014-10-27 10:28:45 -07:00
Zhijie Shen cb3974524c YARN-2734. Skipped sub-folders in the local log dir when aggregating logs. Contributed by Xuan Gong.
(cherry picked from commit caecd9fffe)
2014-10-26 12:59:29 -07:00
Vinod Kumar Vavilapalli 36d3f1fcca YARN-2743. Fixed a bug in ResourceManager that was causing RMDelegationToken identifiers to be tampered and thus causing app submission failures in secure mode. Contributed by Jian He.
(cherry picked from commit 0186645505)
2014-10-26 11:15:45 -07:00
Xuan f862999a7e YARN-2723. Fix rmadmin -replaceLabelsOnNode does not correctly parse
port. Contributed by Naganarasimha G R
2014-10-25 12:47:09 -07:00
Karthik Kambatla acc6f622e0 YARN-2183. [YARN-1492] Cleaner service for cache manager. (Chris Trezzo and Sangjin Lee via kasha)
(cherry picked from commit c51e53d7aa)
2014-10-25 11:50:06 -07:00
Jian He 9bd149978d YARN-2314. Disable ContainerManagementProtocolProxy cache by default to prevent creating thousands of threads in a large cluster. Contributed by Jason Lowe
(cherry picked from commit f44cf99599)
2014-10-24 23:06:00 -07:00
Jian He 96a6e02d16 YARN-1915. Fixed a race condition that client could use the ClientToAMToken to contact with AM before AM actually receives the ClientToAMTokenMasterKey. Contributed by Jason Lowe
(cherry picked from commit 5864dd99a4)
2014-10-24 22:48:48 -07:00
Karthik Kambatla 9af3cfc7eb YARN-2713. "RM Home" link in NM should point to one of the RMs in an HA setup. (kasha)
(cherry picked from commit 683897fd02)
2014-10-24 15:00:37 -07:00
Zhijie Shen 1b81105143 YARN-2703. Added logUploadedTime into LogValue for better display. Contributed by Xuan Gong.
(cherry picked from commit f81dc3f995)
2014-10-24 14:12:17 -07:00
Zhijie Shen 13c60bac57 YARN-2724. Skipped uploading a local log file to HDFS if exception is raised when opening it. Contributed by Xuan Gong.
(cherry picked from commit e31f0a6558)
2014-10-24 11:15:19 -07:00
Jian He d57f2b9dea Updated CHANGES.txt to move YARN-2682 to branch-2.6
(cherry picked from commit 071c925c7d)
2014-10-23 22:28:23 -07:00
Zhijie Shen 3b03ea6b50 YARN-2209. Replaced AM resync/shutdown command with corresponding exceptions and made related MR changes. Contributed by Jian He.
(cherry picked from commit 0f3b6900be)
2014-10-23 22:03:30 -07:00
Zhijie Shen 36515435ff YARN-2732. Fixed syntax error in SecureContainer.apt.vm. Contributed by Jian He.
(cherry picked from commit b94b8b30f2)
2014-10-22 18:41:05 -07:00
Jian He 1c235a4448 YARN-2198. Remove the need to run NodeManager as privileged account for Windows Secure Container Executor. Contributed by Remus Rusanu
(cherry picked from commit 3b12fd6cfb)
2014-10-22 15:58:26 -07:00
Steve Loughran 5e6494ea95 YARN-2700 TestSecureRMRegistryOperations failing on windows: auth problems 2014-10-22 21:13:32 +01:00
Steve Loughran a64ac5501c YARN-2692 ktutil test hanging on some machines/ktutil versions (stevel) 2014-10-22 14:35:13 +01:00
Zhijie Shen 4b9de2cdfe YARN-2721. Suppress NodeExist exception thrown by ZKRMStateStore when it retries creating znode. Contributed by Jian He.
(cherry picked from commit 7e3b5e6f5c)
2014-10-21 21:52:01 -07:00
Vinod Kumar Vavilapalli 77dc9afe86 YARN-2715. Fixed ResourceManager to respect common configurations for proxy users/groups beyond just the YARN level config. Contributed by Zhijie Shen.
(cherry picked from commit c0e034336c)
2014-10-21 20:10:45 -07:00
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
cnauroth a066134277 YARN-2720. Windows: Wildcard classpath variables not expanded against resources contained in archives. Contributed by Craig Welch.
(cherry picked from commit 6637e3cf95)
2014-10-21 12:34:58 -07:00
Jason Lowe 3820bf055e YARN-90. NodeManager should identify failed disks becoming good again. Contributed by Varun Vasudev
(cherry picked from commit 6f2028bd15)
2014-10-21 17:33:34 +00: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
Jian He b52928a6ea Missing file for YARN-1879
(cherry picked from commit 4a78a75228)
2014-10-20 21:14:57 -07:00
Jian He e9564e729f Missing file for YARN-2701
(cherry picked from commit 4fa1fb3193)
2014-10-20 19:58:21 -07:00
Jian He 3c8ae89050 YARN-2701. Potential race condition in startLocalizer when using LinuxContainerExecutor. Contributed by Xuan Gong
(cherry picked from commit 2839365f23)
2014-10-20 19:54:10 -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
Jian He 78a57087bf YARN-1879. Marked Idempotent/AtMostOnce annotations to ApplicationMasterProtocol for RM fail over. Contributed by Tsuyoshi OZAWA
(cherry picked from commit c3de2412eb)
2014-10-17 16:36:15 -07:00
Jian He 79428e021f YARN-2588. Standby RM fails to transitionToActive if previous transitionToActive failed with ZK exception. Contributed by Rohith Sharmaks
(cherry picked from commit a6aa6e42ca)
2014-10-17 10:55: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
Jian He 10110b6eae Moved YARN-2682 from 2.6 to 2.7 in CHANGES.txt
(cherry picked from commit 72093fd8cb)
2014-10-16 19:03:29 -07:00
Jian He a78f1f8da8 YARN-2682. Updated WindowsSecureContainerExecutor to not use DefaultContainerExecutor#getFirstApplicationDir and use getWorkingDir() instead. Contributed by Zhihai Xu
(cherry picked from commit 0fd0ebae64)
2014-10-16 18:15:43 -07:00
Jian He caba212f12 YARN-2621. Simplify the output when the user doesn't have the access for getDomain(s). Contributed by Zhijie Shen
(cherry picked from commit 233d446be1)
2014-10-16 16:38:00 -07:00
Steve Loughran fddbf52caa YARN-2689 TestSecureRMRegistryOperations failing on windows: secure ZK won't start 2014-10-16 14:21:49 -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
Vinod Kumar Vavilapalli e8e3a36213 YARN-2496. Enhanced Capacity Scheduler to have basic support for allocating resources based on node-labels. Contributed by Wangda Tan.
YARN-2500. Ehnaced ResourceManager to support schedulers allocating resources based on node-labels. Contributed by Wangda Tan.

(cherry picked from commit f2ea555ac6)
2014-10-15 18:34:19 -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
Zhijie Shen bec165e163 YARN-2656. Made RM web services authentication filter support proxy user. Contributed by Varun Vasudev and Zhijie Shen.
(cherry picked from commit 1220bb72d4)
2014-10-14 21:56:44 -07:00
Zhijie Shen 8aeda20b25 HADOOP-11181. Generalized o.a.h.s.t.d.DelegationTokenManager to handle all sub-classes of AbstractDelegationTokenIdentifier. Contributed by Zhijie Shen.
(cherry picked from commit cdce88376a)
2014-10-14 11:37:28 -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
Karthik Kambatla a1116b56a4 YARN-2641. Decommission nodes on -refreshNodes instead of next NM-RM heartbeat. (Zhihai Xu via kasha)
(cherry picked from commit da709a2eac)
2014-10-13 16:24:00 -07:00
Jian He 31a4bf7321 Missing Changes.txt for YARN-2308
(cherry picked from commit 178bc505da)
2014-10-13 14:20:18 -07:00
Jian He 536254f5e7 YARN-2308. Changed CapacityScheduler to explicitly throw exception if the queue
to which the apps were submitted is changed across RM restart. Contributed by Craig Welch & Chang Li
(cherry picked from commit f9680d9a16)
2014-10-13 14:16:12 -07:00
Jason Lowe 6b5741d423 YARN-2377. Localization exception stack traces are not passed as diagnostic info. Contributed by Gera Shegalov
(cherry picked from commit a56ea01002)
2014-10-13 18:32:38 +00: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
Jason Lowe 9ed9ea8c52 YARN-2667. Fix the release audit warning caused by hadoop-yarn-registry. Contributed by Yi Liu
(cherry picked from commit 344a10ad5e)
2014-10-13 15:40:16 +00:00
Steve Loughran 38dedc2f07 YARN-2668 yarn-registry JAR won't link against ZK 3.4.5. (stevel) 2014-10-11 18:33:29 -07:00
Vinod Kumar Vavilapalli fff6a1f77e YARN-2501. Enhanced AMRMClient library to support requests against node labels. Contributed by Wangda Tan.
(cherry picked from commit a5ec3d0809)
2014-10-10 19:58:42 -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
cnauroth b81641a310 YARN-2662. TestCgroupsLCEResourcesHandler leaks file descriptors. Contributed by Chris Nauroth.
(cherry picked from commit d3afd730ac)
2014-10-09 22:47:04 -07:00
Zhijie Shen 79204dced9 YARN-2671. Fix the Jira number in the change log.
(cherry picked from commit 5b12df6587)
2014-10-09 20:59:37 -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
Mayank Bansal c1a86d105e YARN-2598 GHS should show N/A instead of null for the inaccessible information (Zhijie Shen via mayank) 2014-10-09 13:43:36 -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 5e6f86e3aa YARN-2649. Fixed TestAMRMRPCNodeUpdates test failure. Contributed by Ming Ma
(cherry picked from commit e16e25ab1b)
2014-10-08 11:03:00 -07:00
Jian He 9ff7c0c96c YARN-1857. CapacityScheduler headroom doesn't account for other AM's running. Contributed by Chen He and Craig Welch
(cherry picked from commit 30d56fdbb4)
2014-10-07 13:48:03 -07:00
Jian He 5c33e91229 YARN-2644. Fixed CapacityScheduler to return up-to-date headroom when AM allocates. Contributed by Craig Welch
(cherry picked from commit 519e5a7dd2)
2014-10-06 15:51:38 -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 fb5e9df7fd YARN-2611. Fixing jenkins findbugs warning and TestRMWebServicesCapacitySched for branch YARN-1051. Contributed by Subru Krishnan and Carlo Curino.
(cherry picked from commit c47464aba4)
(cherry picked from commit a2986234be)
2014-10-06 10:21:07 -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 cbfbdf60d6 YARN-2080. Integrating reservation system with ResourceManager and client-RM protocol. Contributed by Subru Krishnan and Carlo Curino.
(cherry picked from commit 8baeaead85)

Conflicts:
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java
(cherry picked from commit 6261f7cc69)
2014-10-06 10:21:06 -07:00
subru fec639cda1 YARN-1712. Plan follower that synchronizes the current state of reservation subsystem with the scheduler. Contributed by Subru Krishnan and Carlo Curino.
(cherry picked from commit 169085319b)
(cherry picked from commit 3418c56bcf)
2014-10-06 10:21:06 -07:00
carlo curino 6bfdaf06c4 YARN-1711. Policy to enforce instantaneous and over-time quotas on user reservation. Contributed by Carlo Curino and Subru Krishnan.
(cherry picked from commit c4918cb4cb)
(cherry picked from commit b6df0dddcd)
2014-10-06 10:21:05 -07:00
carlo curino 6a3c167175 YARN-1710. Logic to find allocations within a Plan that satisfy user ReservationRequest(s). Contributed by Carlo Curino and Subru Krishnan.
(cherry picked from commit aef7928899)
(cherry picked from commit f66ffcf832)
2014-10-06 10:21:05 -07:00
subru 63250ef9d6 YARN-1709. In-memory data structures used to track resources over time to enable reservations.
(cherry picked from commit 0d8b2cd88b)
(cherry picked from commit cf4b34282a)
2014-10-06 10:21:05 -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
carlo curino b81f571e60 YARN-2475. Logic for responding to capacity drops for the ReservationSystem. Contributed by Carlo Curino and Subru Krishnan.
(cherry picked from commit f83a07f266)
(cherry picked from commit 1c6950354f)
2014-10-06 10:21:05 -07:00
carlo curino cf5ef00b96 YARN-1707. Introduce APIs to add/remove/resize queues in the CapacityScheduler. Contributed by Carlo Curino and Subru Krishnan
(cherry picked from commit aac47fda7f)

Conflicts:
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
(cherry picked from commit eb3e40b833)
2014-10-06 10:21:04 -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
Karthik Kambatla b6ce0a1f69 YARN-2635. TestRM, TestRMRestart, TestClientToAMTokens should run with both CS and FS. (Wei Yan and kasha via kasha)
(cherry picked from commit 80d11eb68e)
2014-10-03 11:52:05 -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
Jian He 6f4c77409b YARN-2628. Capacity scheduler with DominantResourceCalculator carries out reservation even though slots are free. Contributed by Varun Vasudev
(cherry picked from commit 054f285526)
2014-10-02 15:16:07 -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
Jason Lowe 531c1fd00a YARN-2624. Resource Localization fails on a cluster due to existing cache directories. Contributed by Anubhav Dhoot
(cherry picked from commit 29f520052e)
2014-10-02 17:40:44 +00:00
Karthik Kambatla b6f4d1ef42 YARN-2254. TestRMWebServicesAppsModification should run against both CS and FS. (Zhihai Xu via kasha)
(cherry picked from commit 5e0b49da9c)
2014-10-02 10:15:41 -07:00
Jian He 61c7ceaf82 YARN-2617. Fixed NM to not send duplicate container status whose app is not running. Contributed by Jun Gong
(cherry picked from commit 3ef1cf187f)
2014-10-02 10:04:42 -07:00
junping_du 6483342a61 YARN-1979. TestDirectoryCollection fails when the umask is unusual. (Contributed by Vinod Kumar Vavilapalli and Tsuyoshi OZAWA)
(cherry picked from commit c7cee9b455)
2014-10-02 08:04:25 -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
Vinod Kumar Vavilapalli 3326fba382 YARN-1972. Added a secure container-executor for Windows. Contributed by Remus Rusanu.
commit ba7f31c2ee is the corresponding trunk commit, this is a slightly different patch for branch-2.
2014-10-01 17:07:21 -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
Zhijie Shen 4b50e23271 YARN-2630. Prevented previous AM container status from being acquired by the current restarted AM. Contributed by Jian He.
(cherry picked from commit 52bbe0f11b)
2014-10-01 15:39:36 -07:00
Vinod Kumar Vavilapalli 64bed0460e YARN-1063. Augmented Hadoop common winutils to have the ability to create containers as domain users. Contributed by Remus Rusanu.
Committed as a YARN patch even though all the code changes are in common.

(cherry picked from commit 5ca97f1e60)
2014-10-01 09:55:57 -07:00
Karthik Kambatla 3664659592 YARN-2179. Fix version in sharedcachemanager-pom. 2014-10-01 07:34:24 -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
Jian He 823f02725f YARN-2602. Fixed possible NPE in ApplicationHistoryManagerOnTimelineStore. Contributed by Zhijie Shen
(cherry picked from commit bbff96be48)
2014-09-30 16:44:44 -07:00
Karthik Kambatla 5a43b795b7 YARN-2594. Potential deadlock in RM when querying ApplicationResourceUsageReport. (Wangda Tan via kasha)
(cherry picked from commit 14d60dadc2)
2014-09-30 16:17:38 -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
Zhijie Shen d977205b9b YARN-2627. Added the info logs of attemptFailuresValidityInterval and number of previous failed attempts. Contributed by Xuan Gong.
(cherry picked from commit 9582a50176)
2014-09-30 12:59:34 -07: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
Arun C. Murthy 6a60fa279a Preparing to branch hadoop-2.6 2014-09-30 10:37:03 -07:00
Jonathan Eagles 9bc676aa6e YARN-2606. Application History Server tries to access hdfs before doing secure login (Mit Desai via jeagles) 2014-09-29 16:40:46 -05:00
Jason Lowe 4f6a367166 YARN-1769. CapacityScheduler: Improve reservations. Contributed by Thomas Graves
(cherry picked from commit 9c22065109)
2014-09-29 14:13:21 +00: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
Allen Wittenauer 6f5d555ad0 YARN-2372. There are Chinese Characters in the FairScheduler's document (Fengdong Yu via aw) 2014-09-26 12:47:26 -07:00
Allen Wittenauer f694b44036 YARN-2577. Clarify ACL delimiter and how to configure ACL groups only (Mikos Christine via aw) 2014-09-26 11:06:04 -07:00
Karthik Kambatla b923c291b4 YARN-2608. FairScheduler: Potential deadlocks in loading alloc files and clock access. (Wei Yan via kasha)
(cherry picked from commit c9811af09a3d3f9f2f1b86fc9d6f2763d3225e44)
2014-09-25 17:43:08 -07:00
Jason Lowe e4d46e5ff6 YARN-2523. ResourceManager UI showing negative value for "Decommissioned Nodes" field. Contributed by Rohith
(cherry picked from commit 8269bfa613)
2014-09-25 22:39:57 +00:00
Zhijie Shen 83926b3c57 YARN-2546. Made REST API for application creation/submission use numeric and boolean types instead of the string of them. Contributed by Varun Vasudev.
(cherry picked from commit 72b0881ca6)
2014-09-24 17:58:48 -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
Karthik Kambatla 30165d4cdd YARN-2596. TestWorkPreservingRMRestart fails with FairScheduler. (kasha)
(cherry picked from commit 39c87344e1)
2014-09-24 15:24:17 -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
Allen Wittenauer e5a531a8a7 YARN-2161. Fix build on macosx: YARN parts (Binglin Chang via aw) 2014-09-24 08:48:42 -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
Karthik Kambatla 024bcfdc0d YARN-2252. Intermittent failure of TestFairScheduler.testContinuousScheduling. (Ratandeep Ratti and kasha via kasha)
(cherry picked from commit f5578207d2)
2014-09-23 00:03:47 -07:00
Karthik Kambatla 8ba8521de5 YARN-1959. Fix headroom calculation in FairScheduler. (Anubhav Dhoot via kasha)
(cherry picked from commit 568d3dc2bb)
2014-09-22 23:51:45 -07:00
junping_du 34ee084c3d YARN-2584. TestContainerManagerSecurity fails on trunk. (Contributed by Jian He)
(cherry picked from commit a9a55db065)
2014-09-22 22:47:59 -07:00
Karthik Kambatla 3984435661 YARN-2539. FairScheduler: Set the default value for maxAMShare to 0.5. (Wei Yan via kasha)
(cherry picked from commit 43efdd30b5)
2014-09-22 16:10:20 -07:00
Karthik Kambatla 24a814771e YARN-2540. FairScheduler: Queue filters not working on scheduler page in RM UI. (Ashwin Shankar via kasha)
(cherry picked from commit 23e17ce0ff)
2014-09-22 15:42:36 -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
Jian He 3ce97a9efd YARN-1372. Ensure all completed containers are reported to the AMs across RM restart. Contributed by Anubhav Dhoot
(cherry picked from commit 0a641496c7)
2014-09-22 10:32:44 -07:00
Karthik Kambatla c1a3819a4d YARN-2453. TestProportionalCapacityPreemptionPolicy fails with FairScheduler. (Zhihai Xu via kasha)
(cherry picked from commit 9721e2c1fe)
2014-09-21 23:14:27 -07:00
Karthik Kambatla 1714af0618 YARN-2452. TestRMApplicationHistoryWriter fails with FairScheduler. (Zhihai Xu via kasha)
(cherry picked from commit c50fc92502)
2014-09-21 13:15:45 -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
Jian He 07981c8f60 YARN-2565. Fixed RM to not use FileSystemApplicationHistoryStore unless explicitly set. Contributed by Zhijie Shen
(cherry picked from commit 444acf8ea7)
2014-09-19 11:28:22 -07:00
Zhijie Shen 9333ee3068 YARN-2568. Fixed the potential test failures due to race conditions when RM work-preserving recovery is enabled. Contributed by Jian He.
(cherry picked from commit 6fe5c6b746)
2014-09-18 22:02:53 -07:00
Jian He 4cabeef931 YARN-2563. Fixed YarnClient to call getTimeLineDelegationToken only if the Token is not present. Contributed by Zhijie Shen
(cherry picked from commit eb92cc67df)
2014-09-18 14:41:14 -07:00
Jason Lowe d9273a9547 YARN-2561. MR job client cannot reconnect to AM after NM restart. Contributed by Junping Du
(cherry picked from commit a337f0e354)
2014-09-18 21:36:20 +00:00
Jason Lowe 44c22c3d8d YARN-2363. Submitted applications occasionally lack a tracking URL. Contributed by Jason Lowe
(cherry picked from commit 9ea7b6c063)
2014-09-18 20:15:46 +00: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 d61cdd66db YARN-2559. Fixed NPE in SystemMetricsPublisher when retrieving FinalApplicationStatus. Contributed by Zhijie Shen
(cherry picked from commit ee21b13cbd)
2014-09-17 21:44:49 -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
junping_du c6b9768b36 YARN-1250. Addendum
(cherry picked from commit 0e7d1dbf9a)
2014-09-16 18:30:31 -07:00
junping_du 1e1f4c2fdf YARN-1250. Generic history service should support application-acls. (Contributed by Zhijie Shen)
(cherry picked from commit 90a0c03f0a)
2014-09-16 18:30:06 -07:00
XuanGong 03fdbd7899 YARN-2557. Add a parameter "attempt_Failures_Validity_Interval" into
DistributedShell. Contributed by Xuan Gong
2014-09-16 11:01:26 -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
Jian He 1c3f837835 YARN-2529. Generic history service RPC interface doesn't work when service authorization is enabled. Contributed by Zhijie Shen
(cherry picked from commit 88e329fdfb)
2014-09-15 13:15:07 -07:00
cnauroth aaef460e7a YARN-2549. TestContainerLaunch fails due to classpath problem with hamcrest classes. Contributed by Chris Nauroth.
(cherry picked from commit 9d4ec97c95)
2014-09-15 11:54:41 -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
Zhijie Shen 99ccd842d8 YARN-2528. Relaxed http response split vulnerability protection for the origins header and made it accept multiple origins in CrossOriginFilter. Contributed by Jonathan Eagles.
(cherry picked from commit 98588cf044)
2014-09-12 21:35:49 -07:00
Jian He 09ad86d70c YARN-2542. Fixed NPE when retrieving ApplicationReport from TimeLineServer. Contributed by Zhijie Shen
(cherry picked from commit a0ad975ea1)
2014-09-12 15:28:10 -07:00
XuanGong add5ac6a73 YARN-2456. Possible livelock in CapacityScheduler when RM is recovering
apps. Contributed by Jian He
2014-09-12 15:24:02 -07:00
Jonathan Eagles 546a708acc YARN-2547. Cross Origin Filter throws UnsupportedOperationException upon destroy (Mit Desai via jeagles)
(cherry picked from commit 54e5794806)
2014-09-12 15:41:31 -05: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
Jason Lowe 7e69dc8771 YARN-2484. FileSystemRMStateStore#readFile/writeFile should close FSData(In|Out)putStream in final block. Contributed by Tsuyoshi OZAWA
(cherry picked from commit 78b048393a)
2014-09-12 14:10:51 +00:00
Zhijie Shen 466bdf79c5 YARN-2538. Added logs when RM sends roll-overed AMRMToken to AM. Contributed by Xuan Gong.
(cherry picked from commit 469ea3dcef)
2014-09-11 22:21:59 -07:00
Jian He f580586ab7 YARN-2541. Fixed ResourceManagerRest.apt.vm table syntax error. Contributed by Jian He
(cherry picked from commit 5633da2a01)
2014-09-11 21:31:56 -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
Karthik Kambatla d22cd065ed Update CHANGES.txt to set the release date for 2.5.1
(cherry picked from commit 17ffbe0864)
2014-09-11 17:36:06 -07:00
Karthik Kambatla 6f8b2a8e2e YARN-2534. FairScheduler: Potential integer overflow calculating totalMaxShare. (Zhihai Xu via kasha)
(cherry picked from commit c11ada5ea6)
2014-09-11 12:06:28 -07: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
XuanGong 5ca99b5297 Fix CHANGES.txt. Credit Mayank Bansal for his contributions on YARN-2459 2014-09-10 15:21:41 -07:00
Jian He f58a076dbc YARN-2158. Fixed TestRMWebServicesAppsModification#testSingleAppKill test failure. Contributed by Varun Vasudev
(cherry picked from commit cbfe26370b)
2014-09-10 12:48:40 -07:00
XUAN b91ef0c502 YARN-2459. RM crashes if App gets rejected for any reason and HA is enabled. Contributed by Jian He 2014-09-10 11:51:57 -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
Karthik Kambatla a19694f19d YARN-1458. FairScheduler: Zero weight can lead to livelock. (Zhihai Xu via kasha)
(cherry picked from commit 3072c83b38)
2014-09-10 08:33:31 -07:00
Karthik Kambatla fe9d1ee96f YARN-2526. SLS can deadlock when all the threads are taken by AMSimulators. (Wei Yan via kasha)
(cherry picked from commit 28d99db992)
2014-09-09 15:15:42 -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
Zhijie Shen 0974400b74 YARN-2507. Documented CrossOriginFilter configurations for the timeline server. Contributed by Jonathan Eagles.
(cherry picked from commit 56dc496a10)
2014-09-07 18:25:13 -07:00
Zhijie Shen f2a5a5d4aa YARN-2512. Allowed pattern matching for origins in CrossOriginFilter. Contributed by Jonathan Eagles.
(cherry picked from commit a092cdf32d)
2014-09-07 17:52:38 -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
Jonathan Eagles c47d72d8d2 YARN-2508. Cross Origin configuration parameters prefix are not honored (Mit Desai via jeagles)
(cherry picked from commit e6420fec0a)
2014-09-05 19:45:02 -05:00
Zhijie Shen 1e40cbba7f YARN-2511. Allowed all origins by default when CrossOriginFilter is enabled. Contributed by Jonathan Eagles.
(cherry picked from commit 51a4faf521)
2014-09-04 15:03:50 -07:00
Jason Lowe 04d325afff YARN-2431. NM restart: cgroup is not removed for reacquired containers. Contributed by Jason Lowe
(cherry picked from commit 3fa5f728c4)
2014-09-04 21:14:20 +00:00
Jonathan Eagles 7e76039278 YARN-2509. Enable Cross Origin Filter for timeline server only and not all Yarn servers (Mit Desai via jeagles)
(cherry picked from commit 91d45f0f01)
2014-09-04 11:54:43 -05:00
Karthik Kambatla 96a13c6d0c YARN-2394. FairScheduler: Configure fairSharePreemptionThreshold per queue. (Wei Yan via kasha)
(cherry picked from commit 1dcaba9a7a)
2014-09-03 10:27:47 -07:00
Karthik Kambatla 9855e884cb HADOOP-10956. Fix create-release script to include docs and necessary txt files. (kasha)
(cherry picked from commit ce0462129f)
2014-09-03 09:39:32 -07:00
Karthik Kambatla 7b9e763138 YARN-2395. FairScheduler: Preemption timeout should be configurable per queue. (Wei Yan via kasha)
(cherry picked from commit 0f34e6f387)
2014-08-30 01:22: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
Jason Lowe b61b78e5c6 YARN-2462. TestNodeManagerResync#testBlockNewContainerRequestsOnStartAndResync should have a test timeout. Contributed by Eric Payne
(cherry picked from commit 9ecda8f4c7e10d825b884e35c994d241b9fc8907)
2014-08-29 20:18:49 +00:00
Jian He 73a0e46657 YARN-2447. RM web service app submission doesn't pass secrets correctly. Contributed by Varun Vasudev
(cherry picked from commit c686aa3533)
2014-08-29 11:44:27 -07:00
Hitesh Shah aeb8667a06 YARN-2450. Fix typos in log messages. Contributed by Ray Chiang.
(cherry picked from commit 3de66011c2)
2014-08-29 11:18:54 -07:00
Zhijie Shen 77a4b014e6 YARN-2449. Fixed the bug that TimelineAuthenticationFilterInitializer is not automatically added when hadoop.http.filter.initializers is not configured. Contributed by Varun Vasudev.
(cherry picked from commit 4bd0194e6b)
2014-08-29 09:46:04 -07:00
Karthik Kambatla f237dee156 YARN-2405. NPE in FairSchedulerAppsBlock. (Tsuyoshi Ozawa via kasha)
(cherry picked from commit fa80ca49bd)
2014-08-28 23:22:04 -07:00
Jian He 2545ee6244 Add CHANGES.txt for YARN-2406.
(cherry picked from commit 9d68445710)
2014-08-28 21:59:59 -07:00
Jian 518ba11843 YARN-2406. Move RM recovery related proto to yarn_server_resourcemanager_recovery.proto. Contributed by Tsuyoshi OZAWA
(cherry picked from commit 7b3e27ab73)
2014-08-28 21:54:25 -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
Zhijie Shen 0c785f0824 YARN-2035. FileSystemApplicationHistoryStore should not make working dir when it already exists. Contributed by Jonathan Eagles.
(cherry picked from commit d778abf022)
2014-08-27 02:10:06 -07:00
Karthik Kambatla 9c43760e59 YARN-1326. RM should log using RMStore at startup time. (Tsuyoshi Ozawa via kasha)
(cherry picked from commit d16bfd1d0f)
2014-08-27 01:44:28 -07:00
Karthik Kambatla 2a3c8331fe Add a section for 2.5.1 in CHANGES.txt
(cherry picked from commit dc154ab86d)
2014-08-27 00:56:17 -07:00
Karthik Kambatla 21843592db YARN-2393. FairScheduler: Add the notion of steady fair share. (Wei Yan via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619852 13f79535-47bb-0310-9956-ffa450edef68
2014-08-22 16:00:57 +00:00
Jason Darrell Lowe fab20109ae svn merge -c 1619614 FIXES: YARN-2434. RM should not recover containers from previously failed attempt when AM restart is not enabled. Contributed by Jian He
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619616 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 22:45:35 +00: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
Karthik Kambatla bf0e9e894d YARN-1919. Potential NPE in EmbeddedElectorService#stop. (Tsuyoshi Ozawa via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619253 13f79535-47bb-0310-9956-ffa450edef68
2014-08-20 22:14:13 +00:00
Karthik Kambatla 8b8fe3a425 Set the release date for 2.5.0 in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619238 13f79535-47bb-0310-9956-ffa450edef68
2014-08-20 21:33:42 +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
Zhijie Shen 400f6131d4 YARN-2249. Avoided AM release requests being lost on work preserving RM restart. Contributed by Jian He.
svn merge --ignore-ancestry -c 1618972 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618973 13f79535-47bb-0310-9956-ffa450edef68
2014-08-19 20:40:37 +00:00
Jian He aeab638ce2 Merge r1618915 from trunk. YARN-2409. RM ActiveToStandBy transition missing stoping previous rmDispatcher. Contributed by Rohith
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618916 13f79535-47bb-0310-9956-ffa450edef68
2014-08-19 17:50:48 +00:00
Jian He f9c07bd3f9 Merge r1618542 from trunk. YARN-2411. Support simple user and group mappings to queues. Contributed by Ram Venkatesh
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618543 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 06:10:14 +00:00
Jian He 832cddebea Merge r1618294 from trunk. YARN-2389. Added functionality for schedulers to kill all applications in a queue. Contributed by Subramaniam Venkatraman Krishnan
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618295 13f79535-47bb-0310-9956-ffa450edef68
2014-08-16 00:02:17 +00:00
Jian He 24102a4e6c Merge r1618106 from trunk. YARN-2378. Added support for moving applications across queues in CapacityScheduler. Contributed by Subramaniam Venkatraman Krishnan
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618107 13f79535-47bb-0310-9956-ffa450edef68
2014-08-15 06:02:16 +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
Allen Wittenauer 178c37bd0d YARN-2197. Add a link to YARN CHANGES.txt in the left side of doc (Akira AJISAKA via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618069 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 21:48:27 +00:00
Zhijie Shen 54429fd08a YARN-2397. Avoided loading two authentication filters for RM and TS web interfaces. Contributed by Varun Vasudev.
svn merge --ignore-ancestry -c 1618054 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618055 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 21:19:21 +00:00
Zhijie Shen ce1df05977 YARN-2070. Made DistributedShell publish the short user name to the timeline server. Contributed by Robert Kanter.
svn merge --ignore-ancestry -c 1617837 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617839 13f79535-47bb-0310-9956-ffa450edef68
2014-08-13 21:09:07 +00:00
Zhijie Shen bed05477bd YARN-2277. Added cross-origin support for the timeline server web services. Contributed by Jonathan Eagles.
svn merge --ignore-ancestry -c 1617832 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617834 13f79535-47bb-0310-9956-ffa450edef68
2014-08-13 20:31:18 +00:00
Karthik Kambatla e6799af4d3 YARN-1370. Fair scheduler to re-populate container allocation state. (Anubhav Dhoot via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617647 13f79535-47bb-0310-9956-ffa450edef68
2014-08-13 01:45:07 +00:00
Karthik Kambatla d0c3ca05de YARN-2399. FairScheduler: Merge AppSchedulable and FSSchedulerApp into FSAppAttempt. (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617623 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 23:04:06 +00:00
Zhijie Shen b2f0fd8961 YARN-2317. Updated the document about how to write YARN applications. Contributed by Li Lu.
svn merge --ignore-ancestry -c 1617594 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617597 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 21:39:17 +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
Junping Du e8d20ad77c Merge r1617448 from trunk: YARN-1337. Recover containers upon nodemanager restart. (Contributed by Jason Lowe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617450 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 11:02:38 +00:00
Jian He 285267b2dc Merge r1617341 from trunk. YARN-2138. Cleaned up notifyDone* APIs in RMStateStore. Contributed by Varun Saxena
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617342 13f79535-47bb-0310-9956-ffa450edef68
2014-08-11 18:25:51 +00:00
Xuan Gong b7958c5df5 YARN-2400: Addendum fix for TestAMRestart failure. Contributed by Jian He
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617334 13f79535-47bb-0310-9956-ffa450edef68
2014-08-11 17:43:19 +00:00
Karthik Kambatla 66cc9c110b YARN-2361. RMAppAttempt state machine entries for KILLED state has duplicate event entries. (Zhihai Xu via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617191 13f79535-47bb-0310-9956-ffa450edef68
2014-08-11 01:44:53 +00:00
Karthik Kambatla b4ea46a111 YARN-2337. ResourceManager sets ClientRMService in RMContext multiple times. (Zhihai Xu via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617184 13f79535-47bb-0310-9956-ffa450edef68
2014-08-11 00:16:15 +00:00
Junping Du 4003d96860 Merge r1617055 from trunk: YARN-2302. Refactor TimelineWebServices. (Contributed by Zhijie Shen)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617056 13f79535-47bb-0310-9956-ffa450edef68
2014-08-10 07:25:49 +00:00
Xuan Gong 775c42d3ea YARN-2400. Fixed TestAMRestart fails intermittently. Contributed by Jian He
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617029 13f79535-47bb-0310-9956-ffa450edef68
2014-08-09 23:32:08 +00:00
Zhijie Shen af83e57e82 YARN-1954. Added waitFor to AMRMClient(Async). Contributed by Tsuyoshi Ozawa.
svn merge --ignore-ancestry -c 1617002 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617003 13f79535-47bb-0310-9956-ffa450edef68
2014-08-09 18:48:15 +00:00
Karthik Kambatla a6611f2bd1 YARN-2026. Fair scheduler: Consider only active queues for computing fairshare. (Ashwin Shankar via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616916 13f79535-47bb-0310-9956-ffa450edef68
2014-08-09 02:12:52 +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
Karthik Kambatla a0bf22947d YARN-2352. FairScheduler: Collect metrics on duration of critical methods that affect performance. (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616785 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 14:40:46 +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
Zhijie Shen c6c4a74bef YARN-2288. Made persisted data in LevelDB timeline store be versioned. Contributed by Junping Du.
svn merge --ignore-ancestry -c 1616540 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616541 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 17:03:58 +00:00
Zhijie Shen f55c04a94b YARN-2388. Fixed TestTimelineWebServices failure due to HADOOP-10791. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1616405 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616406 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 05:38:58 +00:00
Karthik Kambatla 290d4e3ec8 YARN-2359. Application hangs when it fails to launch AM container. (Zhihai Xu via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616376 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 00:08:27 +00:00
Jian He 72d90780c2 Merge r1616302 from trunk. YARN-2374. Fixed TestDistributedShell#testDSShell failure due to hostname dismatch. Contributed by Varun Vasudev
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616305 13f79535-47bb-0310-9956-ffa450edef68
2014-08-06 19:00:26 +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 fc5bb235f2 Merge r1615550 from trunk: YARN-1354. Recover applications upon nodemanager restart. (Contributed by Jason Lowe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615554 13f79535-47bb-0310-9956-ffa450edef68
2014-08-04 13:35:49 +00:00
Junping Du 0ad7bfb121 Merge r1615469 from trunk: YARN-2370. Fix comment in o.a.h.y.server.resourcemanager.schedulerAppSchedulingInfo (Contributed by Wenwu Peng)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615471 13f79535-47bb-0310-9956-ffa450edef68
2014-08-04 01:19:29 +00:00
Jian He 2417753952 Merge r1615270 from trunk. YARN-2343. Improve NMToken expire exception message. Contributed by Li Lu
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615271 13f79535-47bb-0310-9956-ffa450edef68
2014-08-01 23:46:26 +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 f52092be46 YARN-2347. Consolidated RMStateVersion and NMDBSchemaVersion into Version in yarn-server-common. Contributed by Junping Du.
svn merge --ignore-ancestry -c 1614838 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614839 13f79535-47bb-0310-9956-ffa450edef68
2014-07-31 09:31:22 +00:00
Jian He ea94980477 Merge r1614538 from trunk. YARN-2354. DistributedShell may allocate more containers than client specified after AM restarts. Contributed by Li Lu
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614539 13f79535-47bb-0310-9956-ffa450edef68
2014-07-30 04:00:54 +00:00
Karthik Kambatla d23e7d4acb YARN-2328. FairScheduler: Verify update and continuous scheduling threads are stopped when the scheduler is stopped. (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614435 13f79535-47bb-0310-9956-ffa450edef68
2014-07-29 17:46:58 +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
Karthik Kambatla c2b0f62155 YARN-1726. ResourceSchedulerWrapper broken due to AbstractYarnScheduler. (Wei Yan via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613550 13f79535-47bb-0310-9956-ffa450edef68
2014-07-26 01:55:03 +00:00
Aaron Myers 5d0172fdf5 YARN-1796. container-executor shouldn't require o-r permissions. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613549 13f79535-47bb-0310-9956-ffa450edef68
2014-07-26 01:52:25 +00:00
Jian He eeb024c034 Merge r1613515 from trunk. YARN-2211. Persist AMRMToken master key in RMStateStore for RM recovery. Contributed by Xuan Gong
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613516 13f79535-47bb-0310-9956-ffa450edef68
2014-07-25 20:44:30 +00:00
Karthik Kambatla 913833abaf YARN-2335. Annotate all hadoop-sls APIs as @Private. (Wei Yan via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613480 13f79535-47bb-0310-9956-ffa450edef68
2014-07-25 17:33:42 +00:00
Karthik Kambatla 6cca715334 YARN-2214. FairScheduler: preemptContainerPreCheck() in FSParentQueue delays convergence towards fairness. (Ashwin Shankar via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613464 13f79535-47bb-0310-9956-ffa450edef68
2014-07-25 16:33:55 +00:00
Devarajulu K 087a2acb8b YARN-1342. Recover container tokens upon nodemanager restart. Contributed by Jason Lowe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612997 13f79535-47bb-0310-9956-ffa450edef68
2014-07-24 05:02:46 +00:00
Zhijie Shen 01b9b40d97 YARN-2300. Improved the documentation of the sample requests for RM REST API - submitting an app. Contributed by Varun Vasudev.
svn merge --ignore-ancestry -c 1612981 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612982 13f79535-47bb-0310-9956-ffa450edef68
2014-07-24 03:14:37 +00:00
Jason Darrell Lowe 0315458f2e svn merge -c 1612950 FIXES: YARN-2147. client lacks delegation token exception details when application submit fails. Contributed by Chen He
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612955 13f79535-47bb-0310-9956-ffa450edef68
2014-07-23 21:46:46 +00:00
Sanford Ryza aeb12ce4bf YARN-2313. Livelock can occur in FairScheduler when there are lots of running apps (Tsuyoshi Ozawa via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612770 13f79535-47bb-0310-9956-ffa450edef68
2014-07-23 05:01:35 +00:00
Karthik Kambatla a24001475c YARN-2273. NPE in ContinuousScheduling thread when we lose a node. (Wei Yan via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612721 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 22:45:05 +00:00
Karthik Kambatla ef4e2fdbb5 YARN-2131. Addendum2: Document -format-state-store. Add a way to format the RMStateStore. (Robert Kanter via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612635 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 18:11:43 +00:00
Jian He 82cd20f485 Merge r1612626 from trunk. YARN-2295. Refactored DistributedShell to use public APIs of protocol records. Contributed by Li Lu
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612629 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 17:50:44 +00:00
Zhijie Shen 7b4f8a74ec YARN-2319. Made the MiniKdc instance start/close before/after the class of TestRMWebServicesDelegationTokens. Contributed by Wenwu Peng.
svn merge --ignore-ancestry -c 1612588 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612590 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 15:17:13 +00:00
Junping Du 1ad0a08c20 Merge r1612565 from trunk: YARN-2242. Addendum patch. Improve exception information on AM launch crashes. (Contributed by Li Lu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612566 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 13:11:51 +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
Junping Du f6b932fe48 Merget r1612449 from trunk: YARN-2013. The diagnostics is always the ExitCodeException stack when the container crashes. (Contributed by Tsuyoshi OZAWA)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612450 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 03:04:22 +00:00
Karthik Kambatla 10a82e54da YARN-2131. Addendum. Add a way to format the RMStateStore. (Robert Kanter via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612444 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 01:33:17 +00:00
Jason Darrell Lowe 3fc91db99f svn merge -c 1612411 FIXES: YARN-2321. NodeManager web UI can incorrectly report Pmem enforcement. Contributed by Leitao Guo
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612414 13f79535-47bb-0310-9956-ffa450edef68
2014-07-21 22:08:12 +00:00
Jason Darrell Lowe f57b6946d7 svn merge -c 1612285 FIXES: YARN-2045. Data persisted in NM should be versioned. Contributed by Junping Du
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612289 13f79535-47bb-0310-9956-ffa450edef68
2014-07-21 14:49:38 +00:00
Sanford Ryza 28aae5c8c0 YARN-2323. FairShareComparator creates too many Resource objects (Hong Zhiguo via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612188 13f79535-47bb-0310-9956-ffa450edef68
2014-07-21 05:00:56 +00:00
Karthik Kambatla fcb0fe0548 YARN-2244. FairScheduler missing handling of containers for unknown application attempts. (Anubhav Dhoot via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611841 13f79535-47bb-0310-9956-ffa450edef68
2014-07-19 00:20:16 +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
Junping Du f81b04df50 Merge r1611512 from trunk: YARN-1341. Recover NMTokens upon nodemanager restart. (Contributed by Jason Lowe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611514 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 23:38:36 +00:00
Jian He ad43e5bd1a Merge r1611240 from trunk. Addendum patch for YARN-2219
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611241 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 03:33:12 +00:00
Vinod Kumar Vavilapalli 63e374060e YARN-2219. Changed ResourceManager to avoid AMs and NMs getting exceptions after RM recovery but before scheduler learns about apps and app-attempts. Contributed by Jian He.
svn merge --ignore-ancestry -c 1611222 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611223 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 00:15:28 +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
Vinayakumar B 9ff82dc855 Merged revision(s) 1610964 from hadoop/common/trunk:
HADOOP-9921. daemon scripts should remove pid file on stop call after stop or process is found not running ( Contributed by Vinayakumar B)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1610965 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 10:49:04 +00:00
Mayank Bansal 8260d48df9 YARN-1408 Preemption caused Invalid State Event: ACQUIRED at KILLED and caused a task timeout for 30mins. (Sunil G via mayank)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1610884 13f79535-47bb-0310-9956-ffa450edef68
2014-07-15 23:44:48 +00:00
Vinod Kumar Vavilapalli 9463cbd1ec YARN-2233. Implemented ResourceManager web-services to create, renew and cancel delegation tokens. Contributed by Varun Vasudev.
svn merge --ignore-ancestry -c 1610876 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1610877 13f79535-47bb-0310-9956-ffa450edef68
2014-07-15 23:00:48 +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
Vinod Kumar Vavilapalli 66af4bf54f YARN-2260. Fixed ResourceManager's RMNode to correctly remember containers when nodes resync during work-preserving RM restart. Contributed by Jian He.
svn merge --ignore-ancestry -c 1610557 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1610559 13f79535-47bb-0310-9956-ffa450edef68
2014-07-14 23:32:36 +00:00
Karthik Kambatla c9c1ee9a9c YARN-2274. FairScheduler: Add debug information about cluster capacity, availability and reservations. (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1610542 13f79535-47bb-0310-9956-ffa450edef68
2014-07-14 21:37:36 +00:00
Zhijie Shen 9cc4e93fcd YARN-2022 Preempting an Application Master container can be kept as least priority when multiple applications are marked for preemption by ProportionalCapacityPreemptionPolicy (Sunil G via mayank)
svn merge --ignore-ancestry -c 1607227 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609615 13f79535-47bb-0310-9956-ffa450edef68
2014-07-11 02:48:34 +00:00
Jian He 349b0e3cfb Merge r1609594 from trunk. Moved few YARN entries in CHANGES.txt from 2.5 to 2.6
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609595 13f79535-47bb-0310-9956-ffa450edef68
2014-07-11 00:10:05 +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
Karthik Kambatla 80c26f5c5d YARN-2224. Fix CHANGES.txt. This was committed as YARN-2204 before.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609583 13f79535-47bb-0310-9956-ffa450edef68
2014-07-10 22:18:54 +00:00
Jian He d90b47f8bc Merge r1609561 from trunk. YARN-2181. Added preemption info to logs and RM web UI. Contributed by Wangda Tan
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609562 13f79535-47bb-0310-9956-ffa450edef68
2014-07-10 20:05:20 +00:00
Karthik Kambatla 02f72d7a6b YARN-2131. Add a way to format the RMStateStore. (Robert Kanter via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609280 13f79535-47bb-0310-9956-ffa450edef68
2014-07-09 20:03:18 +00:00
Jian He b05080053e Merge r1609254 from trunk. YARN-1366. Changed AMRMClient to re-register with RM and send outstanding requests back to RM on work-preserving RM restart. Contributed by Rohith
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609255 13f79535-47bb-0310-9956-ffa450edef68
2014-07-09 18:28:00 +00:00
Zhijie Shen 077278fa9e YARN-2158. Improved assertion messages of TestRMWebServicesAppsModification. Contributed by Varun Vasudev.
svn merge --ignore-ancestry -c 1608667 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608668 13f79535-47bb-0310-9956-ffa450edef68
2014-07-08 06:09:09 +00:00
Jian He 77a94b73b2 Merge r1608334 from trunk. YARN-1367. Changed NM to not kill containers on NM resync if RM work-preserving restart is enabled. Contributed by Anubhav Dhoot
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608336 13f79535-47bb-0310-9956-ffa450edef68
2014-07-07 04:40:36 +00:00
Sanford Ryza 92de5cae9b YARN-2250. FairScheduler.findLowestCommonAncestorQueue returns null when queues not identical (Krisztian Horvath via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607873 13f79535-47bb-0310-9956-ffa450edef68
2014-07-04 15:17:14 +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
Junping Du 0d50c2f697 Merge r1607655 from trunk: YARN-2242. Improve exception information on AM launch crashes. (Contributed by Li Lu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607656 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 14:19:18 +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
Karthik Kambatla 8380254440 Preparing for release 2.6.0
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607539 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 05:56:01 +00:00
Vinod Kumar Vavilapalli 8126744506 YARN-2022. Fixing CHANGES.txt to be correctly placed.
svn merge --ignore-ancestry -c 1607486 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607487 13f79535-47bb-0310-9956-ffa450edef68
2014-07-02 21:52:13 +00:00
Vinod Kumar Vavilapalli 0ac01d7cfc YARN-2232. Fixed ResourceManager to allow DelegationToken owners to be able to cancel their own tokens in secure mode. Contributed by Varun Vasudev.
svn merge --ignore-ancestry -c 1607484 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607485 13f79535-47bb-0310-9956-ffa450edef68
2014-07-02 21:37:20 +00:00
Karthik Kambatla 99bced167b YARN-2241. ZKRMStateStore: On startup, show nicer messages if znodes already exist. (Robert Kanter via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607475 13f79535-47bb-0310-9956-ffa450edef68
2014-07-02 20:36:09 +00:00
Steve Loughran 4cfc90590c YARN-2065 AM cannot create new containers after restart
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607440 13f79535-47bb-0310-9956-ffa450edef68
2014-07-02 18:34:09 +00:00
Karthik Kambatla 14858cd6f7 YARN-2204. Explicitly enable vmem check in TestContainersMonitor#testContainerKillOnMemoryOverflow. (Anubhav Dhoot via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607233 13f79535-47bb-0310-9956-ffa450edef68
2014-07-02 02:07:48 +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
Xuan Gong c2eaeadaab TestRMApplicationHistoryWriter sometimes fails in trunk. Contributed by Zhijie Shen
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606834 13f79535-47bb-0310-9956-ffa450edef68
2014-06-30 16:51:04 +00:00
Jian He a385b77df7 Merge r1606557 from trunk. YARN-2052. Embedded an epoch number in container id to ensure the uniqueness of container id after RM restarts. Contributed by Tsuyoshi OZAWA
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606558 13f79535-47bb-0310-9956-ffa450edef68
2014-06-29 18:26:08 +00:00
Jian He c63e3f027b Merge r1606407 from trunk. YARN-614. Changed ResourceManager to not count disk failure, node loss and RM restart towards app failures. Contributed by Xuan Gong
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606408 13f79535-47bb-0310-9956-ffa450edef68
2014-06-28 23:41:51 +00:00
Zhijie Shen 705a5cede9 YARN-2201. Made TestRMWebServicesAppsModification be independent of the changes on yarn-default.xml. Contributed by Varun Vasudev.
svn merge --ignore-ancestry -c 1606285 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606286 13f79535-47bb-0310-9956-ffa450edef68
2014-06-28 03:33:46 +00:00
Jason Darrell Lowe dfe7cbb050 svn merge -c 1606265 FIXES: YARN-2104. Scheduler queue filter failed to work because index of queue column changed. Contributed by Wangda Tan
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606266 13f79535-47bb-0310-9956-ffa450edef68
2014-06-27 23:13:14 +00:00
Karthik Kambatla 94ac07e4a5 YARN-2204. Addendum patch. TestAMRestart#testAMRestartWithExistingContainers assumes CapacityScheduler. (Robert Kanter via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606170 13f79535-47bb-0310-9956-ffa450edef68
2014-06-27 18:18:12 +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 8317fd5de6 YARN-2171. Improved CapacityScheduling to not lock on nodemanager-count when AMs heartbeat in. Contributed by Jason Lowe.
svn merge --ignore-ancestry -c 1605616 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605617 13f79535-47bb-0310-9956-ffa450edef68
2014-06-25 21:57:28 +00:00
Karthik Kambatla 7e252055bf YARN-2204. TestAMRestart#testAMRestartWithExistingContainers assumes CapacityScheduler. (Robert Kanter via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605550 13f79535-47bb-0310-9956-ffa450edef68
2014-06-25 18:54:15 +00:00
Jian He 63940d6e13 Merge r1605263 from trunk. YARN-1365. Changed ApplicationMasterService to allow an app to re-register after RM restart. Contributed by Anubhav Dhoot
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605264 13f79535-47bb-0310-9956-ffa450edef68
2014-06-25 04:45:50 +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
Thomas Graves 1c2052e200 YARN-2072. RM/NM UIs and webservices are missing vcore information. (Nathan Roberts via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605166 13f79535-47bb-0310-9956-ffa450edef68
2014-06-24 19:41:56 +00:00
Karthik Kambatla e9cf83174a YARN-2109. Fix TestRM to work with both schedulers. (Anubhav Dhoot via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605144 13f79535-47bb-0310-9956-ffa450edef68
2014-06-24 17:34:29 +00:00