Repository: hadoop Updated Branches: refs/heads/trunk 3bcfe3a9d -> 523411d69
YARN-4844 (Addendum). Change JobStatus(usedMem,reservedMem,neededMem) back to int for compatibility. Contributed by Wangda Tan Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/523411d6 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/523411d6 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/523411d6 Branch: refs/heads/trunk Commit: 523411d69b37d85046bd8b23001c267daac7a108 Parents: 3bcfe3a Author: Jian He <jia...@apache.org> Authored: Tue Dec 20 11:28:19 2016 -0800 Committer: Jian He <jia...@apache.org> Committed: Tue Dec 20 11:28:44 2016 -0800 ---------------------------------------------------------------------- .../apache/hadoop/mapreduce/TypeConverter.java | 7 ++++--- .../org/apache/hadoop/mapreduce/JobStatus.java | 18 +++++++++--------- .../apache/hadoop/mapred/JobClientUnitTest.java | 6 +++--- 3 files changed, 16 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/523411d6/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java ---------------------------------------------------------------------- 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 ca38bab..aea931a 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 @@ -521,13 +521,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; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/523411d6/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobStatus.java ---------------------------------------------------------------------- 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 7438296..9ff75b9 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; /** @@ -580,42 +580,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; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/523411d6/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/JobClientUnitTest.java ---------------------------------------------------------------------- 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 e02232d..b5edf2d 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); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org