You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cu...@apache.org on 2014/09/23 02:10:56 UTC
git commit: Fix spurious modificaiton in previous commit
Repository: hadoop
Updated Branches:
refs/heads/YARN-1051 e82461be5 -> d0dc7eafe
Fix spurious modificaiton in previous commit
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d0dc7eaf
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d0dc7eaf
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d0dc7eaf
Branch: refs/heads/YARN-1051
Commit: d0dc7eafe72f7cb11b660cd51b013091bde84b90
Parents: e82461b
Author: carlo curino <Carlo Curino>
Authored: Mon Sep 22 17:10:17 2014 -0700
Committer: carlo curino <Carlo Curino>
Committed: Mon Sep 22 17:10:17 2014 -0700
----------------------------------------------------------------------
.../yarn/client/api/impl/TestYarnClient.java | 96 --------------------
1 file changed, 96 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d0dc7eaf/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestYarnClient.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestYarnClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestYarnClient.java
index c1f452c..97dee15 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestYarnClient.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestYarnClient.java
@@ -949,101 +949,5 @@ public class TestYarnClient {
ReservationSystemTestUtil.reservationQ);
return request;
}
-
- @Test
- public void testReservationAPIs() {
- // initialize
- CapacitySchedulerConfiguration conf = new CapacitySchedulerConfiguration();
- ReservationSystemTestUtil.setupQueueConfiguration(conf);
- conf.setClass(YarnConfiguration.RM_SCHEDULER, CapacityScheduler.class,
- ResourceScheduler.class);
- conf.setBoolean(YarnConfiguration.RM_RESERVATION_SYSTEM_ENABLE, true);
- MiniYARNCluster cluster =
- new MiniYARNCluster("testReservationAPIs", 2, 1, 1);
- YarnClient client = null;
- try {
- cluster.init(conf);
- cluster.start();
- final Configuration yarnConf = cluster.getConfig();
- client = YarnClient.createYarnClient();
- client.init(yarnConf);
- client.start();
-
- // create a reservation
- Clock clock = new UTCClock();
- long arrival = clock.getTime();
- long duration = 60000;
- long deadline = (long) (arrival + 1.05 * duration);
- ReservationSubmissionRequest sRequest =
- createSimpleReservationRequest(4, arrival, deadline, duration);
- ReservationSubmissionResponse sResponse = null;
- try {
- sResponse = client.submitReservation(sRequest);
- } catch (Exception e) {
- Assert.fail(e.getMessage());
- }
- Assert.assertNotNull(sResponse);
- ReservationId reservationID = sResponse.getReservationId();
- Assert.assertNotNull(reservationID);
- System.out.println("Submit reservation response: " + reservationID);
-
- // Update the reservation
- ReservationDefinition rDef = sRequest.getReservationDefinition();
- ReservationRequest rr =
- rDef.getReservationRequests().getReservationResources().get(0);
- rr.setNumContainers(5);
- arrival = clock.getTime();
- duration = 30000;
- deadline = (long) (arrival + 1.05 * duration);
- rr.setDuration(duration);
- rDef.setArrival(arrival);
- rDef.setDeadline(deadline);
- ReservationUpdateRequest uRequest =
- ReservationUpdateRequest.newInstance(rDef, reservationID);
- ReservationUpdateResponse uResponse = null;
- try {
- uResponse = client.updateReservation(uRequest);
- } catch (Exception e) {
- Assert.fail(e.getMessage());
- }
- Assert.assertNotNull(sResponse);
- System.out.println("Update reservation response: " + uResponse);
-
- // Delete the reservation
- ReservationDeleteRequest dRequest =
- ReservationDeleteRequest.newInstance(reservationID);
- ReservationDeleteResponse dResponse = null;
- try {
- dResponse = client.deleteReservation(dRequest);
- } catch (Exception e) {
- Assert.fail(e.getMessage());
- }
- Assert.assertNotNull(sResponse);
- System.out.println("Delete reservation response: " + dResponse);
- } finally {
- // clean-up
- if (client != null) {
- client.stop();
- }
- cluster.stop();
- }
- }
- private ReservationSubmissionRequest createSimpleReservationRequest(
- int numContainers, long arrival, long deadline, long duration) {
- // create a request with a single atomic ask
- ReservationRequest r =
- ReservationRequest.newInstance(Resource.newInstance(1024, 1),
- numContainers, 1, duration);
- ReservationRequests reqs =
- ReservationRequests.newInstance(Collections.singletonList(r),
- ReservationRequestInterpreter.R_ALL);
- ReservationDefinition rDef =
- ReservationDefinition.newInstance(arrival, deadline, reqs,
- "testYarnClient#reservation");
- ReservationSubmissionRequest request =
- ReservationSubmissionRequest.newInstance(rDef,
- ReservationSystemTestUtil.reservationQ);
- return request;
- }
}