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 su...@apache.org on 2017/10/27 03:40:59 UTC
[2/3] hadoop git commit: YARN-4823. Refactor the nested reservation
id field in listReservation to simple string field. (subru via asuresh)
YARN-4823. Refactor the nested reservation id field in listReservation to simple string field. (subru via asuresh)
(cherry picked from commit 00bebb7e58ba6899904e1619d151aa1b2f5b6acd)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f6fde85c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f6fde85c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f6fde85c
Branch: refs/heads/branch-2
Commit: f6fde85c5c7dd8cacd5c12011697f0884ad290a1
Parents: 098a6b8
Author: Arun Suresh <as...@apache.org>
Authored: Fri Mar 25 15:54:38 2016 -0700
Committer: Subru Krishnan <su...@apache.org>
Committed: Thu Oct 26 20:04:33 2017 -0700
----------------------------------------------------------------------
.../webapp/dao/ReservationIdInfo.java | 64 --------------------
.../webapp/dao/ReservationInfo.java | 7 +--
.../webapp/TestRMWebServicesReservation.java | 15 ++---
3 files changed, 9 insertions(+), 77 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f6fde85c/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/f6fde85c/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/f6fde85c/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 492e78a..fd76f1b 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
@@ -821,9 +821,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();
}
@@ -879,9 +878,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"));
@@ -916,9 +914,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"));
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org