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 ju...@apache.org on 2016/12/06 22:45:50 UTC
hadoop git commit: YARN-5184. Fix up incompatible changes introduced
on ContainerStatus and NodeReport. Contributed by Sangjin Lee. (cherry picked
from commit a7288da595fdf56c3ccd45c0b6ed2e3efaa043a4)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 8773cd5f7 -> 3350d0c08
YARN-5184. Fix up incompatible changes introduced on ContainerStatus and NodeReport. Contributed by Sangjin Lee.
(cherry picked from commit a7288da595fdf56c3ccd45c0b6ed2e3efaa043a4)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3350d0c0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3350d0c0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3350d0c0
Branch: refs/heads/branch-2
Commit: 3350d0c0802b4667b5637e325cad2f615b2a9e1b
Parents: 8773cd5
Author: Junping Du <ju...@apache.org>
Authored: Tue Dec 6 14:36:41 2016 -0800
Committer: Junping Du <ju...@apache.org>
Committed: Tue Dec 6 14:37:46 2016 -0800
----------------------------------------------------------------------
.../yarn/api/records/ContainerStatus.java | 40 ++++++++++++++++----
.../hadoop/yarn/api/records/NodeReport.java | 12 ++++--
2 files changed, 41 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3350d0c0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ContainerStatus.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ContainerStatus.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ContainerStatus.java
index 839fd04..d7c75f3 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ContainerStatus.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ContainerStatus.java
@@ -85,11 +85,17 @@ public abstract class ContainerStatus {
*/
@Public
@Evolving
- public abstract ExecutionType getExecutionType();
+ public ExecutionType getExecutionType() {
+ throw new UnsupportedOperationException(
+ "subclass must implement this method");
+ }
@Private
@Unstable
- public abstract void setExecutionType(ExecutionType executionType);
+ public void setExecutionType(ExecutionType executionType) {
+ throw new UnsupportedOperationException(
+ "subclass must implement this method");
+ }
/**
* Get the <code>ContainerState</code> of the container.
@@ -148,11 +154,17 @@ public abstract class ContainerStatus {
*/
@Public
@Unstable
- public abstract Resource getCapability();
+ public Resource getCapability() {
+ throw new UnsupportedOperationException(
+ "subclass must implement this method");
+ }
@Private
@Unstable
- public abstract void setCapability(Resource capability);
+ public void setCapability(Resource capability) {
+ throw new UnsupportedOperationException(
+ "subclass must implement this method");
+ }
/**
* Get all the IP addresses with which the container run.
@@ -160,11 +172,17 @@ public abstract class ContainerStatus {
*/
@Public
@Unstable
- public abstract List<String> getIPs();
+ public List<String> getIPs() {
+ throw new UnsupportedOperationException(
+ "subclass must implement this method");
+ }
@Private
@Unstable
- public abstract void setIPs(List<String> ips);
+ public void setIPs(List<String> ips) {
+ throw new UnsupportedOperationException(
+ "subclass must implement this method");
+ }
/**
* Get the hostname where the container runs.
@@ -172,9 +190,15 @@ public abstract class ContainerStatus {
*/
@Public
@Unstable
- public abstract String getHost();
+ public String getHost() {
+ throw new UnsupportedOperationException(
+ "subclass must implement this method");
+ }
@Private
@Unstable
- public abstract void setHost(String host);
+ public void setHost(String host) {
+ throw new UnsupportedOperationException(
+ "subclass must implement this method");
+ }
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3350d0c0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/NodeReport.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/NodeReport.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/NodeReport.java
index 412010a..885a3b4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/NodeReport.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/NodeReport.java
@@ -203,12 +203,18 @@ public abstract class NodeReport {
*/
@Public
@Stable
- public abstract ResourceUtilization getAggregatedContainersUtilization();
+ public ResourceUtilization getAggregatedContainersUtilization() {
+ throw new UnsupportedOperationException(
+ "subclass must implement this method");
+ }
@Private
@Unstable
- public abstract void setAggregatedContainersUtilization(ResourceUtilization
- containersUtilization);
+ public void setAggregatedContainersUtilization(ResourceUtilization
+ containersUtilization) {
+ throw new UnsupportedOperationException(
+ "subclass must implement this method");
+ }
/**
* Get node resource utilization
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org