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 wa...@apache.org on 2018/10/04 17:49:03 UTC
[1/2] hadoop git commit: YARN-8758. Support getting PreemptionMessage
when using AMRMClientAsyn. (Zian Chen via wangda)
Repository: hadoop
Updated Branches:
refs/heads/branch-3.2 e185ae2d1 -> b3ac88693
YARN-8758. Support getting PreemptionMessage when using AMRMClientAsyn. (Zian Chen via wangda)
Change-Id: Ibf5d165f49957b582eeadeb41dc285c84d2f05e7
(cherry picked from commit 6926fd0ec634df2576bbc9f45e9636b99260db72)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/abe4a8e5
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/abe4a8e5
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/abe4a8e5
Branch: refs/heads/branch-3.2
Commit: abe4a8e5d82e70ce991e2830f20eba9f25a2491a
Parents: e185ae2
Author: Wangda Tan <wa...@apache.org>
Authored: Thu Oct 4 10:31:33 2018 -0700
Committer: Wangda Tan <wa...@apache.org>
Committed: Thu Oct 4 10:43:16 2018 -0700
----------------------------------------------------------------------
.../hadoop/yarn/client/api/async/AMRMClientAsync.java | 11 +++++++++++
.../yarn/client/api/async/impl/AMRMClientAsyncImpl.java | 9 +++++++++
2 files changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/abe4a8e5/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/async/AMRMClientAsync.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/async/AMRMClientAsync.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/async/AMRMClientAsync.java
index 3dd2f71..c9f4e5f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/async/AMRMClientAsync.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/async/AMRMClientAsync.java
@@ -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.FinalApplicationStatus;
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.RejectedSchedulingRequest;
import org.apache.hadoop.yarn.api.records.Resource;
@@ -553,6 +554,16 @@ extends AbstractService {
public void onRequestsRejected(
List<RejectedSchedulingRequest> rejectedSchedulingRequests) {
}
+
+ /**
+ * Called when the RM responds to a heartbeat with preemption message
+ * @param preemptionMessage
+ */
+ @Public
+ @Unstable
+ public void onPreemptionMessageReceived(
+ PreemptionMessage preemptionMessage) {
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/hadoop/blob/abe4a8e5/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/async/impl/AMRMClientAsyncImpl.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/async/impl/AMRMClientAsyncImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/async/impl/AMRMClientAsyncImpl.java
index 3cf2c34..922b185 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/async/impl/AMRMClientAsyncImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/async/impl/AMRMClientAsyncImpl.java
@@ -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.FinalApplicationStatus;
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.RejectedSchedulingRequest;
import org.apache.hadoop.yarn.api.records.Resource;
@@ -401,6 +402,14 @@ extends AMRMClientAsync<T> {
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 (handler instanceof AMRMClientAsync.AbstractCallbackHandler) {
((AMRMClientAsync.AbstractCallbackHandler) handler)
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[2/2] hadoop git commit: YARN-8844. TestNMProxy unit test is failing.
(Eric Yang via wangda)
Posted by wa...@apache.org.
YARN-8844. TestNMProxy unit test is failing. (Eric Yang via wangda)
Change-Id: I241fa8701b6f1dbcad87fd2e9a429e32e7aa40f5
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b3ac8869
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b3ac8869
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b3ac8869
Branch: refs/heads/branch-3.2
Commit: b3ac8869338faeabedbc27e95e3166c830a9a761
Parents: abe4a8e
Author: Wangda Tan <wa...@apache.org>
Authored: Thu Oct 4 10:48:47 2018 -0700
Committer: Wangda Tan <wa...@apache.org>
Committed: Thu Oct 4 10:48:47 2018 -0700
----------------------------------------------------------------------
.../yarn/server/nodemanager/containermanager/TestNMProxy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b3ac8869/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestNMProxy.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestNMProxy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestNMProxy.java
index e6a7a02..5f023f0 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestNMProxy.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestNMProxy.java
@@ -161,7 +161,7 @@ public class TestNMProxy extends BaseContainerManagerTest {
IPC_CLIENT_CONNECT_MAX_RETRIES_ON_SOCKET_TIMEOUTS_KEY, 100);
// connect to some dummy address so that it can trigger
// connection failure and RPC level retires.
- newConf.set(YarnConfiguration.NM_ADDRESS, "1234");
+ newConf.set(YarnConfiguration.NM_ADDRESS, "0.0.0.0:1234");
ContainerManagementProtocol proxy = getNMProxy(newConf);
try {
proxy.startContainers(allRequests);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org