850 Commits

Author SHA1 Message Date
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 5864dd99a419b8a0fb973a4984c0f1d1e02ccf16)
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 0f3b6900be1a3b2e4624f31f84656f4a32dadce9)
2014-10-23 22:03:30 -07: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 7e3b5e6f5cb4945b4fab27e8a83d04280df50e17)
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 c0e034336c85296be6f549d88d137fb2b2b79a15)
2014-10-21 20:10:45 -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 82567664988b673f1b819a42a4baf31cb0dcb331)
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 39063cd36f96e351e4a6bf0bc2b6185711d4b059)
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 e9c66e8fd2ccb658db2848e1ab911f1502de4de5)
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 c3de2412eb7633ff16c67e71e73bbe27a982d984)
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 a6aa6e42cacdbfcc1c2b7c19e7239204fe9ff654)
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 abae63caf9c53b404f2f2db7d482555484eaeaf8)
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 b3056c266a628a65cf7ceb61b55ab3bd0a09baf2)
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 f2ea555ac6c06a3f2f6559731f48711fff05d3f1)
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 1220bb72d452521c6f09cebe1dd77341054ee9dd)
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 cdce88376a60918dfe2f3bcd82a7666d74992a19)
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 da709a2eac7110026169ed3fc4d0eaf85488d3ef)
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 f9680d9a160ee527c8f2c1494584abf1a1f70f82)
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 4aed2d8e91c7dccc78fbaffc409d3076c3316289)
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 db7f1653198b950e89567c06898d64f6b930a0ee)
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 e16e25ab1beac89c8d8be4e9f2a7fbefe81d35f3)
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 30d56fdbb40d06c4e267d6c314c8c767a7adc6a3)
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 519e5a7dd2bd540105434ec3c8939b68f6c024f8)
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 ea26cc0b4ac02b8af686dfda80f540e5aa70c358)
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 c8212bacb1b2a7e6ee83cc56f72297465ce99390)

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 c47464aba407d1dafe10be23fe454f0489cc4367)
(cherry picked from commit a2986234be4e02f9ccb589f9ff5f7ffb28bc6400)
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 90ac0be86b898aefec5471db4027554c8e1b310c)
(cherry picked from commit 5e10a13bb4759984494c6a870c7f08fb6693c9c0)
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 8baeaead8532898163f1006276b731a237b1a559)

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 6261f7cc69a0eb3eebc9898c7599c7c20f432b4e)
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 169085319b8b76641f8b9f6840a3fef06d221e2b)
(cherry picked from commit 3418c56bcf4bbddaf483bdaa1a15a8bbc4039bfe)
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 c4918cb4cb5a267a8cfd6eace28fcfe7ad6174e8)
(cherry picked from commit b6df0dddcdafd7ec67c76ea92aea3ff3e94db247)
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 aef7928899b37262773f3dc117157bb746bf8918)
(cherry picked from commit f66ffcf832235e0da0bb050fff08e248b547c360)
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 0d8b2cd88b958b1e602fd4ea4078ef8d4742a7c3)
(cherry picked from commit cf4b34282aafee9f6b09d3433c4de1ae4b359168)
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 f83a07f266f2c5e6eead554d8a331ed7e75e10d5)
(cherry picked from commit 1c6950354f3c35a7824770dc251d5aec3be4876a)
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 aac47fda7fecda9fc18ade34d633eca895865a70)

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 eb3e40b833b9d82c1556843f960194dc42e482f3)
2014-10-06 10:21:04 -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 80d11eb68e60f88e16d7d41edecbddfc935a6b10)
2014-10-03 11:52:05 -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 054f28552687e9b9859c0126e16a2066e20ead3f)
2014-10-02 15:16:07 -07:00
Karthik Kambatla
b6f4d1ef42 YARN-2254. TestRMWebServicesAppsModification should run against both CS and FS. (Zhihai Xu via kasha)
(cherry picked from commit 5e0b49da9caa53814581508e589f3704592cf335)
2014-10-02 10:15:41 -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 52bbe0f11bc8e97df78a1ab9b63f4eff65fd7a76)
2014-10-01 15:39:36 -07:00
Jian He
823f02725f YARN-2602. Fixed possible NPE in ApplicationHistoryManagerOnTimelineStore. Contributed by Zhijie Shen
(cherry picked from commit bbff96be48119774688981d04baf444639135977)
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 14d60dadc25b044a2887bf912ba5872367f2dffb)
2014-09-30 16:17:38 -07: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 9582a50176800433ad3fa8829a50c28b859812a3)
2014-09-30 12:59:34 -07:00
Jason Lowe
4f6a367166 YARN-1769. CapacityScheduler: Improve reservations. Contributed by Thomas Graves
(cherry picked from commit 9c22065109a77681bc2534063eabe8692fbcb3cd)
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 5391919b09ce9549d13c897aa89bb0a0536760fe)
2014-09-26 17:53:35 -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 8269bfa613999f71767de3c0369817b58cfe1416)
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 72b0881ca641fa830c907823f674a5c5e39aa15a)
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 c86674a3a4d99aa56bb8ed3f6df51e3fef215eba)
2014-09-24 17:51:54 -07:00
Karthik Kambatla
30165d4cdd YARN-2596. TestWorkPreservingRMRestart fails with FairScheduler. (kasha)
(cherry picked from commit 39c87344e16a08ab69e25345b3bce92aec92db47)
2014-09-24 15:24:17 -07:00
Karthik Kambatla
024bcfdc0d YARN-2252. Intermittent failure of TestFairScheduler.testContinuousScheduling. (Ratandeep Ratti and kasha via kasha)
(cherry picked from commit f5578207d2d20aa71adf12aa9f6c37b00ee9b8dc)
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 568d3dc2bbe43b7d2833d5da2b0e6d75eb86e5dd)
2014-09-22 23:51:45 -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 43efdd30b52f4ee8967a03dac4d548095d6cafdb)
2014-09-22 16:10:20 -07:00