This is an automated email from the ASF dual-hosted git repository. adoroszlai pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push: new cf82327 AMBARI-25133. StackAdvisorAdapterTest result depends on method execution order (#2795) cf82327 is described below commit cf82327ca1f3819ea251e38d4b9ed30e8c2e9923 Author: Doroszlai, Attila <6454655+adorosz...@users.noreply.github.com> AuthorDate: Tue Jan 29 19:59:53 2019 +0100 AMBARI-25133. StackAdvisorAdapterTest result depends on method execution order (#2795) --- .../addservice/StackAdvisorAdapterTest.java | 118 ++++++++++----------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/ambari-server/src/test/java/org/apache/ambari/server/topology/addservice/StackAdvisorAdapterTest.java b/ambari-server/src/test/java/org/apache/ambari/server/topology/addservice/StackAdvisorAdapterTest.java index bd80bda..eacfaaf 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/topology/addservice/StackAdvisorAdapterTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/topology/addservice/StackAdvisorAdapterTest.java @@ -117,7 +117,7 @@ public class StackAdvisorAdapterTest { .put("c7406", ImmutableSet.of("DATANODE", "HDFS_CLIENT", "ZOOKEEPER_CLIENT")) .build(); - private static final AddServiceInfo.Builder ADD_SERVICE_INFO_BUILDER = new AddServiceInfo.Builder() + private final AddServiceInfo.Builder addServiceInfoBuilder = new AddServiceInfo.Builder() .setClusterName("c1"); @Test @@ -169,58 +169,6 @@ public class StackAdvisorAdapterTest { } @Test - public void getLayoutRecommendationInfo() { - Map<String, Map<String, Set<String>>> newServices = ImmutableMap.of( - "KAFKA", ImmutableMap.of( - "KAFKA_BROKER", ImmutableSet.of("c7401")), - "SPARK2", ImmutableMap.of( - "SPARK2_JOBHISTORYSERVER", ImmutableSet.of("c7402"), - "SPARK2_CLIENT", ImmutableSet.of("c7403", "c7404")), - "OOZIE", ImmutableMap.of( - "OOZIE_SERVER", ImmutableSet.of("c7401"), - "OOZIE_CLIENT", ImmutableSet.of("c7403", "c7404"))); - - AddServiceRequest request = request(ConfigRecommendationStrategy.ALWAYS_APPLY); - AddServiceInfo info = ADD_SERVICE_INFO_BUILDER - .setRequest(request) - .setStack(stack) - .setConfig(Configuration.newEmpty()) - .setNewServices(newServices) - .build(); // No LayoutReommendationInfo -> needs to be calculated - - LayoutRecommendationInfo layoutRecommendationInfo = adapter.getLayoutRecommendationInfo(info); - layoutRecommendationInfo.getAllServiceLayouts(); - - assertEquals( - ImmutableMap.of( - "host_group_1", ImmutableSet.of("c7401"), - "host_group_2", ImmutableSet.of("c7402"), - "host_group_3", ImmutableSet.of("c7403", "c7404")), - layoutRecommendationInfo.getHostGroups()); - - assertEquals( - ImmutableMap.<String, Map<String, Set<String>>>builder() - .put("KAFKA", ImmutableMap.of( - "KAFKA_BROKER", ImmutableSet.of("c7401"))) - .put("SPARK2", ImmutableMap.of( - "SPARK2_JOBHISTORYSERVER", ImmutableSet.of("c7402"), - "SPARK2_CLIENT", ImmutableSet.of("c7403", "c7404"))) - .put("OOZIE", ImmutableMap.of( - "OOZIE_SERVER", ImmutableSet.of("c7401"), - "OOZIE_CLIENT", ImmutableSet.of("c7403", "c7404"))) - .put("HDFS", ImmutableMap.of( - "NAMENODE", ImmutableSet.of("c7401"), - "HDFS_CLIENT", ImmutableSet.of("c7401", "c7402"))) - .put("ZOOKEEPER", ImmutableMap.of( - "ZOOKEEPER_SERVER", ImmutableSet.of("c7401"), - "ZOOKEEPER_CLIENT", ImmutableSet.of("c7401", "c7402"))) - .put("MAPREDUCE2", ImmutableMap.of( - "HISTORYSERVER", ImmutableSet.of("c7401"))) - .build(), - layoutRecommendationInfo.getAllServiceLayouts()); - } - - @Test public void keepNewServicesOnly() { Map<String, Map<String, Set<String>>> newServices = ImmutableMap.of( "KAFKA", emptyMap(), @@ -368,7 +316,7 @@ public class StackAdvisorAdapterTest { "KAFKA", ImmutableMap.of("KAFKA_BROKER", emptySet())); - AddServiceInfo info = ADD_SERVICE_INFO_BUILDER + AddServiceInfo info = addServiceInfoBuilder .setStack(stack) .setConfig(Configuration.newEmpty()) .setNewServices(newServices) @@ -404,7 +352,7 @@ public class StackAdvisorAdapterTest { clusterConfig.setParentConfiguration(stackConfig); AddServiceRequest request = request(ConfigRecommendationStrategy.ALWAYS_APPLY); - AddServiceInfo info = ADD_SERVICE_INFO_BUILDER + AddServiceInfo info = addServiceInfoBuilder .setRequest(request) .setStack(stack) .setConfig(userConfig) @@ -459,7 +407,7 @@ public class StackAdvisorAdapterTest { LayoutRecommendationInfo layoutRecommendationInfo = new LayoutRecommendationInfo(new HashMap<>(), new HashMap<>()); // contents doesn't matter for the test AddServiceRequest request = request(ConfigRecommendationStrategy.ALWAYS_APPLY); - AddServiceInfo info = ADD_SERVICE_INFO_BUILDER + AddServiceInfo info = addServiceInfoBuilder .setRequest(request) .setStack(stack) .setConfig(userConfig) @@ -515,7 +463,7 @@ public class StackAdvisorAdapterTest { LayoutRecommendationInfo layoutRecommendationInfo = new LayoutRecommendationInfo(new HashMap<>(), new HashMap<>()); // contents doesn't matter for the test AddServiceRequest request = request(ConfigRecommendationStrategy.ALWAYS_APPLY_DONT_OVERRIDE_CUSTOM_VALUES); - AddServiceInfo info = ADD_SERVICE_INFO_BUILDER + AddServiceInfo info = addServiceInfoBuilder .setRequest(request) .setStack(stack) .setConfig(userConfig) @@ -576,7 +524,7 @@ public class StackAdvisorAdapterTest { LayoutRecommendationInfo layoutRecommendationInfo = new LayoutRecommendationInfo(new HashMap<>(), new HashMap<>()); // contents doesn't matter for the test AddServiceRequest request = request(ConfigRecommendationStrategy.NEVER_APPLY); - AddServiceInfo info = ADD_SERVICE_INFO_BUILDER + AddServiceInfo info = addServiceInfoBuilder .setRequest(request) .setStack(stack) .setConfig(userConfig) @@ -623,7 +571,7 @@ public class StackAdvisorAdapterTest { LayoutRecommendationInfo layoutRecommendationInfo = new LayoutRecommendationInfo(new HashMap<>(), new HashMap<>()); // contents doesn't matter for the test AddServiceRequest request = request(ConfigRecommendationStrategy.ONLY_STACK_DEFAULTS_APPLY); - AddServiceInfo info = ADD_SERVICE_INFO_BUILDER + AddServiceInfo info = addServiceInfoBuilder .setRequest(request) .setStack(stack) .setConfig(userConfig) @@ -696,6 +644,58 @@ public class StackAdvisorAdapterTest { assertEquals(recommendedConfigsForStackDefaults, recommendedConfigs); } + @Test + public void getLayoutRecommendationInfo() { + Map<String, Map<String, Set<String>>> newServices = ImmutableMap.of( + "KAFKA", ImmutableMap.of( + "KAFKA_BROKER", ImmutableSet.of("c7401")), + "SPARK2", ImmutableMap.of( + "SPARK2_JOBHISTORYSERVER", ImmutableSet.of("c7402"), + "SPARK2_CLIENT", ImmutableSet.of("c7403", "c7404")), + "OOZIE", ImmutableMap.of( + "OOZIE_SERVER", ImmutableSet.of("c7401"), + "OOZIE_CLIENT", ImmutableSet.of("c7403", "c7404"))); + + AddServiceRequest request = request(ConfigRecommendationStrategy.ALWAYS_APPLY); + AddServiceInfo info = addServiceInfoBuilder + .setRequest(request) + .setStack(stack) + .setConfig(Configuration.newEmpty()) + .setNewServices(newServices) + .build(); // No LayoutReommendationInfo -> needs to be calculated + + LayoutRecommendationInfo layoutRecommendationInfo = adapter.getLayoutRecommendationInfo(info); + layoutRecommendationInfo.getAllServiceLayouts(); + + assertEquals( + ImmutableMap.of( + "host_group_1", ImmutableSet.of("c7401"), + "host_group_2", ImmutableSet.of("c7402"), + "host_group_3", ImmutableSet.of("c7403", "c7404")), + layoutRecommendationInfo.getHostGroups()); + + assertEquals( + ImmutableMap.<String, Map<String, Set<String>>>builder() + .put("KAFKA", ImmutableMap.of( + "KAFKA_BROKER", ImmutableSet.of("c7401"))) + .put("SPARK2", ImmutableMap.of( + "SPARK2_JOBHISTORYSERVER", ImmutableSet.of("c7402"), + "SPARK2_CLIENT", ImmutableSet.of("c7403", "c7404"))) + .put("OOZIE", ImmutableMap.of( + "OOZIE_SERVER", ImmutableSet.of("c7401"), + "OOZIE_CLIENT", ImmutableSet.of("c7403", "c7404"))) + .put("HDFS", ImmutableMap.of( + "NAMENODE", ImmutableSet.of("c7401"), + "HDFS_CLIENT", ImmutableSet.of("c7401", "c7402"))) + .put("ZOOKEEPER", ImmutableMap.of( + "ZOOKEEPER_SERVER", ImmutableSet.of("c7401"), + "ZOOKEEPER_CLIENT", ImmutableSet.of("c7401", "c7402"))) + .put("MAPREDUCE2", ImmutableMap.of( + "HISTORYSERVER", ImmutableSet.of("c7401"))) + .build(), + layoutRecommendationInfo.getAllServiceLayouts()); + } + private static AddServiceRequest request(ConfigRecommendationStrategy strategy) { return new AddServiceRequest(null, strategy, null, null, null, null, null, null, null, null, null); }