You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2013/06/11 22:06:05 UTC
svn commit: r1491932 - in
/incubator/ambari/branches/branch-1.4.0/ambari-server/src:
main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
Author: ncole
Date: Tue Jun 11 20:06:04 2013
New Revision: 1491932
URL: http://svn.apache.org/r1491932
Log:
AMBARI-2350. Service checks require stack_version parameter. (ncole)
Modified:
incubator/ambari/branches/branch-1.4.0/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
incubator/ambari/branches/branch-1.4.0/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
Modified: incubator/ambari/branches/branch-1.4.0/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java?rev=1491932&r1=1491931&r2=1491932&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java Tue Jun 11 20:06:04 2013
@@ -2195,12 +2195,20 @@ public class AmbariManagementControllerI
stage.getExecutionCommandWrapper(clientHost,
smokeTestRole).getExecutionCommand()
.setConfigurationTags(configTags);
-
+
// Generate cluster host info
stage.getExecutionCommandWrapper(clientHost, smokeTestRole)
.getExecutionCommand()
.setClusterHostInfo(StageUtils.getClusterHostInfo(
clusters.getHostsForCluster(cluster.getClusterName()), cluster, hostsMap, injector));
+
+ Map<String,String> hostParams = new HashMap<String, String>();
+ hostParams.put("stack_version", cluster.getDesiredStackVersion().getStackVersion());
+ // smoke tests need stack version
+ stage.getExecutionCommandWrapper(clientHost,
+ smokeTestRole).getExecutionCommand()
+ .setHostLevelParams(hostParams);
+
}
RoleGraph rg = new RoleGraph(rco);
Modified: incubator/ambari/branches/branch-1.4.0/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java?rev=1491932&r1=1491931&r2=1491932&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java Tue Jun 11 20:06:04 2013
@@ -2607,6 +2607,20 @@ public class AmbariManagementControllerT
Assert.assertNull(stage1.getExecutionCommandWrapper(host2, "DATANODE"));
Assert.assertNotNull(stage3.getExecutionCommandWrapper(host1, "HBASE_SERVICE_CHECK"));
Assert.assertNotNull(stage2.getExecutionCommandWrapper(host2, "HDFS_SERVICE_CHECK"));
+
+ for (Stage s : stages) {
+ for (List<ExecutionCommandWrapper> list : s.getExecutionCommands().values()) {
+ for (ExecutionCommandWrapper ecw : list) {
+ if (ecw.getExecutionCommand().getRole().name().contains("SERVICE_CHECK")) {
+ Map<String, String> hostParams = ecw.getExecutionCommand().getHostLevelParams();
+ Assert.assertNotNull(hostParams);
+ Assert.assertTrue(hostParams.size() > 0);
+ Assert.assertTrue(hostParams.containsKey("stack_version"));
+ Assert.assertEquals(hostParams.get("stack_version"), c1.getDesiredStackVersion().getStackVersion());
+ }
+ }
+ }
+ }
// manually set live state
sch1.setState(State.STARTED);