Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-8300. Fixed NPE in DefaultUpgradeComponentsFinder. 

Contributed by Suma Shivaprasad
This commit is contained in:
Eric Yang 2018-05-16 12:38:26 -04:00
parent 6b67161ca3
commit 91357c22ef
2 changed files with 84 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/UpgradeComponentsFinder.java
View File

@ -100,6 +100,7 @@ public interface UpgradeComponentsFinder {
targetDef.getComponents().forEach(component -> {
Component currentComp = currentDef.getComponent(component.getName());
if (currentComp != null) {
if (!Objects.equals(currentComp.getName(), component.getName())) {
throw new UnsupportedOperationException(
"changes to component name not supported by upgrade");
@ -114,16 +115,17 @@ public interface UpgradeComponentsFinder {
if (!Objects.equals(currentComp.getReadinessCheck(),
component.getReadinessCheck())) {
throw new UnsupportedOperationException(
"changes to component readiness check not supported by upgrade");
"changes to component readiness check not supported by "
+ "upgrade");
}
if (!Objects.equals(currentComp.getResource(),
component.getResource())) {
throw new UnsupportedOperationException(
"changes to component resource not supported by upgrade");
}
if (!Objects.equals(currentComp.getRunPrivilegedContainer(),
component.getRunPrivilegedContainer())) {
throw new UnsupportedOperationException(
@ -133,7 +135,8 @@ public interface UpgradeComponentsFinder {
if (!Objects.equals(currentComp.getPlacementPolicy(),
component.getPlacementPolicy())) {
throw new UnsupportedOperationException(
"changes to component placement policy not supported by upgrade");
"changes to component placement policy not supported by "
+ "upgrade");
}
if (!Objects.equals(currentComp.getQuicklinks(),
@ -143,13 +146,18 @@ public interface UpgradeComponentsFinder {
}
if (!Objects.equals(currentComp.getArtifact(),
component.getArtifact()) ||
!Objects.equals(currentComp.getLaunchCommand(),
component.getLaunchCommand()) ||
!Objects.equals(currentComp.getConfiguration(),
component.getArtifact()) || !Objects.equals(
currentComp.getLaunchCommand(), component.getLaunchCommand())
|| !Objects.equals(currentComp.getConfiguration(),
component.getConfiguration())) {
targetComps.add(component);
}
} else{
throw new UnsupportedOperationException(
"addition/deletion of components not supported by upgrade. "
+ "Could not find component " + component.getName() + " in "
+ "current service definition.");
}
});
return targetComps;
}

30
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestDefaultUpgradeComponentsFinder.java
View File

@ -23,8 +23,11 @@ import org.junit.Assert;
import org.junit.Test;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import static org.junit.Assert.assertEquals;
/**
* Tests for {@link UpgradeComponentsFinder.DefaultUpgradeComponentsFinder}.
*/
@ -40,11 +43,34 @@ public class TestDefaultUpgradeComponentsFinder {
targetDef.getComponents().forEach(x -> x.setArtifact(
TestServiceManager.createTestArtifact("v1")));
Assert.assertEquals("all components need upgrade",
assertEquals("all components need upgrade",
targetDef.getComponents(), finder.findTargetComponentSpecs(currentDef,
targetDef));
}
@Test
public void testServiceUpgradeWithNewComponentAddition() {
Service currentDef = ServiceTestUtils.createExampleApplication();
Service targetDef = ServiceTestUtils.createExampleApplication();
Iterator<Component> targetComponentsIter =
targetDef.getComponents().iterator();
Component firstComponent = targetComponentsIter.next();
firstComponent.setName("newComponentA");
try {
finder.findTargetComponentSpecs(currentDef, targetDef);
Assert.fail("Expected error since component does not exist in service "
+ "definition");
} catch (UnsupportedOperationException usoe) {
assertEquals(
"addition/deletion of components not supported by upgrade. Could "
+ "not find component newComponentA in current service "
+ "definition.",
usoe.getMessage());
//Expected
}
}
@Test
public void testComponentArtifactChange() {
Service currentDef = TestServiceManager.createBaseDef("test");
@ -56,7 +82,7 @@ public class TestDefaultUpgradeComponentsFinder {
List<Component> expected = new ArrayList<>();
expected.add(targetDef.getComponents().get(0));
Assert.assertEquals("single components needs upgrade",
assertEquals("single components needs upgrade",
expected, finder.findTargetComponentSpecs(currentDef,
targetDef));
}