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 br...@apache.org on 2021/02/18 15:00:23 UTC
[hadoop] branch branch-3.3 updated (a1bebfd -> 5cb9657)
This is an automated email from the ASF dual-hosted git repository.
brahma pushed a change to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git.
from a1bebfd YARN-10359. Log container report only if list is not empty. Contributed by Bilwa S T.
new 5be3a1d YARN-9301. Too many InvalidStateTransitionException with SLS. Contributed by Bilwa S T.
new 5cb9657 YARN-9301. Too many InvalidStateTransitionException with SLS. Contributed by Bilwa S T.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../yarn/sls/resourcemanager/MockAMLauncher.java | 62 +++++++++++-----------
1 file changed, 32 insertions(+), 30 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[hadoop] 01/02: YARN-9301. Too many InvalidStateTransitionException
with SLS. Contributed by Bilwa S T.
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brahma pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit 5be3a1dc7b58449ea8472bc3423ffac347da7f59
Author: Inigo Goiri <in...@apache.org>
AuthorDate: Tue May 12 08:20:03 2020 -0700
YARN-9301. Too many InvalidStateTransitionException with SLS. Contributed by Bilwa S T.
(cherry picked from commit 9cbd0cd2a9268ff2e8fed0af335e9c4f91c5f601)
---
.../yarn/sls/resourcemanager/MockAMLauncher.java | 61 ++++++++++++----------
1 file changed, 32 insertions(+), 29 deletions(-)
diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/resourcemanager/MockAMLauncher.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/resourcemanager/MockAMLauncher.java
index 208629a..24c795b 100644
--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/resourcemanager/MockAMLauncher.java
+++ b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/resourcemanager/MockAMLauncher.java
@@ -82,36 +82,39 @@ public class MockAMLauncher extends ApplicationMasterLauncher
@Override
@SuppressWarnings("unchecked")
public void handle(AMLauncherEvent event) {
- if (AMLauncherEventType.LAUNCH == event.getType()) {
- ApplicationId appId =
- event.getAppAttempt().getAppAttemptId().getApplicationId();
-
- // find AMSimulator
- AMSimulator ams = appIdAMSim.get(appId);
- if (ams != null) {
- try {
- Container amContainer = event.getAppAttempt().getMasterContainer();
-
- setupAMRMToken(event.getAppAttempt());
-
- // Notify RMAppAttempt to change state
- super.context.getDispatcher().getEventHandler().handle(
- new RMAppAttemptEvent(event.getAppAttempt().getAppAttemptId(),
- RMAppAttemptEventType.LAUNCHED));
-
- ams.notifyAMContainerLaunched(
- event.getAppAttempt().getMasterContainer());
- LOG.info("Notify AM launcher launched:" + amContainer.getId());
-
- se.getNmMap().get(amContainer.getNodeId())
- .addNewContainer(amContainer, 100000000L);
-
- return;
- } catch (Exception e) {
- throw new YarnRuntimeException(e);
- }
+ ApplicationId appId =
+ event.getAppAttempt().getAppAttemptId().getApplicationId();
+ // find AMSimulator
+ AMSimulator ams = appIdAMSim.get(appId);
+ if (ams == null) {
+ throw new YarnRuntimeException(
+ "Didn't find any AMSimulator for applicationId=" + appId);
+ }
+ Container amContainer = event.getAppAttempt().getMasterContainer();
+ switch (event.getType()) {
+ case LAUNCH:
+ try {
+ setupAMRMToken(event.getAppAttempt());
+ // Notify RMAppAttempt to change state
+ super.context.getDispatcher().getEventHandler().handle(
+ new RMAppAttemptEvent(event.getAppAttempt().getAppAttemptId(),
+ RMAppAttemptEventType.LAUNCHED));
+
+ ams.notifyAMContainerLaunched(
+ event.getAppAttempt().getMasterContainer());
+ LOG.info("Notify AM launcher launched:" + amContainer.getId());
+
+ se.getNmMap().get(amContainer.getNodeId())
+ .addNewContainer(amContainer, -1);
+ return;
+ } catch (Exception e) {
+ throw new YarnRuntimeException(e);
}
-
+ case CLEANUP:
+ se.getNmMap().get(amContainer.getNodeId())
+ .cleanupContainer(amContainer.getId());
+ break;
+ default:
throw new YarnRuntimeException(
"Didn't find any AMSimulator for applicationId=" + appId);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[hadoop] 02/02: YARN-9301. Too many InvalidStateTransitionException
with SLS. Contributed by Bilwa S T.
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brahma pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit 5cb9657320ecbca653a081eeb419a73b2d6f85a2
Author: Inigo Goiri <in...@apache.org>
AuthorDate: Tue May 12 08:24:34 2020 -0700
YARN-9301. Too many InvalidStateTransitionException with SLS. Contributed by Bilwa S T.
(cherry picked from commit 96bbc3bc972619bd830b2f935c06a1585a5470c6)
---
.../java/org/apache/hadoop/yarn/sls/resourcemanager/MockAMLauncher.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/resourcemanager/MockAMLauncher.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/resourcemanager/MockAMLauncher.java
index 24c795b..37bf96a 100644
--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/resourcemanager/MockAMLauncher.java
+++ b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/resourcemanager/MockAMLauncher.java
@@ -29,7 +29,6 @@ import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
import org.apache.hadoop.yarn.security.AMRMTokenIdentifier;
import org.apache.hadoop.yarn.server.resourcemanager.RMContext;
import org.apache.hadoop.yarn.server.resourcemanager.amlauncher.AMLauncherEvent;
-import org.apache.hadoop.yarn.server.resourcemanager.amlauncher.AMLauncherEventType;
import org.apache.hadoop.yarn.server.resourcemanager.amlauncher.ApplicationMasterLauncher;
import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttempt;
import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptEvent;
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org