Commit Graph

864 Commits

Author SHA1 Message Date
Junping Du d8c7ee1b53 YARN-41. The RM should handle the graceful shutdown of the NM. Contributed by Devaraj K.
(cherry picked from commit d7e7f6aa03)
2015-06-04 05:00:32 -07:00
Xuan 3f0573b059 YARN-3749. We should make a copy of configuration when init
MiniYARNCluster with multiple RMs. Contributed by Chun Chen

(cherry picked from commit 5766a04428)
2015-06-03 17:21:48 -07:00
Zhijie Shen 2fcd3fe6ba Revert "YARN-1462. Made RM write application tags to timeline server and exposed them to users via generic history web UI and REST API. Contributed by Xuan Gong."
This reverts commit 4e2ed34d20.
2015-06-03 14:16:51 -07:00
Zhijie Shen 4e2ed34d20 YARN-1462. Made RM write application tags to timeline server and exposed them to users via generic history web UI and REST API. Contributed by Xuan Gong.
(cherry picked from commit a9f986bc5a41ab74171da1076d10e83c5adc284f)
2015-05-30 21:06:32 -07:00
Vinod Kumar Vavilapalli 148412bb30 Fixed more FilesSystemRMStateStore issues. Contributed by Vinod Kumar Vavilapalli.
(cherry picked from commit 9acd24fec4)
2015-05-28 15:27:01 -07:00
Wangda Tan 8857cba72e YARN-3647. RMWebServices api's should use updated api from CommonNodeLabelsManager to get NodeLabel object. (Sunil G via wangda)
(cherry picked from commit ec0a852a37)
2015-05-27 13:15:55 -07:00
Wangda Tan 0728a86b3a YARN-3686. CapacityScheduler should trim default_node_label_expression. (Sunil G via wangda)
(cherry picked from commit cdbd66be11)
2015-05-26 16:00:17 -07:00
Jian He 5e7be094ec YARN-3632. Ordering policy should be allowed to reorder an application when demand changes. Contributed by Craig Welch
(cherry picked from commit 10732d515f)
2015-05-26 12:02:36 -07:00
Tsuyoshi Ozawa cf5c1adf4f YARN-2336. Fair scheduler's REST API returns a missing '[' bracket JSON for deep queue tree. Contributed by Kenji Kikushima and Akira Ajisaka.
(cherry picked from commit 9a3d617b63)
2015-05-26 19:08:01 +09:00
Karthik Kambatla e8ac88d4fe YARN-3675. FairScheduler: RM quits when node removal races with continuous-scheduling on the same node. (Anubhav Dhoot via kasha)
(cherry picked from commit a8b50e46737c11936ba72c427da69b2365a07aac)
2015-05-21 13:39:40 -07:00
Jian He 521378ffa3 YARN-3609. Load node labels from storage inside RM serviceStart. Contributed by Wangda Tan
(cherry picked from commit 8966d42179)
2015-05-20 16:30:44 -07:00
Wangda Tan b5ba6979b7 YARN-3583. Support of NodeLabel object instead of plain String in YarnClient side. (Sunil G via wangda)
(cherry picked from commit 563eb1ad2a)
(cherry picked from commit b0d22b0c606fad6b4ab5443c0aed07c829b46726)
2015-05-19 17:37:24 -07:00
Wangda Tan 7b97f049ee YARN-3565. NodeHeartbeatRequest/RegisterNodeManagerRequest should use NodeLabel object instead of String. (Naganarasimha G R via wangda)
(cherry picked from commit b37da52a1c)
2015-05-19 16:35:23 -07:00
Jason Lowe ce64720516 YARN-2421. RM still allocates containers to an app in the FINISHING state. Contributed by Chang Li
(cherry picked from commit f7e051c431)
2015-05-15 22:10:16 +00:00
Vinod Kumar Vavilapalli ad3196e016 Fixing HDFS state-store. Contributed by Arun Suresh.
(cherry picked from commit 9a2a9553ee)
2015-05-14 16:57:03 -07:00
Junping Du bc13c7d84b YARN-3505. Node's Log Aggregation Report with SUCCEED should not cached in RMApps. Contributed by Xuan Gong.
(cherry picked from commit 15ccd967ee)
2015-05-14 10:59:48 -07:00
Wangda Tan 3a11baa15f YARN-3362. Add node label usage in RM CapacityScheduler web UI. (Naganarasimha G R via wangda)
(cherry picked from commit 0e85044e26)
2015-05-13 17:01:23 -07:00
Wangda Tan d49262a172 YARN-3521. Support return structured NodeLabel objects in REST API (Sunil G via wangda)
(cherry picked from commit 7f19e7a254)
2015-05-13 13:43:57 -07:00
Wangda Tan 3df8880bbe YARN-2921. Fix MockRM/MockAM#waitForState sleep too long. (Tsuyoshi Ozawa via wangda)
(cherry picked from commit 341a476812)
2015-05-13 13:07:05 -07:00
Karthik Kambatla 3cf4f24a9f YARN-3395. FairScheduler: Trim whitespaces when using username for queuename. (Zhihai Xu via kasha)
(cherry picked from commit a60f78e98e)
2015-05-09 15:41:49 -07:00
Karthik Kambatla e8dd0bc4fd YARN-1287. Consolidate MockClocks. (Sebastian Wong and Anubhav Dhoot via kasha)
(cherry picked from commit 70fb37cd79)
2015-05-09 14:35:13 -07:00
Karthik Kambatla a7d8f21630 YARN-3271. FairScheduler: Move tests related to max-runnable-apps from TestFairScheduler to TestAppRunnability. (nijel via kasha)
(cherry picked from commit 2fb44c8aaf)
2015-05-08 16:40:36 -07:00
Jian He d817fbb34d YARN-2918. RM should not fail on startup if queue's configured labels do not exist in cluster-node-labels. Contributed by Wangda Tan
(cherry picked from commit f489a4ec96)
2015-05-07 17:36:24 -07:00
Akira Ajisaka 67bebabb21 YARN-3577. Misspelling of threshold in log4j.properties for tests. Contributed by Brahma Reddy Battula.
(cherry picked from commit 995f1b5831fc33042de90267a689333dc110c4c3)
2015-05-07 13:33:17 +09:00
Vinod Kumar Vavilapalli d127dd64a7 YARN-3385. Fixed a race-condition in ResourceManager's ZooKeeper based state-store to avoid crashing on duplicate deletes. Contributed by Zhihai Xu.
(cherry picked from commit 4c7b9b6abe)
2015-05-06 17:52:13 -07:00
Junping Du 79babc4bd2 YARN-3580. [JDK8] TestClientRMService.testGetLabelsToNodes fails. Contributed by Robert Kanter.
(cherry picked from commit 31b627b2a8)
2015-05-06 16:51:56 -07:00
Jian He eb0c6d2ee7 YARN-3343. Increased TestCapacitySchedulerNodeLabelUpdate#testNodeUpdate timeout. Contributed by Rohith Sharmaks
(cherry picked from commit e4c3b52c89)
2015-05-05 11:34:11 -07:00
Jian He f71c49c5e3 YARN-2725. Added test cases of retrying creating znode in ZKRMStateStore. Contributed by Tsuyoshi Ozawa
(cherry picked from commit d701acc9c6)
2015-05-04 16:17:01 -07:00
Gera Shegalov 9325dd863c YARN-2893. AMLaucher: sporadic job failures due to EOFException in readTokenStorageStream. (Zhihai Xu via gera)
(cherry picked from commit f8204e241d)
2015-05-01 19:04:48 -07:00
Wangda Tan 100b41add6 YARN-3564. Fix TestContainerAllocation.testAMContainerAllocationWhenDNSUnavailable fails randomly. (Jian He via wangda)
(cherry picked from commit e2e8f77118)
2015-04-30 11:06:47 -07:00
Jian He a7a5737bc4 YARN-3533. Test: Fix launchAM in MockRM to wait for attempt to be scheduled. Contributed by Anubhav Dhoot
(cherry picked from commit 4c1af156ae)
2015-04-29 14:51:04 -07:00
tgraves 2e13183f60 YARN-3517. RM web ui for dumping scheduler logs should be for admins only (Varun Vasudev via tgraves)
(cherry picked from commit 2e215484bd)
2015-04-29 21:27:16 +00:00
Karthik Kambatla 4cc38df7de YARN-3485. FairScheduler headroom calculation doesn't consider maxResources for Fifo and FairShare policies. (kasha)
(cherry picked from commit 8f82970e0c)
2015-04-28 21:03:12 -07:00
Wangda Tan 8ee632caa7 YARN-2740. Fix NodeLabelsManager to properly handle node label modifications when distributed node label configuration enabled. (Naganarasimha G R via wangda)
(cherry picked from commit db1b674b50)
2015-04-27 16:42:36 -07:00
Jian He 9bf09b334d YARN-2498. Respect labels in preemption policy of capacity scheduler for inter-queue preemption. Contributed by Wangda Tan
(cherry picked from commit d497f6ea2b)
2015-04-24 17:03:57 -07:00
Jian He 0583c27fb1 YARN-3387. Previous AM's container completed status couldn't pass to current AM if AM and RM restarted during the same time. Contributed by Sandflee
(cherry picked from commit d03dcb9635)
2015-04-24 12:14:17 -07:00
Vinod Kumar Vavilapalli 0ec6e7e7f5 YARN-3413. Changed Nodelabel attributes (like exclusivity) to be settable only via addToClusterNodeLabels but not changeable at runtime. (Wangda Tan via vinodkv)
(cherry picked from commit f5fe35e297)
2015-04-23 11:25:30 -07:00
Wangda Tan 9692bcc2c8 YARN-3319. Implement a FairOrderingPolicy. (Craig Welch via wangda)
(cherry picked from commit 395205444e)
2015-04-23 10:48:00 -07:00
tgraves 1cd2fcf25d YARN-3434. Interaction between reservations and userlimit can result in significant ULF violation
(cherry picked from commit 189a63a719)
2015-04-23 14:49:24 +00:00
Junping Du 8de6045842 New parameter of CLI for decommissioning node gracefully in RMAdmin CLI. Contributed by Devaraj K
(cherry picked from commit fad9d7e85b)
2015-04-22 10:08:16 -07:00
Jian He dc4698bb33 YARN-3494. Expose AM resource limit and usage in CS QueueMetrics. Contributed by Rohith Sharmaks
(cherry picked from commit bdd90110e6)
2015-04-21 20:34:30 -07:00
Wangda Tan 8a9599fb9e YARN-3410. YARN admin should be able to remove individual application records from RMStateStore. (Rohith Sharmaks via wangda) 2015-04-21 17:47:27 -07:00
Wangda Tan d0ea982e64 YARN-3463. Integrate OrderingPolicy Framework with CapacityScheduler. (Craig Welch via wangda)
(cherry picked from commit 44872b76fc)
2015-04-20 17:13:01 -07:00
Wangda Tan e7cbecddc3 YARN-3493. RM fails to come up with error "Failed to load/recover state" when mem settings are changed. (Jian He via wangda)
(cherry picked from commit f65eeb412d)
2015-04-17 17:15:16 -07:00
Jian He 57eb07d34b YARN-2696. Queue sorting in CapacityScheduler should consider node label. Contributed by Wangda Tan
(cherry picked from commit d573f09fb9)
2015-04-17 13:37:34 -07:00
Junping Du b244701fad YARN-1402. Update related Web UI and CLI with exposing client API to check log aggregation status. Contributed by Xuan Gong.
(cherry picked from commit 1db355a875)
2015-04-17 13:20:27 -07:00
Jian He 42cf8e0554 YARN-3021. YARN's delegation-token handling disallows certain trust setups to operate properly over DistCp. Contributed by Yongjun Zhang
(cherry picked from commit bb6dde68f1)
2015-04-16 19:44:32 -07:00
Jian He 6fed2c2a79 YARN-3354. Add node label expression in ContainerTokenIdentifier to support RM recovery. Contributed by Wangda Tan
(cherry picked from commit 1b89a3e173)
2015-04-15 14:03:29 -07:00
Tsuyoshi Ozawa e977247f3e YARN-3326. Support RESTful API for getLabelsToNodes. Contributed by Naganarasimha G R.
(cherry picked from commit e48cedc663)
2015-04-15 14:04:24 -05:00
Wangda Tan 89a7c98436 YARN-3318. Create Initial OrderingPolicy Framework and FifoOrderingPolicy. (Craig Welch via wangda)
(cherry picked from commit 5004e75332)
2015-04-15 09:57:52 -07:00
Jian He 9ebbf1bfce YARN-3361. CapacityScheduler side changes to support non-exclusive node labels. Contributed by Wangda Tan
(cherry picked from commit 0fefda645b)
2015-04-14 11:46:35 -07:00
Jian He 81bbee6852 YARN-3266. RMContext#inactiveNodes should have NodeId as map key. Contributed by Chengbing Liu
(cherry picked from commit b46ee1e7a3)
2015-04-14 11:31:42 -07:00
Jian He d58f5c8894 YARN-3472. Fixed possible leak in DelegationTokenRenewer#allTokens. Contributed by Rohith Sharmaks
(cherry picked from commit a1afbc48b5)
2015-04-13 14:07:51 -07:00
Junping Du 0891de0712 YARN-1376. NM need to notify the log aggregation status to RM through Node heartbeat. Contributed by Xuan Gong.
(cherry picked from commit 92431c9617)
2015-04-10 08:58:07 -07:00
Xuan f5b49160d9 YARN-3293. Track and display capacity scheduler health metrics in web
UI. Contributed by Varun Vasudev

(cherry picked from commit afa5d4715a)
2015-04-09 23:40:02 -07:00
Vinod Kumar Vavilapalli 1ff3fd33ed YARN-3055. Fixed ResourceManager's DelegationTokenRenewer to not stop token renewal of applications part of a bigger workflow. Contributed by Daryn Sharp.
(cherry picked from commit 9c5911294e)
2015-04-09 13:10:06 -07:00
Robert Kanter 354d2c75cf YARN-2429. TestAMRMTokens.testTokenExpiry fails Intermittently with error message:Invalid AMRMToken (zxu via rkanter)
(cherry picked from commit 99b08a748e)
2015-04-06 14:11:50 -07:00
Tsuyoshi Ozawa d2b2d76cce TestFairScheduler.testContinuousScheduling fails Intermittently. Contributed by Zhihai Xu.
(cherry picked from commit 53959e69f7)
2015-04-06 20:19:47 +09:00
Sandy Ryza 6286cfd711 YARN-3415. Non-AM containers can be counted towards amResourceUsage of a fairscheduler queue (Zhihai Xu via Sandy Ryza) 2015-04-02 13:57:53 -07:00
Xuan e26b6e55e9 YARN-3248. Display count of nodes blacklisted by apps in the web UI.
Contributed by Varun Vasudev

(cherry picked from commit 4728bdfa15)
2015-04-01 04:20:37 -07:00
Karthik Kambatla 85c420a4d4 YARN-3412. RM tests should use MockRM where possible. (kasha)
(cherry picked from commit 79f7f2aabf)
2015-03-31 09:22:16 -07:00
Wangda Tan cba4ed1678 YARN-2495. Allow admin specify labels from each NM (Distributed configuration for node label). (Naganarasimha G R via wangda)
(cherry picked from commit 2a945d24f7)
2015-03-30 12:05:54 -07:00
Karthik Kambatla 75591e4131 YARN-3241. FairScheduler handles invalid queue names inconsistently. (Zhihai Xu via kasha)
(cherry picked from commit 2bc097cd14)
2015-03-23 13:24:22 -07:00
cnauroth 342c525eaa YARN-3336. FileSystem memory leak in DelegationTokenRenewer.
(cherry picked from commit 6ca1f12024)
2015-03-23 10:46:06 -07:00
Jian He 9c494cedaf YARN-3345. Add non-exclusive node label API. Contributed by Wangda Tan
(cherry picked from commit e1feb4ea1a)
2015-03-20 19:05:14 -07:00
Jian He a3a155a34e YARN-3356. Capacity Scheduler FiCaSchedulerApp should use ResourceUsage to track used-resources-by-label. Contributed by Wangda Tan
(cherry picked from commit 586348e4cb)
2015-03-20 13:54:46 -07:00
Devaraj K a888dac344 YARN-3357. Move TestFifoScheduler to FIFO package. Contributed by Rohith
Sharmaks.

(cherry picked from commit 93d0f4acc8)
2015-03-19 12:18:08 +05:30
Jian He 15ebacf03a YARN-3273. Improve scheduler UI to facilitate scheduling analysis and debugging. Contributed Rohith Sharmaks
(cherry picked from commit 658097d6da)
2015-03-17 21:31:20 -07:00
Tsuyoshi Ozawa b00b216a91 YARN-3205. FileSystemRMStateStore should disable FileSystem Cache to avoid get a Filesystem with an old configuration. Contributed by Zhihai Xu.
(cherry picked from commit 3bc72cc16d)
2015-03-18 11:53:40 +09:00
Jian He ab34e6975b YARN-3305. Normalize AM resource request on app submission. Contributed by Rohith Sharmaks
(cherry picked from commit 968425e9f7)
2015-03-17 13:50:44 -07:00
Jian He 1c601e492f YARN-3243. CapacityScheduler should pass headroom from parent to children to make sure ParentQueue obey its capacity limits. Contributed by Wangda Tan.
(cherry picked from commit 487374b7fe)
2015-03-17 10:25:07 -07:00
Tsuyoshi Ozawa a20427d339 YARN-3349. Treat all exceptions as failure in TestFSRMStateStore#testFSRMStateStoreClientRetry. Contributed by Zhihai Xu.
(cherry picked from commit 7522a643fa)
2015-03-17 08:10:12 +09:00
Vinod Kumar Vavilapalli 53aa3a4d1f YARN-3154. Added additional APIs in LogAggregationContext to avoid aggregating running logs of application when rolling is enabled. Contributed by Xuan Gong.
(cherry picked from commit 863079bb87)
2015-03-12 13:33:42 -07:00
Zhijie Shen 426535007b YARN-1884. Added nodeHttpAddress into ContainerReport and fixed the link to NM web page. Contributed by Xuan Gong.
(cherry picked from commit 85f6d67fa7)
2015-03-11 19:39:46 -07:00
Jason Lowe ef3d9bdf6b YARN-3275. CapacityScheduler: Preemption happening on non-preemptable queues. Contributed by Eric Payne
(cherry picked from commit 27e8ea820f)
2015-03-06 22:45:09 +00:00
Jian He a5f3fb4dc1 YARN-1809. Synchronize RM and TimeLineServer Web-UIs. Contributed by Zhijie Shen and Xuan Gong
(cherry picked from commit 95bfd087dc)
2015-03-05 21:27:03 -08:00
Karthik Kambatla 0d62e94887 YARN-3242. Asynchrony in ZK-close can lead to ZKRMStateStore watcher receiving events for old client. (Zhihai Xu via kasha)
(cherry picked from commit 8d88691d16)
2015-03-04 19:49:21 -08:00
Karthik Kambatla 721d7b5741 YARN-3231. FairScheduler: Changing queueMaxRunningApps interferes with pending jobs. (Siqi Li via kasha)
(cherry picked from commit 22426a1c9f)
2015-03-04 18:07:33 -08:00
Jian He 888a445638 YARN-3222. Fixed NPE on RMNodeImpl#ReconnectNodeTransition when a node is reconnected with a different port. Contributed by Rohith Sharmaks
(cherry picked from commit b2f1ec312e)
2015-03-03 16:28:55 -08:00
Wangda Tan 0a502c665b YARN-3272. Surface container locality info in RM web UI (Jian He via wangda)
(cherry picked from commit e17e5ba9d7)
2015-03-03 11:49:45 -08:00
Vinod Kumar Vavilapalli 253c78548b YARN-3265. Fixed a deadlock in CapacityScheduler by always passing a queue's available resource-limit from the parent queue. Contributed by Wangda Tan.
(cherry picked from commit 14dd647c55)
2015-03-02 17:54:01 -08:00
Wangda Tan 0b0be0056b YARN-3262. Surface application outstanding resource requests table in RM web UI. (Jian He via wangda)
(cherry picked from commit edcecedc1c)
2015-02-27 16:14:35 -08:00
Tsuyoshi Ozawa 79f73f4613 YARN-2820. Retry in FileSystemRMStateStore when FS's operations fail due to IOException. Contributed by Zhihai Xu.
(cherry picked from commit 01a1621930)
2015-02-28 00:57:01 +09:00
Devaraj K f83d2e4410 YARN-3256. TestClientToAMTokens#testClientTokenRace is not running against
all Schedulers even when using ParameterizedSchedulerTestBase. Contributed
by Anubhav Dhoot.

(cherry picked from commit 0d4296f0e0)
2015-02-26 15:47:32 +05:30
Tsuyoshi Ozawa 13e213c41a YARN-3247. TestQueueMappings should use CapacityScheduler explicitly. Contributed by Zhihai Xu.
(cherry picked from commit 6cbd9f1113)
2015-02-25 11:23:34 +09:00
Xuan 0ca974d0b0 YARN-2797. TestWorkPreservingRMRestart should use
ParametrizedSchedulerTestBase. Contributed by Karthik Kambatla

(cherry picked from commit fe7a302473)
2015-02-21 19:19:08 -08:00
Jason Lowe 3e8dfd1299 YARN-3194. RM should handle NMContainerStatuses sent by NM while registering if NM is Reconnected node. Contributed by Rohith
(cherry picked from commit a64dd3d24b)
2015-02-20 15:12:08 +00:00
Jian He eaeaf80d39 YARN-933. Fixed InvalidStateTransitonException at FINAL_SAVING state in RMApp. Contributed by Rohith Sharmaks
(cherry picked from commit c0d9b93953)
2015-02-19 15:43:14 -08:00
Wangda Tan cd5eb9c1de YARN-3076. Add API/Implementation to YarnClient to retrieve label-to-node mapping (Varun Saxena via wangda)
(cherry picked from commit d49ae725d5)
2015-02-19 11:01:47 -08:00
Jian He b8fe1a747e YARN-1514. Utility to benchmark ZKRMStateStore#loadState for RM HA. Contributed by Tsuyoshi OZAWA
(cherry picked from commit 1c03376300)
2015-02-18 16:34:42 -08:00
Jian He 8f06eaa251 YARN-3132. RMNodeLabelsManager should remove node from node-to-label mapping when node becomes deactivated. Contributed by Wangda Tan
(cherry picked from commit f5da5566d9)
2015-02-18 11:52:28 -08:00
Jian He b5d6f76c6a YARN-3104. Fixed RM to not generate new AMRM tokens on every heartbeat between rolling and activation. Contributed by Jason Lowe
(cherry picked from commit 18297e0972)
2015-02-12 16:03:12 -08:00
Jian He 1be2d64ddd YARN-3124. Fixed CS LeafQueue/ParentQueue to use QueueCapacities to track capacities-by-label. Contributed by Wangda Tan
(cherry picked from commit 18a594257e)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
2015-02-12 15:01:14 -08:00
Xuan cac6fe217a YARN-3151. On Failover tracking url wrong in application cli for KILLED
application. Contributed by Rohith

(cherry picked from commit 65c69e296e)
2015-02-11 21:21:06 -08:00
Zhijie Shen fd75b8c9ca YARN-2246. Made the proxy tracking URL always be http(s)://proxy addr:port/proxy/<appId> to avoid duplicate sections. Contributed by Devaraj K.
(cherry picked from commit d5855c0e46)
2015-02-10 15:29:09 -08:00
Zhijie Shen 24d4d933f7 YARN-3100. Made YARN authorization pluggable. Contributed by Jian He.
(cherry picked from commit 23bf6c7207)
2015-02-09 20:37:58 -08:00
Jian He 6146680955 YARN-3094. Reset timer for liveness monitors after RM recovery. Contributed by Jun Gong
(cherry picked from commit 0af6a99a3f)
2015-02-09 13:47:33 -08:00
Karthik Kambatla 1cb1c8b615 YARN-2990. FairScheduler's delay-scheduling always waits for node-local and rack-local delays, even for off-rack-only requests. (kasha)
(cherry picked from commit 7e42088abf)
2015-02-08 22:48:29 -08:00
Jason Lowe 61fdd862be YARN-3143. RM Apps REST API can return NPE or entries missing id and other fields. Contributed by Jason Lowe
(cherry picked from commit da2fb2bc46)
2015-02-06 21:51:49 +00:00
Jian He 3ddafaa7c8 YARN-2694. Ensure only single node label specified in ResourceRequest. Contributed by Wangda Tan
(cherry picked from commit c1957fef29)
2015-02-06 11:34:56 -08:00
Jason Lowe ebdd88ec81 YARN-1582. Capacity Scheduler: add a maximum-allocation-mb setting per queue. Contributed by Thomas Graves
(cherry picked from commit 69c8a7f45b)
2015-02-05 19:30:06 +00:00
Sandy Ryza 84df660af4 YARN-3101. In Fair Scheduler, fix canceling of reservations for exceeding max share (Anubhav Dhoot via Sandy Ryza) 2015-02-05 09:45:17 -08:00
Zhijie Shen 3ab3caa9ea YARN-2543. Made resource usage be published to the timeline server too. Contributed by Naganarasimha G R.
(cherry picked from commit e5b56e2af6)
2015-02-03 17:35:40 -08:00
Wangda Tan 205e15c4a3 YARN-3075. NodeLabelsManager implementation to retrieve label to node mapping (Varun Saxena via wangda)
(cherry picked from commit 5bd984691b)
2015-02-03 12:55:25 -08:00
Jian He c0b1311a93 YARN-3098. Created common QueueCapacities class in Capacity Scheduler to track capacities-by-labels of queues. Contributed by Wangda Tan
(cherry picked from commit 21d80b3dd9)
2015-02-03 11:43:40 -08:00
Jason Lowe 3828fb5fab YARN-3085. Application summary should include the application type. Contributed by Rohith
(cherry picked from commit a761bf8726)
2015-02-03 14:57:25 +00:00
Jian He 4941b8f30d YARN-3077. Fixed RM to create zk root path recursively. Contributed by Chun Chen
(cherry picked from commit 054a947989)
2015-01-30 17:35:26 -08:00
Jian He cabf97ae4f YARN-3099. Capacity Scheduler LeafQueue/ParentQueue should use ResourceUsage to track used-resources-by-label. Contributed by Wangda Tan
(cherry picked from commit 86358221fc)
2015-01-30 15:16:22 -08:00
Wangda Tan 58d7d1efc6 YARN-3079. Scheduler should also update maximumAllocation when updateNodeResource. (Zhihai Xu via wangda)
(cherry picked from commit 7882bc0f14)
2015-01-28 21:56:17 -08:00
Wangda Tan 4718af4352 YARN-2932. Add entry for preemptable status (enabled/disabled) to scheduler web UI and queue initialize/refresh logging. (Eric Payne via wangda)
(cherry picked from commit 18741adf97)
2015-01-27 15:37:02 -08:00
Jian He 61b4116b4b YARN-3092. Created a common ResourceUsage class to track labeled resource usages in Capacity Scheduler. Contributed by Wangda Tan
(cherry picked from commit 6f9fe76918)
2015-01-26 15:38:27 -08:00
Tsuyoshi Ozawa 25f2cf8a4e YARN-2800. Remove MemoryNodeLabelsStore and add a way to enable/disable node labels feature. Contributed by Wangda Tan.
(cherry picked from commit 24aa462673)
2015-01-23 20:37:26 +09:00
Wangda Tan ef6fc24dfb YARN-2933. Capacity Scheduler preemption policy should only consider capacity without labels temporarily. Contributed by Mayank Bansal
(cherry picked from commit 0a2d3e717d)
2015-01-19 16:57:17 -08:00
Junping Du 7cddec31d7 YARN-3064. TestRMRestart/TestContainerResourceUsage/TestNodeManagerResync failure with allocation timeout. (Contributed by Jian He)
(cherry picked from commit 5d1cca34fa)
2015-01-16 00:10:36 -08:00
Jian He 4931600030 YARN-2637. Fixed max-am-resource-percent calculation in CapacityScheduler when activating applications. Contributed by Craig Welch
(cherry picked from commit c53420f583)
2015-01-13 17:32:36 -08:00
Robert Kanter e5059b91bb YARN-3027. Scheduler should use totalAvailable resource from node instead of availableResource for maxAllocation. (adhoot via rkanter)
(cherry picked from commit ae7bf31fe1)
2015-01-12 10:48:45 -08:00
Zhijie Shen 8a81312062 YARN-2427. Added the API of moving apps between queues in RM web services. Contributed by Varun Vasudev.
(cherry picked from commit 60103fca04)
2015-01-06 14:39:44 -08:00
Karthik Kambatla 7adffad2bb YARN-2881. [YARN-2574] Implement PlanFollower for FairScheduler. (Anubhav Dhoot via kasha)
(cherry picked from commit 0c4b112677)
2015-01-06 04:42:55 +05:30
Zhijie Shen c6cf748985 YARN-2958. Made RMStateStore not update the last sequence number when updating the delegation token. Contributed by Varun Saxena.
(cherry picked from commit 562a701945)
2015-01-05 13:35:09 -08:00
Tsuyoshi Ozawa c116743bdd YARN-2922. ConcurrentModificationException in CapacityScheduler's LeafQueue. Contributed by Rohith Sharmaks.
(cherry picked from commit ddc5be48fc)
2015-01-05 00:11:01 +09:00
Karthik Kambatla 798ab51289 YARN-2998. Abstract out scheduler independent PlanFollower components. (Anubhav Dhoot via kasha)
(cherry picked from commit e7257acd8a)
2014-12-30 19:55:50 -08:00
Jian He cde5bfe3ec YARN-2987. Fixed ClientRMService#getQueueInfo to check against queue and app ACLs. Contributed by Varun Saxena
(cherry picked from commit e2351c7ae2)
2014-12-30 17:16:05 -08:00
Jian He 143e48c25a YARN-2493. Added node-labels page on RM web UI. Contributed by Wangda Tan
(cherry picked from commit b7442bf92e)
2014-12-30 16:49:59 -08:00
Jian He 60530a6c4f YARN-2946. Fixed potential deadlock in RMStateStore. Contributed by Rohith Sharmaks
(cherry picked from commit 4f18018b7a)
2014-12-23 22:15:28 -08:00
Jian He e3a54b1b8b YARN-2837. Support TimeLine server to recover delegation token when restarting. Contributed by Zhijie Shen
(cherry picked from commit 149512a837)
2014-12-23 18:26:37 -08:00
Jian He 8b398a66ca YARN-2340. Fixed NPE when queue is stopped during RM restart. Contributed by Rohith Sharmaks
(cherry picked from commit 0d89859b51)
2014-12-22 21:55:06 -08:00
Jian He 411836b74c YARN-2920. Changed CapacityScheduler to kill containers on nodes where node labels are changed. Contributed by Wangda Tan
(cherry picked from commit fdf042dfff)
2014-12-22 16:52:15 -08:00
Karthik Kambatla 2abec14ec6 YARN-2975. FSLeafQueue app lists are accessed without required locks. (kasha)
(cherry picked from commit 24ee9e3431)
2014-12-20 12:20:29 -08:00
Jian He 9180d11b3b YARN-2952. Fixed incorrect version check in StateStore. Contributed by Rohith Sharmaks
(cherry picked from commit 808cba3821)
2014-12-19 16:56:55 -08:00
Karthik Kambatla 8ee40a1580 YARN-2738. [YARN-2574] Add FairReservationSystem for FairScheduler. (Anubhav Dhoot via kasha)
(cherry picked from commit a22ffc3188)
2014-12-19 15:38:27 -08:00
Jason Lowe 173664d70f YARN-2964. RM prematurely cancels tokens for jobs that submit jobs (oozie). Contributed by Jian He
(cherry picked from commit 0402bada19)
2014-12-18 23:31:11 +00:00
Steve Loughran a858d726c8 YARN-2912 Jersey Tests failing with port in use. (varun saxena via stevel) 2014-12-12 17:10:54 +00:00
Jian He 0f47e4e745 YARN-2930. Fixed TestRMRestart#testRMRestartRecoveringNodeLabelManager intermittent failure. Contributed by Wangda Tan
(cherry picked from commit 2ed90a57fd)
2014-12-09 16:48:46 -08:00
Karthik Kambatla 1986ea8dd2 YARN-2910. FSLeafQueue can throw ConcurrentModificationException. (Wilfred Spiegelenburg via kasha)
(cherry picked from commit a2e07a5456)
2014-12-09 14:00:52 -08:00
Jian He 4cc0abe4fe YARN-2869. CapacityScheduler should trim sub queue names when parse configuration. Contributed by Wangda Tan
(cherry picked from commit e69af836f3)
2014-12-05 17:34:15 -08:00
Jason Lowe b72fb6c774 YARN-2056. Disable preemption at Queue level. Contributed by Eric Payne
(cherry picked from commit 4b13082199)
2014-12-05 21:08:14 +00:00
Jian He 1d1e7682c9 YARN-2301. Improved yarn container command. Contributed by Naganarasimha G R
(cherry picked from commit 258623ff8b)
2014-12-04 12:53:52 -08:00
Jian He 58c971164c YARN-2880. Added a test to make sure node labels will be recovered if RM restart is enabled. Contributed by Rohith Sharmaks
(cherry picked from commit 73fbb3c66b)
2014-12-03 17:17:40 -08:00
Jian He d6f3d4893d YARN-2894. Fixed a bug regarding application view acl when RM fails over. Contributed by Rohith Sharmaks
(cherry picked from commit 392c3aaea8)
2014-12-02 17:17:16 -08:00
Jian He 5067ac098b YARN-2136. Changed RMStateStore to ignore store opearations when fenced. Contributed by Varun Saxena
(cherry picked from commit 52bcefca8b)
2014-12-02 11:02:00 -08:00
Jian He d208c90148 YARN-2765. Added leveldb-based implementation for RMStateStore. Contributed by Jason Lowe
(cherry picked from commit a7fba0bc28)
2014-12-01 16:45:17 -08:00
Junping Du c7bd22974a YARN-2907. SchedulerNode#toString should print all resource detail instead of only memory. (Contributed by Rohith)
(cherry picked from commit c732ed760e)
2014-12-01 05:41:56 -08:00
Jian He 2863056530 YARN-2404. Removed ApplicationAttemptState and ApplicationState class in RMStateStore. Contributed by Tsuyoshi OZAWA
(cherry picked from commit 5805a81efb)
2014-11-25 12:51:03 -08:00
Sandy Ryza 3e2e8eac22 YARN-2669. FairScheduler: queue names shouldn't allow periods (Wei Yan via Sandy Ryza) 2014-11-21 16:08:22 -08:00
Karthik Kambatla e9db0aa35c YARN-2604. Scheduler should consider max-allocation-* in conjunction with the largest node. (Robert Kanter via kasha)
(cherry picked from commit 3114d4731d)
2014-11-21 10:42:47 -08:00
Karthik Kambatla 7ba5bb0c5b YARN-2315. FairScheduler: Set current capacity in addition to capacity. (Zhihai Xu via kasha)
(cherry picked from commit a9a0cc3679)
2014-11-19 20:19:54 -08:00
Karthik Kambatla 564deb75a8 YARN-2802. ClusterMetrics to include AM launch and register delays. (Zhihai Xu via kasha)
(cherry picked from commit f9f8e750edbe6db453f0a845e2ed49ede66e0e8a)
2014-11-19 19:50:35 -08:00
Jian He db31ef7e7f YARN-2865. Fixed RM to always create a new RMContext when transtions from StandBy to Active. Contributed by Rohith Sharmaks
(cherry picked from commit 9cb8b75ba5)
2014-11-19 19:49:44 -08:00
Karthik Kambatla 8df4c04c3a YARN-2690. [YARN-2574] Make ReservationSystem and its dependent classes independent of Scheduler type. (Anubhav Dhoot via kasha)
(cherry picked from commit 2fce6d6141)
2014-11-17 16:46:18 -08:00
Jason Lowe 242fd0e39a YARN-2414. RM web UI: app page will crash if app is failed before any attempt has been created. Contributed by Wangda Tan
(cherry picked from commit 81c9d17af8)
2014-11-17 21:16:54 +00:00
Sandy Ryza c4c77669f0 YARN-2811. In Fair Scheduler, reservation fulfillments shouldn't ignore max share (Siqi Li via Sandy Ryza) 2014-11-14 15:20:37 -08:00
Jian He beb184ac58 YARN-2856. Fixed RMAppImpl to handle ATTEMPT_KILLED event at ACCEPTED state on app recovery. Contributed by Rohith Sharmaks
(cherry picked from commit d005404ef7)
2014-11-13 15:34:56 -08:00
Vinod Kumar Vavilapalli ed3e5cb164 YARN-2853. Fixed a bug in ResourceManager causing apps to hang when the user kill request races with ApplicationMaster finish. Contributed by Jian He.
(cherry picked from commit 3651fe1b08)
2014-11-13 08:13:57 -08:00
Jason Lowe 6984d899e3 YARN-2780. Log aggregated resource allocation in rm-appsummary.log. Contributed by Eric Payne
(cherry picked from commit f8aefa5e9c)
2014-11-12 17:02:30 +00:00
Vinod Kumar Vavilapalli d76fc94b21 YARN-2834. Fixed ResourceManager to ignore token-renewal failures on recovery consistent with the (somewhat incorrect) behaviour in the non-recovery case. Contributed by Jian He.
(cherry picked from commit e76faebc95)
2014-11-09 18:57:48 -08:00
Arun C. Murthy 175d222bfc YARN-2830. Add backwords compatible ContainerId.newInstance constructor. Contributed by Jonathan Eagles.
(cherry picked from commit 43cd07b408)
2014-11-09 15:03:59 -08:00
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 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
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 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
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
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
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
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
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 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
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
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
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
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
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
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
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
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
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
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 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 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
Zhijie Shen e51ae64761 YARN-2651. Spun off LogRollingInterval from LogAggregationContext. Contributed by Xuan Gong.
(cherry picked from commit 4aed2d8e91)
2014-10-13 10:55:09 -07:00
Vinod Kumar Vavilapalli 8ef83a9480 YARN-2494. Added NodeLabels Manager internal API and implementation. Contributed by Wangda Tan.
(cherry picked from commit db7f165319)
2014-10-10 11:45:15 -07:00
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
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