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 as...@apache.org on 2016/03/25 23:56:23 UTC
hadoop git commit: YARN-4823. Refactor the nested reservation id
field in listReservation to simple string field. (subru via asuresh)
Repository: hadoop
Updated Branches:
refs/heads/trunk d4df7849a -> 00bebb7e5
YARN-4823. Refactor the nested reservation id field in listReservation to simple string field. (subru via asuresh)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/00bebb7e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/00bebb7e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/00bebb7e
Branch: refs/heads/trunk
Commit: 00bebb7e58ba6899904e1619d151aa1b2f5b6acd
Parents: d4df784
Author: Arun Suresh <as...@apache.org>
Authored: Fri Mar 25 15:54:38 2016 -0700
Committer: Arun Suresh <as...@apache.org>
Committed: Fri Mar 25 15:54:38 2016 -0700
----------------------------------------------------------------------
.../webapp/dao/ReservationIdInfo.java | 64 --------------------
.../webapp/dao/ReservationInfo.java | 7 +--
.../webapp/TestRMWebServicesReservation.java | 15 ++---
.../src/site/markdown/ResourceManagerRest.md | 27 +++------
4 files changed, 16 insertions(+), 97 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/00bebb7e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ReservationIdInfo.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ReservationIdInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ReservationIdInfo.java
deleted file mode 100644
index 3a2596a..0000000
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ReservationIdInfo.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hadoop.yarn.server.resourcemanager.webapp.dao;
-
-import org.apache.hadoop.yarn.api.records.ReservationId;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- * Simple class that represent a reservation ID.
- */
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
-public class ReservationIdInfo {
- @XmlElement(name = "cluster-timestamp")
- private long clusterTimestamp;
-
- @XmlElement(name = "reservation-id")
- private long reservationId;
-
- public ReservationIdInfo() {
- this.clusterTimestamp = 0;
- this.reservationId = 0;
- }
-
- public ReservationIdInfo(ReservationId reservationId) {
- this.clusterTimestamp = reservationId.getClusterTimestamp();
- this.reservationId = reservationId.getId();
- }
-
- public long getClusterTimestamp() {
- return this.clusterTimestamp;
- }
-
- public void setClusterTimestamp(long newClusterTimestamp) {
- this.clusterTimestamp = newClusterTimestamp;
- }
-
- public long getReservationId() {
- return this.reservationId;
- }
-
- public void setReservationId(long newReservationId) {
- this.reservationId = newReservationId;
- }
-}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/00bebb7e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ReservationInfo.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ReservationInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ReservationInfo.java
index 1a31a8b..8b532ad 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ReservationInfo.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ReservationInfo.java
@@ -44,7 +44,7 @@ public class ReservationInfo {
private List<ResourceAllocationInfo> resourceAllocations = new ArrayList<>();
@XmlElement(name = "reservation-id")
- private ReservationIdInfo reservationId;
+ private String reservationId;
@XmlElement(name = "reservation-definition")
private ReservationDefinitionInfo reservationDefinition;
@@ -55,7 +55,6 @@ public class ReservationInfo {
user = "";
reservationDefinition = new ReservationDefinitionInfo();
- reservationId = new ReservationIdInfo();
}
public ReservationInfo(ReservationAllocationState allocation, boolean
@@ -74,7 +73,7 @@ public class ReservationInfo {
}
}
- reservationId = new ReservationIdInfo(allocation.getReservationId());
+ reservationId = allocation.getReservationId().toString();
reservationDefinition = new ReservationDefinitionInfo(
allocation.getReservationDefinition());
}
@@ -95,7 +94,7 @@ public class ReservationInfo {
return resourceAllocations;
}
- public ReservationIdInfo getReservationId() {
+ public String getReservationId() {
return reservationId;
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/00bebb7e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java
index 72705d4..a60cf17 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java
@@ -714,9 +714,8 @@ public class TestRMWebServicesReservation extends JerseyTestBase {
testRDLHelper(reservations);
- long reservationId = reservations.getJSONObject("reservation-id")
- .getLong("reservation-id");
- assertEquals(id1.getId(), reservationId);
+ String reservationId = reservations.getString("reservation-id");
+ assertEquals(id1.toString(), reservationId);
rm.stop();
}
@@ -769,9 +768,8 @@ public class TestRMWebServicesReservation extends JerseyTestBase {
testRDLHelper(reservations);
- long reservationId = reservations.getJSONObject("reservation-id")
- .getLong("reservation-id");
- assertEquals(id1.getId(), reservationId);
+ String reservationId = reservations.getString("reservation-id");
+ assertEquals(id1.toString(), reservationId);
assertTrue(reservations.has("resource-allocations"));
@@ -804,9 +802,8 @@ public class TestRMWebServicesReservation extends JerseyTestBase {
testRDLHelper(reservations);
- long reservationId = reservations.getJSONObject("reservation-id")
- .getLong("reservation-id");
- assertEquals(id1.getId(), reservationId);
+ String reservationId = reservations.getString("reservation-id");
+ assertEquals(id1.toString(), reservationId);
assertTrue(!reservations.has("resource-allocations"));
http://git-wip-us.apache.org/repos/asf/hadoop/blob/00bebb7e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceManagerRest.md
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceManagerRest.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceManagerRest.md
index 338778b..c72b7f4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceManagerRest.md
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceManagerRest.md
@@ -3199,7 +3199,7 @@ The Cluster Reservation API can be used to list reservations. When listing reser
|:---- |:---- |:---- |
| acceptance-time | long | Time that the reservation was accepted |
| resource-allocations | array of ResourceAllocationInfo(JSON) / zero or more ResourceAllocationInfo objects(XML) | Resource allocation information for the reservation |
-| reservation-id | A single ReservationId object | The unique reservation identifier |
+| reservation-id | A single ReservationId string | The unique reservation identifier |
| reservation-definition | A single ReservationDefinition Object | A set of constraints representing the need for resources over time of a user |
| user | string | User who made the reservation |
@@ -3211,21 +3211,14 @@ The Cluster Reservation API can be used to list reservations. When listing reser
| startTime | long | Start time that the resource is allocated for |
| endTime | long | End time that the resource is allocated for |
-### elements of the *resource* object
+### Elements of the *resource* object
| Item | Data Type | Description |
|:---- |:---- |:---- |
| memory | int | The memory allocated for the reservation allocation |
| vCores | int | The number of cores allocated for the reservation allocation |
-### Elements of the *reservation-id* object
-
-| Item | Data Type | Description |
-|:---- |:---- |:---- |
-| cluster-timestamp | long | Timestamp representing the time the reservation was created |
-| reservation-id | long | The id of the reservation that was listed |
-
-Elements of the *reservation-definition* object
+### Elements of the *reservation-definition* object
| Item | Data Type | Description |
|:---- |:---- |:---- |
@@ -3234,14 +3227,14 @@ Elements of the *reservation-definition* object
| reservation-name | string | A mnemonic name of the reservaiton (not a valid identifier). |
| reservation-requests | object | A list of "stages" or phases of this reservation, each describing resource requirements and duration |
-Elements of the *reservation-requests* object
+### Elements of the *reservation-requests* object
| Item | Data Type | Description |
|:---- |:---- |:---- |
| reservation-request-interpreter | int | A numeric choice of how to interpret the set of ReservationRequest: 0 is an ANY, 1 for ALL, 2 for ORDER, 3 for ORDER\_NO\_GAP |
| reservation-request | object | The description of the resource and time capabilities for a phase/stage of this reservation |
-Elements of the *reservation-request* object
+### Elements of the *reservation-request* object
| Item | Data Type | Description |
|:---- |:---- |:---- |
@@ -3305,10 +3298,7 @@ Response Body:
"endTime": "1465542252000"
}
],
- "reservation-id": {
- "cluster-timestamp": "1455133859510",
- "reservation-id": "6"
- },
+ "reservation-id": "reservation_1458852875788_0002",
"reservation-definition": {
"arrival": "1465541532000",
"deadline": "1465542252000",
@@ -3370,10 +3360,7 @@ Response Body:
<startTime>1465542251000</startTime>
<endTime>1465542252000</endTime>
</resource-allocations>
- <reservation-id>
- <cluster-timestamp>1455228059846</cluster-timestamp>
- <reservation-id>1</reservation-id>
- </reservation-id>
+ <reservation-id>reservation_1458852875788_0002</reservation-id>
<reservation-definition>
<arrival>1465541532000</arrival>
<deadline>1465542252000</deadline>