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 bi...@apache.org on 2018/10/24 18:13:37 UTC
hadoop git commit: MAPREDUCE-7151.
RMContainerAllocator#handleJobPriorityChange expects application_priority
always. Contributed by Bilwa S T.
Repository: hadoop
Updated Branches:
refs/heads/trunk c1874046e -> 74a5e683f
MAPREDUCE-7151. RMContainerAllocator#handleJobPriorityChange expects application_priority always. Contributed by Bilwa S T.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/74a5e683
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/74a5e683
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/74a5e683
Branch: refs/heads/trunk
Commit: 74a5e683fe65ee624a094de77940a42777ed7a26
Parents: c187404
Author: bibinchundatt <bi...@apache.org>
Authored: Mon Oct 22 15:59:14 2018 +0530
Committer: bibinchundatt <bi...@apache.org>
Committed: Wed Oct 24 23:22:05 2018 +0530
----------------------------------------------------------------------
.../mapreduce/v2/app/rm/RMContainerAllocator.java | 14 ++++++++------
.../mapreduce/v2/app/rm/TestRMContainerAllocator.java | 14 ++++++++++++++
2 files changed, 22 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/74a5e683/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
index 9d030b8..e459cb5 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
@@ -1020,12 +1020,14 @@ public class RMContainerAllocator extends RMContainerRequestor
}
}
- private void handleJobPriorityChange(AllocateResponse response) {
- Priority priorityFromResponse = Priority.newInstance(response
- .getApplicationPriority().getPriority());
-
- // Update the job priority to Job directly.
- getJob().setJobPriority(priorityFromResponse);
+ void handleJobPriorityChange(AllocateResponse response) {
+ Priority applicationPriority = response.getApplicationPriority();
+ if (null != applicationPriority) {
+ Priority priorityFromResponse = Priority
+ .newInstance(applicationPriority.getPriority());
+ // Update the job priority to Job directly.
+ getJob().setJobPriority(priorityFromResponse);
+ }
}
@Private
http://git-wip-us.apache.org/repos/asf/hadoop/blob/74a5e683/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/rm/TestRMContainerAllocator.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/rm/TestRMContainerAllocator.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/rm/TestRMContainerAllocator.java
index 427e6ea..ad00bd6 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/rm/TestRMContainerAllocator.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/rm/TestRMContainerAllocator.java
@@ -2161,6 +2161,20 @@ public class TestRMContainerAllocator {
}
@Test
+ public void testIfApplicationPriorityIsNotSet() {
+ Job mockJob = mock(Job.class);
+ RMCommunicator communicator = mock(RMCommunicator.class);
+ ClientService service = mock(ClientService.class);
+ AppContext context = mock(AppContext.class);
+ AMPreemptionPolicy policy = mock(AMPreemptionPolicy.class);
+ when(communicator.getJob()).thenReturn(mockJob);
+ RMContainerAllocator allocator = new RMContainerAllocator(service, context,
+ policy);
+ AllocateResponse response = Records.newRecord(AllocateResponse.class);
+ allocator.handleJobPriorityChange(response);
+ }
+
+ @Test
public void testReduceScheduling() throws Exception {
int totalMaps = 10;
int succeededMaps = 1;
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org