Apache/hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-4844 (Addendum). Change JobStatus(usedMem,reservedMem,neededMem)

Browse Source 
back to int for compatibility. Contributed by Wangda Tan
This commit is contained in:
Jian He 2016-12-20 11:28:19 -08:00
parent 3bcfe3a9de
commit 523411d69b
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java
View File

@ -521,13 +521,14 @@ public static JobStatus fromYarn(ApplicationReport application,
application.getApplicationResourceUsageReport(); application.getApplicationResourceUsageReport();
if (resourceUsageReport != null) { if (resourceUsageReport != null) {
jobStatus.setNeededMem( jobStatus.setNeededMem(
resourceUsageReport.getNeededResources().getMemorySize()); (int)resourceUsageReport.getNeededResources().getMemorySize());
jobStatus.setNumReservedSlots( jobStatus.setNumReservedSlots(
resourceUsageReport.getNumReservedContainers()); resourceUsageReport.getNumReservedContainers());
jobStatus.setNumUsedSlots(resourceUsageReport.getNumUsedContainers()); jobStatus.setNumUsedSlots(resourceUsageReport.getNumUsedContainers());
jobStatus.setReservedMem( jobStatus.setReservedMem(
resourceUsageReport.getReservedResources().getMemorySize()); (int)resourceUsageReport.getReservedResources().getMemorySize());
jobStatus.setUsedMem(resourceUsageReport.getUsedResources().getMemorySize()); jobStatus.setUsedMem(
(int) resourceUsageReport.getUsedResources().getMemorySize());
} }
return jobStatus; return jobStatus;
} }

18
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobStatus.java
View File

@ -95,9 +95,9 @@ public int getValue() {
private String trackingUrl =""; private String trackingUrl ="";
private int numUsedSlots; private int numUsedSlots;
private int numReservedSlots; private int numReservedSlots;
private long usedMem; private int usedMem;
private long reservedMem; private int reservedMem;
private long neededMem; private int neededMem;
private boolean isUber; private boolean isUber;
/** /**
@ -580,42 +580,42 @@ public void setNumReservedSlots(int n) {
/** /**
* @return the used memory * @return the used memory
*/ */
public long getUsedMem() { public int getUsedMem() {
return usedMem; return usedMem;
} }
/** /**
* @param m the used memory * @param m the used memory
*/ */
public void setUsedMem(long m) { public void setUsedMem(int m) {
this.usedMem = m; this.usedMem = m;
} }
/** /**
* @return the reserved memory * @return the reserved memory
*/ */
public long getReservedMem() { public int getReservedMem() {
return reservedMem; return reservedMem;
} }
/** /**
* @param r the reserved memory * @param r the reserved memory
*/ */
public void setReservedMem(long r) { public void setReservedMem(int r) {
this.reservedMem = r; this.reservedMem = r;
} }
/** /**
* @return the needed memory * @return the needed memory
*/ */
public long getNeededMem() { public int getNeededMem() {
return neededMem; return neededMem;
} }
/** /**
* @param n the needed memory * @param n the needed memory
*/ */
public void setNeededMem(long n) { public void setNeededMem(int n) {
this.neededMem = n; this.neededMem = n;
} }

6
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/JobClientUnitTest.java
View File

@ -170,9 +170,9 @@ public void testShowJob() throws Exception {
when(mockJobStatus.getPriority()).thenReturn(JobPriority.NORMAL); when(mockJobStatus.getPriority()).thenReturn(JobPriority.NORMAL);
when(mockJobStatus.getNumUsedSlots()).thenReturn(1); when(mockJobStatus.getNumUsedSlots()).thenReturn(1);
when(mockJobStatus.getNumReservedSlots()).thenReturn(1); when(mockJobStatus.getNumReservedSlots()).thenReturn(1);
when(mockJobStatus.getUsedMem()).thenReturn(1024L); when(mockJobStatus.getUsedMem()).thenReturn(1024);
when(mockJobStatus.getReservedMem()).thenReturn(512L); when(mockJobStatus.getReservedMem()).thenReturn(512);
when(mockJobStatus.getNeededMem()).thenReturn(2048L); when(mockJobStatus.getNeededMem()).thenReturn(2048);
when(mockJobStatus.getSchedulingInfo()).thenReturn("NA"); when(mockJobStatus.getSchedulingInfo()).thenReturn("NA");
Job mockJob = mock(Job.class); Job mockJob = mock(Job.class);