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 jb...@apache.org on 2021/04/23 16:55:20 UTC

[hadoop] branch branch-2.10 updated: YARN-9594. Fix missing break statement in ContainerScheduler#handle. Contributed by lujie.

This is an automated email from the ASF dual-hosted git repository.

jbrennan pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/branch-2.10 by this push:
     new 94c1cf2  YARN-9594. Fix missing break statement in ContainerScheduler#handle. Contributed by lujie.
94c1cf2 is described below

commit 94c1cf2ff2978f95c6bc461fdd23d8b76a6cddf6
Author: bibinchundatt <bi...@apache.org>
AuthorDate: Tue Jun 11 22:49:21 2019 +0530

    YARN-9594. Fix missing break statement in ContainerScheduler#handle. Contributed by lujie.
    
    (cherry picked from commit 6d80b9bc3ff3ba8073e3faf64551b9109d2aa2ad)
    
     Conflicts:
    	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/scheduler/ContainerScheduler.java
    
    (cherry picked from commit 4a39165b41dc079dd2de140e610255f363982f59)
---
 .../nodemanager/containermanager/scheduler/ContainerScheduler.java       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/scheduler/ContainerScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/scheduler/ContainerScheduler.java
index 5d6f2e3..73ae899 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/scheduler/ContainerScheduler.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/scheduler/ContainerScheduler.java
@@ -174,6 +174,7 @@ public class ContainerScheduler extends AbstractService implements
       break;
     case RECOVERY_COMPLETED:
       startPendingContainers(maxOppQueueLength <= 0);
+      break;
     default:
       LOG.error("Unknown event arrived at ContainerScheduler: "
           + event.toString());

---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org