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/12/05 20:08:16 UTC
[5/6] hadoop git commit: YARN-5559. Analyse 2.8.0/3.0.0 jdiff reports
and fix any issues. Contributed by Akira Ajisaka & Wangda Tan
YARN-5559. Analyse 2.8.0/3.0.0 jdiff reports and fix any issues. Contributed by Akira Ajisaka & Wangda Tan
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/43ebff2e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/43ebff2e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/43ebff2e
Branch: refs/heads/YARN-5085
Commit: 43ebff2e354142bddcb42755766a965ae8a503a6
Parents: 1b5ccea
Author: Jian He <ji...@apache.org>
Authored: Mon Dec 5 11:39:34 2016 -0800
Committer: Jian He <ji...@apache.org>
Committed: Mon Dec 5 11:39:34 2016 -0800
----------------------------------------------------------------------
.../GetClusterNodeLabelsResponse.java | 50 ++++++++++++++++----
.../yarn/client/api/impl/YarnClientImpl.java | 2 +-
.../pb/GetClusterNodeLabelsResponsePBImpl.java | 41 ++++++++++++++--
.../yarn/security/ContainerTokenIdentifier.java | 25 ++++++++++
.../state/InvalidStateTransitionException.java | 22 ++-------
.../state/InvalidStateTransitonException.java | 19 ++++++--
.../resourcemanager/TestClientRMService.java | 4 +-
7 files changed, 125 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/43ebff2e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetClusterNodeLabelsResponse.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetClusterNodeLabelsResponse.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetClusterNodeLabelsResponse.java
index cf6e683..cb2ccfb 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetClusterNodeLabelsResponse.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetClusterNodeLabelsResponse.java
@@ -18,7 +18,9 @@
package org.apache.hadoop.yarn.api.protocolrecords;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
import org.apache.hadoop.classification.InterfaceAudience.Public;
import org.apache.hadoop.classification.InterfaceStability.Evolving;
@@ -28,18 +30,48 @@ import org.apache.hadoop.yarn.util.Records;
@Public
@Evolving
public abstract class GetClusterNodeLabelsResponse {
+ /**
+ * Creates a new instance.
+ *
+ * @param labels Node labels
+ * @return response
+ * @deprecated Use {@link #newInstance(List)} instead.
+ */
+ @Deprecated
+ public static GetClusterNodeLabelsResponse newInstance(Set<String> labels) {
+ List<NodeLabel> list = new ArrayList<>();
+ for (String label : labels) {
+ list.add(NodeLabel.newInstance(label));
+ }
+ return newInstance(list);
+ }
+
public static GetClusterNodeLabelsResponse newInstance(List<NodeLabel> labels) {
- GetClusterNodeLabelsResponse request =
+ GetClusterNodeLabelsResponse response =
Records.newRecord(GetClusterNodeLabelsResponse.class);
- request.setNodeLabels(labels);
- return request;
+ response.setNodeLabelList(labels);
+ return response;
}
- @Public
- @Evolving
- public abstract void setNodeLabels(List<NodeLabel> labels);
+ public abstract void setNodeLabelList(List<NodeLabel> labels);
+
+ public abstract List<NodeLabel> getNodeLabelList();
+
+ /**
+ * Set node labels to the response.
+ *
+ * @param labels Node labels
+ * @deprecated Use {@link #setNodeLabelList(List)} instead.
+ */
+ @Deprecated
+ public abstract void setNodeLabels(Set<String> labels);
- @Public
- @Evolving
- public abstract List<NodeLabel> getNodeLabels();
+ /**
+ * Get node labels of the response.
+ *
+ * @return Node labels
+ * @deprecated Use {@link #getNodeLabelList()} instead.
+ */
+ @Deprecated
+ public abstract Set<String> getNodeLabels();
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/43ebff2e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/YarnClientImpl.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/YarnClientImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/YarnClientImpl.java
index a0f9678..50f1b490a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/YarnClientImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/YarnClientImpl.java
@@ -899,7 +899,7 @@ public class YarnClientImpl extends YarnClient {
@Override
public List<NodeLabel> getClusterNodeLabels() throws YarnException, IOException {
return rmClient.getClusterNodeLabels(
- GetClusterNodeLabelsRequest.newInstance()).getNodeLabels();
+ GetClusterNodeLabelsRequest.newInstance()).getNodeLabelList();
}
@Override
http://git-wip-us.apache.org/repos/asf/hadoop/blob/43ebff2e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetClusterNodeLabelsResponsePBImpl.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetClusterNodeLabelsResponsePBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetClusterNodeLabelsResponsePBImpl.java
index f569fb2..227abe9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetClusterNodeLabelsResponsePBImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetClusterNodeLabelsResponsePBImpl.java
@@ -19,7 +19,9 @@
package org.apache.hadoop.yarn.api.protocolrecords.impl.pb;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeLabelsResponse;
import org.apache.hadoop.yarn.api.records.NodeLabel;
@@ -46,7 +48,7 @@ public class GetClusterNodeLabelsResponsePBImpl extends
viaProto = true;
}
- public GetClusterNodeLabelsResponseProto getProto() {
+ public synchronized GetClusterNodeLabelsResponseProto getProto() {
mergeLocalToProto();
proto = viaProto ? proto : builder.build();
viaProto = true;
@@ -101,14 +103,43 @@ public class GetClusterNodeLabelsResponsePBImpl extends
}
@Override
- public void setNodeLabels(List<NodeLabel> updatedNodeLabels) {
+ public synchronized void setNodeLabelList(List<NodeLabel> nodeLabels) {
maybeInitBuilder();
this.updatedNodeLabels = new ArrayList<>();
- if (updatedNodeLabels == null) {
+ if (nodeLabels == null) {
builder.clearNodeLabels();
return;
}
- this.updatedNodeLabels.addAll(updatedNodeLabels);
+ this.updatedNodeLabels.addAll(nodeLabels);
+ }
+
+ /**
+ * @deprecated Use {@link #getNodeLabelList()} instead.
+ */
+ @Override
+ @Deprecated
+ public synchronized Set<String> getNodeLabels() {
+ Set<String> set = new HashSet<>();
+ List<NodeLabel> labelList = getNodeLabelList();
+ if (labelList != null) {
+ for (NodeLabel label : labelList) {
+ set.add(label.getName());
+ }
+ }
+ return set;
+ }
+
+ /**
+ * @deprecated Use {@link #setNodeLabelList(List)} instead.
+ */
+ @Override
+ @Deprecated
+ public void setNodeLabels(Set<String> labels) {
+ List<NodeLabel> list = new ArrayList<>();
+ for (String s : labels) {
+ list.add(NodeLabel.newInstance(s));
+ }
+ setNodeLabelList(list);
}
private void initLocalNodeLabels() {
@@ -121,7 +152,7 @@ public class GetClusterNodeLabelsResponsePBImpl extends
}
@Override
- public List<NodeLabel> getNodeLabels() {
+ public synchronized List<NodeLabel> getNodeLabelList() {
if (this.updatedNodeLabels != null) {
return this.updatedNodeLabels;
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/43ebff2e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerTokenIdentifier.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerTokenIdentifier.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerTokenIdentifier.java
index f8e9463..4b34998 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerTokenIdentifier.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerTokenIdentifier.java
@@ -73,6 +73,31 @@ public class ContainerTokenIdentifier extends TokenIdentifier {
CommonNodeLabelsManager.NO_LABEL, ContainerType.TASK);
}
+ /**
+ * Creates a instance.
+ *
+ * @param appSubmitter appSubmitter
+ * @param containerID container ID
+ * @param creationTime creation time
+ * @param expiryTimeStamp expiry timestamp
+ * @param hostName hostname
+ * @param logAggregationContext log aggregation context
+ * @param masterKeyId master key ID
+ * @param priority priority
+ * @param r resource needed by the container
+ * @param rmIdentifier ResourceManager identifier
+ * @deprecated Use one of the other constructors instead.
+ */
+ @Deprecated
+ public ContainerTokenIdentifier(ContainerId containerID, String hostName,
+ String appSubmitter, Resource r, long expiryTimeStamp, int masterKeyId,
+ long rmIdentifier, Priority priority, long creationTime,
+ LogAggregationContext logAggregationContext) {
+ this(containerID, hostName, appSubmitter, r, expiryTimeStamp, masterKeyId,
+ rmIdentifier, priority, creationTime, logAggregationContext,
+ CommonNodeLabelsManager.NO_LABEL);
+ }
+
public ContainerTokenIdentifier(ContainerId containerID, String hostName,
String appSubmitter, Resource r, long expiryTimeStamp, int masterKeyId,
long rmIdentifier, Priority priority, long creationTime,
http://git-wip-us.apache.org/repos/asf/hadoop/blob/43ebff2e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/InvalidStateTransitionException.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/InvalidStateTransitionException.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/InvalidStateTransitionException.java
index d10902a..51eafc9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/InvalidStateTransitionException.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/InvalidStateTransitionException.java
@@ -20,7 +20,6 @@ package org.apache.hadoop.yarn.state;
import org.apache.hadoop.classification.InterfaceAudience.Public;
import org.apache.hadoop.classification.InterfaceStability.Evolving;
-import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
/**
* The exception that happens when you call invalid state transition.
@@ -28,24 +27,13 @@ import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
*/
@Public
@Evolving
-public class InvalidStateTransitionException extends YarnRuntimeException {
+@SuppressWarnings("deprecation")
+public class InvalidStateTransitionException extends
+ InvalidStateTransitonException {
- private static final long serialVersionUID = -6188669113571351684L;
- private Enum<?> currentState;
- private Enum<?> event;
+ private static final long serialVersionUID = 8610511635996283691L;
public InvalidStateTransitionException(Enum<?> currentState, Enum<?> event) {
- super("Invalid event: " + event + " at " + currentState);
- this.currentState = currentState;
- this.event = event;
+ super(currentState, event);
}
-
- public Enum<?> getCurrentState() {
- return currentState;
- }
-
- public Enum<?> getEvent() {
- return event;
- }
-
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/43ebff2e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/InvalidStateTransitonException.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/InvalidStateTransitonException.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/InvalidStateTransitonException.java
index eeb1b97..82f46cc 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/InvalidStateTransitonException.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/InvalidStateTransitonException.java
@@ -20,20 +20,31 @@ package org.apache.hadoop.yarn.state;
import org.apache.hadoop.classification.InterfaceAudience.Public;
import org.apache.hadoop.classification.InterfaceStability.Evolving;
+import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
/** @deprecated Use {@link InvalidStateTransitionException} instead. */
@Public
@Evolving
@Deprecated
-public class InvalidStateTransitonException extends
- InvalidStateTransitionException {
+public class InvalidStateTransitonException extends YarnRuntimeException {
- private static final long serialVersionUID = 8610511635996283691L;
+ private static final long serialVersionUID = -6188669113571351684L;
+ private Enum<?> currentState;
+ private Enum<?> event;
public InvalidStateTransitonException(Enum<?> currentState, Enum<?> event) {
- super(currentState, event);
+ super("Invalid event: " + event + " at " + currentState);
+ this.currentState = currentState;
+ this.event = event;
}
+ public Enum<?> getCurrentState() {
+ return currentState;
+ }
+
+ public Enum<?> getEvent() {
+ return event;
+ }
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/43ebff2e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.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/TestClientRMService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java
index f35efa0..12cdcf1 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java
@@ -1534,7 +1534,7 @@ public class TestClientRMService {
// Get node labels collection
GetClusterNodeLabelsResponse response = client
.getClusterNodeLabels(GetClusterNodeLabelsRequest.newInstance());
- Assert.assertTrue(response.getNodeLabels().containsAll(
+ Assert.assertTrue(response.getNodeLabelList().containsAll(
Arrays.asList(labelX, labelY)));
// Get node labels mapping
@@ -1605,7 +1605,7 @@ public class TestClientRMService {
// Get node labels collection
GetClusterNodeLabelsResponse response = client
.getClusterNodeLabels(GetClusterNodeLabelsRequest.newInstance());
- Assert.assertTrue(response.getNodeLabels().containsAll(
+ Assert.assertTrue(response.getNodeLabelList().containsAll(
Arrays.asList(labelX, labelY, labelZ)));
// Get labels to nodes mapping
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org