YARN-8758. Support getting PreemptionMessage when using AMRMClientAsyn. (Zian Chen via wangda)

Change-Id: Ibf5d165f49957b582eeadeb41dc285c84d2f05e7
(cherry picked from commit 6926fd0ec6)
(cherry picked from commit abe4a8e5d8)
This commit is contained in:
Wangda Tan 2018-10-04 10:31:33 -07:00
parent 1a890b17b9
commit 30f50a0682
2 changed files with 20 additions and 0 deletions

View File

@ -39,6 +39,7 @@ import org.apache.hadoop.yarn.api.records.ContainerUpdateType;
import org.apache.hadoop.yarn.api.records.ExecutionType; import org.apache.hadoop.yarn.api.records.ExecutionType;
import org.apache.hadoop.yarn.api.records.FinalApplicationStatus; import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
import org.apache.hadoop.yarn.api.records.NodeReport; import org.apache.hadoop.yarn.api.records.NodeReport;
import org.apache.hadoop.yarn.api.records.PreemptionMessage;
import org.apache.hadoop.yarn.api.records.Priority; import org.apache.hadoop.yarn.api.records.Priority;
import org.apache.hadoop.yarn.api.records.RejectedSchedulingRequest; import org.apache.hadoop.yarn.api.records.RejectedSchedulingRequest;
import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.api.records.Resource;
@ -553,6 +554,16 @@ extends AbstractService {
public void onRequestsRejected( public void onRequestsRejected(
List<RejectedSchedulingRequest> rejectedSchedulingRequests) { List<RejectedSchedulingRequest> rejectedSchedulingRequests) {
} }
/**
* Called when the RM responds to a heartbeat with preemption message
* @param preemptionMessage
*/
@Public
@Unstable
public void onPreemptionMessageReceived(
PreemptionMessage preemptionMessage) {
}
} }
/** /**

View File

@ -37,6 +37,7 @@ import org.apache.hadoop.yarn.api.records.ContainerId;
import org.apache.hadoop.yarn.api.records.ContainerStatus; import org.apache.hadoop.yarn.api.records.ContainerStatus;
import org.apache.hadoop.yarn.api.records.FinalApplicationStatus; import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
import org.apache.hadoop.yarn.api.records.NodeReport; import org.apache.hadoop.yarn.api.records.NodeReport;
import org.apache.hadoop.yarn.api.records.PreemptionMessage;
import org.apache.hadoop.yarn.api.records.Priority; import org.apache.hadoop.yarn.api.records.Priority;
import org.apache.hadoop.yarn.api.records.RejectedSchedulingRequest; import org.apache.hadoop.yarn.api.records.RejectedSchedulingRequest;
import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.api.records.Resource;
@ -401,6 +402,14 @@ extends AMRMClientAsync<T> {
handler.onContainersAllocated(allocated); handler.onContainersAllocated(allocated);
} }
PreemptionMessage preemptionMessage = response.getPreemptionMessage();
if (preemptionMessage != null) {
if (handler instanceof AMRMClientAsync.AbstractCallbackHandler) {
((AMRMClientAsync.AbstractCallbackHandler) handler)
.onPreemptionMessageReceived(preemptionMessage);
}
}
if (!response.getContainersFromPreviousAttempts().isEmpty()) { if (!response.getContainersFromPreviousAttempts().isEmpty()) {
if (handler instanceof AMRMClientAsync.AbstractCallbackHandler) { if (handler instanceof AMRMClientAsync.AbstractCallbackHandler) {
((AMRMClientAsync.AbstractCallbackHandler) handler) ((AMRMClientAsync.AbstractCallbackHandler) handler)