From be0a0ce3f287f486749e1c7f516d885c63e0365f Mon Sep 17 00:00:00 2001 From: Sunil G Date: Wed, 12 Sep 2018 23:16:21 +0530 Subject: [PATCH] YARN-8768 --- .../yarn/api/protocolrecords/GetAttributesToNodesRequest.java | 4 ++-- .../yarn/api/protocolrecords/GetAttributesToNodesResponse.java | 3 +-- .../yarn/api/protocolrecords/GetNodesToAttributesRequest.java | 2 +- .../yarn/api/protocolrecords/GetNodesToAttributesResponse.java | 2 +- .../org/apache/hadoop/yarn/nodelabels/NodeAttributesManager.java | 8 ++++---- .../resourcemanager/nodelabels/NodeAttributesManagerImpl.java | 3 +-- 6 files changed, 10 insertions(+), 12 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetAttributesToNodesRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetAttributesToNodesRequest.java index 94814e9053e..28e4db6ee83 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetAttributesToNodesRequest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetAttributesToNodesRequest.java @@ -56,7 +56,7 @@ public static GetAttributesToNodesRequest newInstance( * Set node attributeKeys for which the mapping of hostname to attribute value * is required. * - * @param attributes Set provided. + * @param attributes Set of NodeAttributeKey provided. */ @Public @Unstable @@ -66,7 +66,7 @@ public static GetAttributesToNodesRequest newInstance( * Get node attributeKeys for which mapping of hostname to attribute value is * required. * - * @return Set + * @return Set of NodeAttributeKey */ @Public @Unstable diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetAttributesToNodesResponse.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetAttributesToNodesResponse.java index c83785fc6ae..045deac7b82 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetAttributesToNodesResponse.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetAttributesToNodesResponse.java @@ -56,8 +56,7 @@ public abstract void setAttributeToNodes( * Get mapping of NodeAttributeKey to its associated mapping of list of * NodeToAttributeValue associated with attribute. * - * @return Map> node attributes - * to list of NodeToAttributeValuenode. + * @return Map of node attributes to list of NodeToAttributeValue. */ @Public @Evolving diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetNodesToAttributesRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetNodesToAttributesRequest.java index 8e91bcafed0..4fcd8da6936 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetNodesToAttributesRequest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetNodesToAttributesRequest.java @@ -57,7 +57,7 @@ public static GetNodesToAttributesRequest newInstance(Set hostNames) { /** * Get hostnames for which mapping is required. * - * @return Set of hostnames. + * @return Set of hostnames. */ @InterfaceAudience.Public @InterfaceStability.Evolving diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetNodesToAttributesResponse.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetNodesToAttributesResponse.java index acc07bb1847..a82a3f99be4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetNodesToAttributesResponse.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetNodesToAttributesResponse.java @@ -55,7 +55,7 @@ public static GetNodesToAttributesResponse newInstance( /** * Get hostnames to NodeAttributes mapping. * - * @return Map> host to attributes. + * @return Map of host to attributes. */ @Public @Evolving diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/NodeAttributesManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/NodeAttributesManager.java index ca04e8da96e..a4c90a420a9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/NodeAttributesManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/NodeAttributesManager.java @@ -103,7 +103,7 @@ public abstract void removeNodeAttributes( /** * NodeAttribute to AttributeValue Map. * - * @return Map mapping of Attribute to Value. + * @return Map of NodeAttribute to AttributeValue. */ public abstract Map getAttributesForNode( String hostName); @@ -111,7 +111,7 @@ public abstract void removeNodeAttributes( /** * Get All node to Attributes list based on filter. * - * @return List nodeToAttributes matching filter.If empty + * @return List of NodeToAttributes matching filter. If empty * or null is passed as argument will return all. */ public abstract List getNodeToAttributes( @@ -120,8 +120,8 @@ public abstract void removeNodeAttributes( /** * Get all node to Attributes mapping. * - * @return Map> nodesToAttributes matching - * filter.If empty or null is passed as argument will return all. + * @return Map of String to Set of nodesToAttributes matching + * filter. If empty or null is passed as argument will return all. */ public abstract Map> getNodesToAttributes( Set hostNames); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/NodeAttributesManagerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/NodeAttributesManagerImpl.java index 55334365abf..e5247888d75 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/NodeAttributesManagerImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/NodeAttributesManagerImpl.java @@ -279,8 +279,7 @@ private void replaceNodeToAttribute(String nodeHost, String prefix, * @param nodeAttributeMapping * @param newAttributesToBeAdded * @param isRemoveOperation : to indicate whether its a remove operation. - * @return Map>, node -> Map( - * NodeAttribute -> AttributeValue) + * @return Map of String to Map of NodeAttribute to AttributeValue * @throws IOException : on invalid mapping in the current request or against * already existing NodeAttributes. */ -- 2.15.2 (Apple Git-101.1)