Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 838FB200D2F for ; Tue, 17 Oct 2017 18:26:24 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 81F3C160BEA; Tue, 17 Oct 2017 16:26:24 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 823631609DE for ; Tue, 17 Oct 2017 18:26:23 +0200 (CEST) Received: (qmail 71460 invoked by uid 500); 17 Oct 2017 16:26:16 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 68915 invoked by uid 99); 17 Oct 2017 16:26:14 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Oct 2017 16:26:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A574CDFF06; Tue, 17 Oct 2017 16:26:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: templedf@apache.org To: common-commits@hadoop.apache.org Date: Tue, 17 Oct 2017 16:26:46 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [34/36] hadoop git commit: YARN-7137. [YARN-3926] Move newly added APIs to unstable in YARN-3926 branch. Contributed by Wangda Tan. archived-at: Tue, 17 Oct 2017 16:26:24 -0000 YARN-7137. [YARN-3926] Move newly added APIs to unstable in YARN-3926 branch. Contributed by Wangda Tan. (cherry picked from commit da0b6a354bf6f6bf37ca5a05a4a8eece09aa4893) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6855e70c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6855e70c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6855e70c Branch: refs/heads/resource-types Commit: 6855e70cc2e64162dc8d0e92fda88f603f3436a5 Parents: c00e907 Author: Sunil G Authored: Tue Sep 12 20:31:47 2017 +0530 Committer: Daniel Templeton Committed: Tue Oct 17 09:25:46 2017 -0700 ---------------------------------------------------------------------- .../hadoop/yarn/api/records/Resource.java | 24 ++++++++++---------- .../yarn/api/records/ResourceRequest.java | 1 + .../yarn/util/resource/ResourceUtils.java | 19 ---------------- .../hadoop/yarn/util/resource/package-info.java | 6 +---- .../resourcemanager/webapp/dao/AppInfo.java | 2 +- 5 files changed, 15 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6855e70c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/Resource.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/Resource.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/Resource.java index 37b50f2..9a5bc79 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/Resource.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/Resource.java @@ -206,8 +206,8 @@ public abstract class Resource implements Comparable { * * @return Map of resource name to ResourceInformation */ - @Public - @Evolving + @InterfaceAudience.Private + @InterfaceStability.Unstable public ResourceInformation[] getResources() { return resources; } @@ -220,7 +220,7 @@ public abstract class Resource implements Comparable { * @throws ResourceNotFoundException if the resource can't be found */ @Public - @Evolving + @InterfaceStability.Unstable public ResourceInformation getResourceInformation(String resource) throws ResourceNotFoundException { Integer index = ResourceUtils.getResourceTypeIndex().get(resource); @@ -240,8 +240,8 @@ public abstract class Resource implements Comparable { * @throws ResourceNotFoundException * if the resource can't be found */ - @Public - @Evolving + @InterfaceAudience.Private + @InterfaceStability.Unstable public ResourceInformation getResourceInformation(int index) throws ResourceNotFoundException { ResourceInformation ri = null; @@ -262,7 +262,7 @@ public abstract class Resource implements Comparable { * @throws ResourceNotFoundException if the resource can't be found */ @Public - @Evolving + @InterfaceStability.Unstable public long getResourceValue(String resource) throws ResourceNotFoundException { return getResourceInformation(resource).getValue(); @@ -276,7 +276,7 @@ public abstract class Resource implements Comparable { * @throws ResourceNotFoundException if the resource is not found */ @Public - @Evolving + @InterfaceStability.Unstable public void setResourceInformation(String resource, ResourceInformation resourceInformation) throws ResourceNotFoundException { @@ -302,8 +302,8 @@ public abstract class Resource implements Comparable { * @throws ResourceNotFoundException * if the resource is not found */ - @Public - @Evolving + @InterfaceAudience.Private + @InterfaceStability.Unstable public void setResourceInformation(int index, ResourceInformation resourceInformation) throws ResourceNotFoundException { @@ -323,7 +323,7 @@ public abstract class Resource implements Comparable { * @throws ResourceNotFoundException if the resource is not found */ @Public - @Evolving + @InterfaceStability.Unstable public void setResourceValue(String resource, long value) throws ResourceNotFoundException { if (resource.equals(ResourceInformation.MEMORY_URI)) { @@ -350,8 +350,8 @@ public abstract class Resource implements Comparable { * @throws ResourceNotFoundException * if the resource is not found */ - @Public - @Evolving + @InterfaceAudience.Private + @InterfaceStability.Unstable public void setResourceValue(int index, long value) throws ResourceNotFoundException { try { http://git-wip-us.apache.org/repos/asf/hadoop/blob/6855e70c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ResourceRequest.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ResourceRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ResourceRequest.java index e9be6c3..43a339c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ResourceRequest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ResourceRequest.java @@ -21,6 +21,7 @@ package org.apache.hadoop.yarn.api.records; import java.io.Serializable; import org.apache.hadoop.classification.InterfaceAudience.Public; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.classification.InterfaceStability.Evolving; import org.apache.hadoop.classification.InterfaceStability.Stable; import org.apache.hadoop.classification.InterfaceStability.Unstable; http://git-wip-us.apache.org/repos/asf/hadoop/blob/6855e70c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceUtils.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceUtils.java index 2e1c578..0e0cee7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceUtils.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceUtils.java @@ -48,8 +48,6 @@ import java.util.concurrent.ConcurrentHashMap; /** * Helper class to read the resource-types to be supported by the system. */ -@InterfaceAudience.Public -@InterfaceStability.Unstable public class ResourceUtils { public static final String UNITS = ".units"; @@ -62,7 +60,6 @@ public class ResourceUtils { private static final Map RESOURCE_NAME_TO_INDEX = new ConcurrentHashMap(); private static volatile Map resourceTypes; - private static volatile String[] resourceNamesArray; private static volatile ResourceInformation[] resourceTypesArray; private static volatile boolean initializedNodeResources = false; private static volatile Map readOnlyNodeResources; @@ -187,7 +184,6 @@ public class ResourceUtils { private static void updateKnownResources() { // Update resource names. - resourceNamesArray = new String[resourceTypes.size()]; resourceTypesArray = new ResourceInformation[resourceTypes.size()]; int index = 2; @@ -195,14 +191,11 @@ public class ResourceUtils { if (resInfo.getName().equals(MEMORY)) { resourceTypesArray[0] = ResourceInformation .newInstance(resourceTypes.get(MEMORY)); - resourceNamesArray[0] = MEMORY; } else if (resInfo.getName().equals(VCORES)) { resourceTypesArray[1] = ResourceInformation .newInstance(resourceTypes.get(VCORES)); - resourceNamesArray[1] = VCORES; } else { resourceTypesArray[index] = ResourceInformation.newInstance(resInfo); - resourceNamesArray[index] = resInfo.getName(); index++; } } @@ -236,18 +229,6 @@ public class ResourceUtils { YarnConfiguration.RESOURCE_TYPES_CONFIGURATION_FILE); } - /** - * Get resource names array, this is mostly for performance perspective. Never - * modify returned array. - * - * @return resourceNamesArray - */ - public static String[] getResourceNamesArray() { - initializeResourceTypesIfNeeded(null, - YarnConfiguration.RESOURCE_TYPES_CONFIGURATION_FILE); - return resourceNamesArray; - } - public static ResourceInformation[] getResourceTypesArray() { initializeResourceTypesIfNeeded(null, YarnConfiguration.RESOURCE_TYPES_CONFIGURATION_FILE); http://git-wip-us.apache.org/repos/asf/hadoop/blob/6855e70c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/util/resource/package-info.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/util/resource/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/util/resource/package-info.java index 1e925d7..d7c799d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/util/resource/package-info.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/util/resource/package-info.java @@ -19,8 +19,4 @@ * Package org.apache.hadoop.yarn.util.resource contains classes * which is used as utility class for resource profile computations. */ -@InterfaceAudience.Public -@InterfaceStability.Unstable -package org.apache.hadoop.yarn.util.resource; -import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hadoop.classification.InterfaceStability; \ No newline at end of file +package org.apache.hadoop.yarn.util.resource; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hadoop/blob/6855e70c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppInfo.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/AppInfo.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/AppInfo.java index ed3344a..236c467 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/AppInfo.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/AppInfo.java @@ -458,7 +458,7 @@ public class AppInfo { public Map getPreemptedResourceSecondsMap() { return preemptedResourceSecondsMap; } - + public List getResourceRequests() { return this.resourceRequests; } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org