From 3350d0c0802b4667b5637e325cad2f615b2a9e1b Mon Sep 17 00:00:00 2001 From: Junping Du Date: Tue, 6 Dec 2016 14:36:41 -0800 Subject: [PATCH] YARN-5184. Fix up incompatible changes introduced on ContainerStatus and NodeReport. Contributed by Sangjin Lee. (cherry picked from commit a7288da595fdf56c3ccd45c0b6ed2e3efaa043a4) --- .../yarn/api/records/ContainerStatus.java | 40 +++++++++++++++---- .../hadoop/yarn/api/records/NodeReport.java | 12 ++++-- 2 files changed, 41 insertions(+), 11 deletions(-) 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 839fd045795..d7c75f30724 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 ContainerState 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 getIPs(); + public List getIPs() { + throw new UnsupportedOperationException( + "subclass must implement this method"); + } @Private @Unstable - public abstract void setIPs(List ips); + public void setIPs(List 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"); + } } 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 412010a749d..885a3b4b35a 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