diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/NeverRestartPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/NeverRestartPolicy.java index cd44a585680..5d1d797c8e6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/NeverRestartPolicy.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/NeverRestartPolicy.java @@ -59,11 +59,12 @@ public static NeverRestartPolicy getInstance() { return false; } - @Override public boolean isReadyForDownStream(Component component) { - if (hasCompleted(component)) { - return true; + @Override public boolean isReadyForDownStream(Component dependentComponent) { + if (dependentComponent.getNumReadyInstances() < dependentComponent + .getNumDesiredInstances()) { + return false; } - return false; + return true; } @Override public boolean allowUpgrades() { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/OnFailureRestartPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/OnFailureRestartPolicy.java index b939ba0428f..4785d644b7b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/OnFailureRestartPolicy.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/OnFailureRestartPolicy.java @@ -65,12 +65,12 @@ public static OnFailureRestartPolicy getInstance() { return false; } - @Override public boolean isReadyForDownStream(Component component) { - if (hasCompletedSuccessfully(component)) { - return true; + @Override public boolean isReadyForDownStream(Component dependentComponent) { + if (dependentComponent.getNumReadyInstances() < dependentComponent + .getNumDesiredInstances()) { + return false; } - - return false; + return true; } @Override public boolean allowUpgrades() { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/component/TestComponentRestartPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/component/TestComponentRestartPolicy.java index 03158cfc18e..3e3b4a1a3dc 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/component/TestComponentRestartPolicy.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/component/TestComponentRestartPolicy.java @@ -65,6 +65,7 @@ public void testNeverRestartPolicy() throws Exception { when(component.getNumSucceededInstances()).thenReturn(new Long(1)); when(component.getNumFailedInstances()).thenReturn(new Long(2)); when(component.getNumDesiredInstances()).thenReturn(3); + when(component.getNumReadyInstances()).thenReturn(3); ComponentInstance instance = mock(ComponentInstance.class); when(instance.getComponent()).thenReturn(component); @@ -92,6 +93,7 @@ public void testOnFailureRestartPolicy() throws Exception { when(component.getNumSucceededInstances()).thenReturn(new Long(3)); when(component.getNumFailedInstances()).thenReturn(new Long(0)); when(component.getNumDesiredInstances()).thenReturn(3); + when(component.getNumReadyInstances()).thenReturn(3); ComponentInstance instance = mock(ComponentInstance.class); when(instance.getComponent()).thenReturn(component); @@ -123,7 +125,7 @@ public void testOnFailureRestartPolicy() throws Exception { assertEquals(true, restartPolicy.shouldRelaunchInstance(instance, containerStatus)); - assertEquals(false, restartPolicy.isReadyForDownStream(component)); + assertEquals(true, restartPolicy.isReadyForDownStream(component)); } }