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

1598 Commits

Author SHA1 Message Date
Vinod Kumar Vavilapalli 87e880b580 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:04:37 -08:00
Karthik Kambatla 36993e39d0 YARN-2010. Handle app-recovery failures gracefully. (Jian He and Karthik Kambatla via kasha) 
(cherry picked from commit b2cd269802)
 2014-11-04 17:49:56 -08:00
Karthik Kambatla d76756dfe1 Adding release 2.5.2 to CHANGES.txt 
(cherry picked from commit 4de56d27fb)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
 2014-11-04 16:52:56 -08:00
Zhijie Shen 1550617e48 YARN-2752. Made ContainerExecutor append "nice -n" arg only when priority adjustment flag is set. Contributed by Xuan Gong. 
(cherry picked from commit e06c23a6c9)
 2014-11-04 15:54:28 -08:00
Vinod Kumar Vavilapalli 0b73606b1c 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:41:21 -08:00
Vinod Kumar Vavilapalli f2ef8c7b48 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:46:05 -08:00
Vinod Kumar Vavilapalli c205841d49 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:20:01 -08:00
Vinod Kumar Vavilapalli dd82a1eb75 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:51:30 -08:00
Jason Lowe 2098c68acb YARN-2730. DefaultContainerExecutor runs only one localizer at a time. Contributed by Siqi Li 
(cherry picked from commit 6157ace547)
 2014-11-03 20:40:02 +00:00
Zhijie Shen 3e41828639 YARN-2785. Fixed intermittent TestContainerResourceUsage failure. Contributed by Varun Vasudev. 
(cherry picked from commit 27715ec63b)
 2014-11-02 15:24:07 -08:00
Vinod Kumar Vavilapalli 5a0aac5506 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:34:11 -07:00
Zhijie Shen 5492370a4c YARN-2711. Fixed TestDefaultContainerExecutor#testContainerLaunchError failure on Windows. Contributed by Varun Vasudev. 
(cherry picked from commit 1cd088fd9d)
 2014-10-31 17:51:03 -07:00
Jason Lowe 239c4cc572 YARN-2707. Potential null dereference in FSDownload. Contributed by Gera Shegalov 
(cherry picked from commit 7bc179f9f5)
 2014-10-31 22:55:06 +00:00
Vinod Kumar Vavilapalli f71d940e42 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:34:07 -07:00
Xuan aa13977001 YARN-2701. Addendum patch. Potential race condition in startLocalizer when using LinuxContainerExecutor. Contributed by Xuan Gong 2014-10-31 14:39:49 -07:00
Jian He a859adcc23 YARN-2770. Added functionality to renew/cancel TimeLineDelegationToken. Contributed by Zhijie Shen 
(cherry picked from commit 1b4be91866)
 2014-10-31 13:17:45 -07:00
Vinod Kumar Vavilapalli 16511ef404 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:20:08 -07:00
Vinod Kumar Vavilapalli a3f032031d 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:50 -07:00
Vinod Kumar Vavilapalli 85fcdaf8d8 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:03:02 -07:00
Steve Loughran b69ebef49e YARN-2677 registry punycoding of usernames doesn't fix all usernames to be DNS-valid (stevel) 2014-10-30 22:32:08 +00:00
Jason Lowe 773ba8b606 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:12:35 +00:00
Zhijie Shen 2f62716441 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:15:54 -07:00
Zhijie Shen dcb484fac0 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:47:05 -07:00
Jian He e181498a67 YARN-2503. Added node lablels in web UI. Contributed by Wangda Tan 
(cherry picked from commit d5e0a09721)
(cherry picked from commit 720de7eb4c)
 2014-10-28 18:02:13 -07:00
Zhijie Shen ae62fe2ebd 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:13:31 -07:00
Xuan 126d1b9089 YARN-2758. Update TestApplicationHistoryClientService to use the new generic history store. Contributed by Zhijie Shen 2014-10-28 13:32:42 -07:00
Xuan 615af9e454 YARN-2279. Add UTs to cover timeline server authentication. Contributed by Zhijie Shen 2014-10-28 11:20:46 -07:00
Karthik Kambatla f5361a8354 YARN-2760. Remove 'experimental' from FairScheduler docs. (Harsh J via kasha) 
(cherry picked from commit ade3727ecb)
 2014-10-28 08:50:04 -07:00
Jian He 8d4c93aabf YARN-2502. Changed DistributedShell to support node labels. Contributed by Wangda Tan 
(cherry picked from commit f6b963fdfc)
 2014-10-27 20:14:30 -07:00
Vinod Kumar Vavilapalli 0af8cc9ca2 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:51:20 -07:00
Jian He ba1e549145 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:59 -07:00
Xuan 55c5612caf YARN-2726. CapacityScheduler should explicitly log when an accessible label has no capacity. Contributed by Wangda Tan 2014-10-27 10:30:09 -07:00
Zhijie Shen ab7a21569c 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 13:00:26 -07:00
Vinod Kumar Vavilapalli 259db7a726 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:29:06 -07:00
Xuan cccfc27e0d YARN-2723. Fix rmadmin -replaceLabelsOnNode does not correctly parse port. Contributed by Naganarasimha G R 2014-10-25 12:49:05 -07:00
Jian He c8d48d2981 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:38 -07:00
Jian He 728cc2394c 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:49:19 -07:00
Zhijie Shen a41371e173 YARN-2703. Added logUploadedTime into LogValue for better display. Contributed by Xuan Gong. 
(cherry picked from commit f81dc3f995)
 2014-10-24 14:13:28 -07:00
Zhijie Shen 38fa39aa17 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:16:44 -07:00
Zhijie Shen 09e422302f YARN-2209. Replaced AM resync/shutdown command with corresponding exceptions and made related MR changes. Contributed by Jian He. 
(cherry picked from commit 0f3b6900be)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
 2014-10-23 22:18:27 -07:00
Zhijie Shen 78efd4fd5c YARN-2732. Fixed syntax error in SecureContainer.apt.vm. Contributed by Jian He. 
(cherry picked from commit b94b8b30f2)
 2014-10-22 18:42:27 -07:00
Jian He 29d0164ee7 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)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
 2014-10-22 16:22:08 -07:00
Jian He a057552468 YARN-2682. Updated WindowsSecureContainerExecutor to not use DefaultContainerExecutor#getFirstApplicationDir and use getWorkingDir() instead. Contributed by Zhihai Xu 
(cherry picked from commit 0fd0ebae64)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java
 2014-10-22 16:19:40 -07:00
Vinod Kumar Vavilapalli e282805f1c 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)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
 2014-10-22 16:10:49 -07:00
Steve Loughran ada23f3dd3 YARN-2700 TestSecureRMRegistryOperations failing on windows: auth problems 2014-10-22 21:12:52 +01:00
Steve Loughran 8fdff5b791 YARN-2692 ktutil test hanging on some machines/ktutil versions (stevel) 2014-10-22 14:34:57 +01:00
Zhijie Shen b1ca12bc0b 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:53:27 -07:00
Vinod Kumar Vavilapalli a1c5d4c51f 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:11:14 -07:00
Zhijie Shen 7df8cbdd0f YARN-2709. Made timeline client getDelegationToken API retry if ConnectException happens. Contributed by Li Lu. 
(cherry picked from commit b2942762d7)
 2014-10-21 16:09:23 -07:00
cnauroth 8727f9e1b0 YARN-2720. Windows: Wildcard classpath variables not expanded against resources contained in archives. Contributed by Craig Welch. 
(cherry picked from commit 6637e3cf95)
(cherry picked from commit a066134277)
 2014-10-21 12:36:43 -07:00
Jason Lowe 413fe4cb02 YARN-90. NodeManager should identify failed disks becoming good again. Contributed by Varun Vasudev 
(cherry picked from commit 6f2028bd15)

Conflicts:

	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDirectoryCollection.java
 2014-10-21 17:43:22 +00:00
Zhijie Shen fcdeba204c YARN-2717. Avoided duplicate logging when container logs are not found. Contributed by Xuan Gong. 
(cherry picked from commit 171f2376d2)
 2014-10-20 22:24:19 -07:00
Jian He 852ffea84e Missing file for YARN-1879 
(cherry picked from commit 4a78a75228)
 2014-10-20 21:15:30 -07:00
Jian He 23b4af488e Missing file for YARN-2701 
(cherry picked from commit 4fa1fb3193)
 2014-10-20 20:53:28 -07:00
Jian He c7db30522c YARN-2701. Potential race condition in startLocalizer when using LinuxContainerExecutor. Contributed by Xuan Gong 
(cherry picked from commit 2839365f23)
 2014-10-20 20:53:28 -07:00
Vinod Kumar Vavilapalli debb3686d3 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.
(cherry picked from commit 3326fba382)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
 2014-10-20 20:47:49 -07:00
Zhijie Shen 2af7f48625 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:43:03 -07:00
Zhijie Shen 6d78dc3ee4 YARN-2673. Made timeline client put APIs retry if ConnectException happens. Contributed by Li Lu. 
(cherry picked from commit 89427419a3)

Conflicts:
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
 2014-10-20 12:31:33 -07:00
Vinod Kumar Vavilapalli 88b7e5ca65 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:09:02 -07:00
Vinod Kumar Vavilapalli 24b0529a9f YARN-2676. Enhanced Timeline auth-filter to support proxy users. Contributed by Zhijie Shen. 
(cherry picked from commit 39063cd36f)
 2014-10-17 22:04:14 -07:00
Vinod Kumar Vavilapalli ce42210651 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:34 -07:00
Jian He 4d03915be9 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:45 -07:00
Jian He b7504f0394 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:29 -07:00
Vinod Kumar Vavilapalli 778fbcd5d3 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:49 -07:00
Jian He 6be8330606 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:27 -07:00
Steve Loughran b0a72f354b YARN-2689 TestSecureRMRegistryOperations failing on windows: secure ZK won't start 2014-10-16 14:21:38 -07:00
Vinod Kumar Vavilapalli 8a09fdccb3 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:49:06 -07:00
Vinod Kumar Vavilapalli fe80fd5e88 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:35:34 -07:00
Jian He bd45dba807 YARN-2312. Deprecated old ContainerId#getId API and updated MapReduce to use ContainerId#getContainerId instead. Contributed by Tsuyoshi OZAWA 
(cherry picked from commit f93d2ea27e)
 2014-10-15 15:31:57 -07:00
Zhijie Shen eb055eadd7 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:58:12 -07:00
Zhijie Shen e71fa82ee5 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:39:06 -07:00
Karthik Kambatla e6102b1828 YARN-2566. DefaultContainerExecutor should pick a working directory randomly. (Zhihai Xu via kasha) 
(cherry picked from commit cc93e7e683)

Conflicts:
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java
 2014-10-13 16:42:47 -07:00
Jian He da3e84beb9 Missing Changes.txt for YARN-2308 
(cherry picked from commit 178bc505da)
 2014-10-13 14:21:01 -07:00
Jian He 29496c9be2 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:57 -07:00
Jason Lowe 9d73c1b15f 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:34:28 +00:00
Zhijie Shen 6da637ec12 YARN-2651. Spun off LogRollingInterval from LogAggregationContext. Contributed by Xuan Gong. 
(cherry picked from commit 4aed2d8e91)
 2014-10-13 10:56:22 -07:00
Jason Lowe eb5faa161a 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:46:14 +00:00
Steve Loughran 752f724d52 YARN-2668 yarn-registry JAR won't link against ZK 3.4.5. (stevel) 2014-10-11 18:32:47 -07:00
Vinod Kumar Vavilapalli 8dacf89b3e YARN-2501. Enhanced AMRMClient library to support requests against node labels. Contributed by Wangda Tan. 
(cherry picked from commit a5ec3d0809)
 2014-10-10 19:59:30 -07:00
Vinod Kumar Vavilapalli bb6c79f76c YARN-2494. Added NodeLabels Manager internal API and implementation. Contributed by Wangda Tan. 
(cherry picked from commit db7f165319)
 2014-10-10 11:46:10 -07:00
Zhijie Shen 16d7144337 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:18:24 -07:00
cnauroth 281041a57e YARN-2662. TestCgroupsLCEResourcesHandler leaks file descriptors. Contributed by Chris Nauroth. 
(cherry picked from commit d3afd730ac)
(cherry picked from commit b81641a310)
 2014-10-09 22:49:00 -07:00
Zhijie Shen ce704583a7 YARN-2671. Fix the Jira number in the change log. 
(cherry picked from commit 5b12df6587)
 2014-10-09 21:00:38 -07:00
Zhijie Shen 647874206c YARN-2617. Fixed ApplicationSubmissionContext to still set resource for backward compatibility. Contributed by Wangda Tan. 
(cherry picked from commit e532ed8faa)
 2014-10-09 18:01:13 -07:00
Vinod Kumar Vavilapalli 967c758373 YARN-2544. Added admin-API objects for using node-labels. Contributed by Wangda Tan. 
(cherry picked from commit 596702a025)
 2014-10-09 15:47:51 -07:00
Zhijie Shen a4522e90f6 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:03:03 -07:00
Mayank Bansal cf0ad82c5a YARN-2598 GHS should show N/A instead of null for the inaccessible information (Zhijie Shen via mayank) 2014-10-09 11:39:25 -07:00
Vinod Kumar Vavilapalli ad7baad21e YARN-2493. Added user-APIs for using node-labels. Contributed by Wangda Tan. 
(cherry picked from commit 180afa2f86)
 2014-10-09 11:27:49 -07:00
Steve Loughran 088ae9c5bf YARN-913 service registry: YARN-2652 add hadoop-yarn-registry package under hadoop-yarn 2014-10-08 12:54:37 -07:00
Jian He 7ec65c8617 YARN-2649. Fixed TestAMRMRPCNodeUpdates test failure. Contributed by Ming Ma 
(cherry picked from commit e16e25ab1b)
 2014-10-08 11:03:28 -07:00
Jian He 5ff984f33f 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:46 -07:00
Jian He efc482d1f7 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:52:05 -07:00
Jian He 73a1b77223 YARN-2615. Changed ClientToAMTokenIdentifier/RM(Timeline)DelegationTokenIdentifier to use protobuf as payload. Contributed by Junping Du 
(cherry picked from commit ea26cc0b4a)

Conflicts:
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestClientToAMTokens.java
 2014-10-06 10:52:20 -07:00
Chris Douglas 0b2dedc42d 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
(cherry picked from commit ebf4aae60f7a641ac7406e27d43528cace20d4ff)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
 2014-10-06 10:30:04 -07:00
subru 114f09226e 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)
(cherry picked from commit fb5e9df7fd)
 2014-10-06 10:29:14 -07:00
subru bf4394e160 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)
(cherry picked from commit ae0f16ccc8)
 2014-10-06 10:29:14 -07:00
subru d244b2ae3a 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)
(cherry picked from commit cbfbdf60d6)
 2014-10-06 10:29:13 -07:00
subru 8e92b3ec9d 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)
(cherry picked from commit fec639cda1)
 2014-10-06 10:29:13 -07:00
carlo curino 56972123ff 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)
(cherry picked from commit 6bfdaf06c4)
 2014-10-06 10:29:13 -07:00
carlo curino 4ee027b9d6 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)
(cherry picked from commit 6a3c167175)
 2014-10-06 10:29:13 -07:00
subru 056b7f5799 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)
(cherry picked from commit 63250ef9d6)
 2014-10-06 10:29:13 -07:00
subru f4522fd987 YARN-1708. Public YARN APIs for creating/updating/deleting reservations. 
(cherry picked from commit 3f2e3b275b)
(cherry picked from commit c9266df404)
(cherry picked from commit 3a167056d1)
 2014-10-06 10:29:13 -07:00
carlo curino 950da32b4c 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)
(cherry picked from commit b81f571e60)
 2014-10-06 10:29:12 -07:00
carlo curino 5ac08c5398 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)
(cherry picked from commit cf5ef00b96)
 2014-10-06 10:29:12 -07:00
Vinod Kumar Vavilapalli 3542eef75b 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:38 -07:00
Jian He f97252e7e5 YARN-2562. Changed ContainerId#toString() to be more readable. Contributed by Tsuyoshi OZAWA 
(cherry picked from commit eb6ce5e97c)
 2014-10-03 11:05:17 -07:00
Jian He 65cf007ab9 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:47 -07:00
Zhijie Shen 20fb25cde2 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:58:32 -07:00
Jason Lowe 95757899d4 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:45:12 +00:00
Jian He 116eb0bdc3 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:06:58 -07:00
Vinod Kumar Vavilapalli ae7a3235be 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)
 2014-10-01 18:02:03 -07:00
junping_du 8871bf37fe YARN-2613. Support retry in NMClient for rolling-upgrades. (Contributed by Jian He) 2014-10-01 17:11:59 -07:00
Zhijie Shen 8531f93d2d 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:41:12 -07:00
Jian He 8c13a7484c YARN-2602. Fixed possible NPE in ApplicationHistoryManagerOnTimelineStore. Contributed by Zhijie Shen 
(cherry picked from commit bbff96be48)
 2014-09-30 16:45:30 -07:00
Karthik Kambatla 785e672e0b YARN-2594. Potential deadlock in RM when querying ApplicationResourceUsageReport. (Wangda Tan via kasha) 
(cherry picked from commit 14d60dadc2)
 2014-09-30 16:19:38 -07:00
Karthik Kambatla c206265b7e YARN-2610. Hamlet should close table tags. (Ray Chiang via kasha) 
(cherry picked from commit f7743dd07d)
 2014-09-30 15:50:13 -07:00
Jason Lowe ab3cab0b53 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:42:53 +00:00
Zhijie Shen b19f668f5d 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 13:01:13 -07:00
Arun C. Murthy d3e61c96b5 Branching for hadoop-2.6 2014-09-30 10:38:47 -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