diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java index 5979eda2039..3879234123b 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java @@ -520,13 +520,14 @@ public class TypeConverter { application.getApplicationResourceUsageReport(); if (resourceUsageReport != null) { jobStatus.setNeededMem( - resourceUsageReport.getNeededResources().getMemorySize()); + (int)resourceUsageReport.getNeededResources().getMemorySize()); jobStatus.setNumReservedSlots( resourceUsageReport.getNumReservedContainers()); jobStatus.setNumUsedSlots(resourceUsageReport.getNumUsedContainers()); jobStatus.setReservedMem( - resourceUsageReport.getReservedResources().getMemorySize()); - jobStatus.setUsedMem(resourceUsageReport.getUsedResources().getMemorySize()); + (int)resourceUsageReport.getReservedResources().getMemorySize()); + jobStatus.setUsedMem( + (int) resourceUsageReport.getUsedResources().getMemorySize()); } return jobStatus; } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobStatus.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobStatus.java index d0c5f107e4e..df7f7473e56 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobStatus.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobStatus.java @@ -95,9 +95,9 @@ public class JobStatus implements Writable, Cloneable { private String trackingUrl =""; private int numUsedSlots; private int numReservedSlots; - private long usedMem; - private long reservedMem; - private long neededMem; + private int usedMem; + private int reservedMem; + private int neededMem; private boolean isUber; /** @@ -552,42 +552,42 @@ public class JobStatus implements Writable, Cloneable { /** * @return the used memory */ - public long getUsedMem() { + public int getUsedMem() { return usedMem; } /** * @param m the used memory */ - public void setUsedMem(long m) { + public void setUsedMem(int m) { this.usedMem = m; } /** * @return the reserved memory */ - public long getReservedMem() { + public int getReservedMem() { return reservedMem; } /** * @param r the reserved memory */ - public void setReservedMem(long r) { + public void setReservedMem(int r) { this.reservedMem = r; } /** * @return the needed memory */ - public long getNeededMem() { + public int getNeededMem() { return neededMem; } /** * @param n the needed memory */ - public void setNeededMem(long n) { + public void setNeededMem(int n) { this.neededMem = n; } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/JobClientUnitTest.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/JobClientUnitTest.java index 4895a5b036b..84b76bfbcf6 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/JobClientUnitTest.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/JobClientUnitTest.java @@ -170,9 +170,9 @@ public class JobClientUnitTest { when(mockJobStatus.getPriority()).thenReturn(JobPriority.NORMAL); when(mockJobStatus.getNumUsedSlots()).thenReturn(1); when(mockJobStatus.getNumReservedSlots()).thenReturn(1); - when(mockJobStatus.getUsedMem()).thenReturn(1024L); - when(mockJobStatus.getReservedMem()).thenReturn(512L); - when(mockJobStatus.getNeededMem()).thenReturn(2048L); + when(mockJobStatus.getUsedMem()).thenReturn(1024); + when(mockJobStatus.getReservedMem()).thenReturn(512); + when(mockJobStatus.getNeededMem()).thenReturn(2048); when(mockJobStatus.getSchedulingInfo()).thenReturn("NA"); Job mockJob = mock(Job.class); 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 e2d847284a1..cf3fbde4e5c 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 @@ -18,6 +18,7 @@ package org.apache.hadoop.yarn.api.records; +import org.apache.commons.lang.NotImplementedException; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Unstable; @@ -79,7 +80,9 @@ public abstract class Resource implements Comparable { */ @Private @Unstable - public abstract long getMemorySize(); + public long getMemorySize() { + throw new NotImplementedException("getVirtualCoresSize is not implemented"); + } /** * Set memory of the resource. @@ -106,7 +109,9 @@ public abstract class Resource implements Comparable { @Public @Unstable - public abstract long getVirtualCoresSize(); + public long getVirtualCoresSize() { + throw new NotImplementedException("getVirtualCoresSize is not implemented"); + } /** * Set number of virtual cpu cores of the resource. @@ -120,7 +125,9 @@ public abstract class Resource implements Comparable { */ @Public @Evolving - public abstract void setVirtualCores(long vCores); + public void setVirtualCores(long vCores) { + throw new NotImplementedException("getVirtualCoresSize is not implemented"); + } @Override public int hashCode() {