You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2014/01/28 23:24:17 UTC
git commit: AMBARI-4445. Mark decommissioned host components as
PASSIVE
Updated Branches:
refs/heads/trunk 3aa12f57d -> 4a008bdc6
AMBARI-4445. Mark decommissioned host components as PASSIVE
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4a008bdc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4a008bdc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4a008bdc
Branch: refs/heads/trunk
Commit: 4a008bdc6b46d9bc8e9af95cf0aa857c9e593be0
Parents: 3aa12f5
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Tue Jan 28 14:24:02 2014 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Tue Jan 28 14:24:02 2014 -0800
----------------------------------------------------------------------
.../controller/AmbariCustomCommandExecutionHelper.java | 8 +++++---
.../server/controller/AmbariManagementControllerTest.java | 4 ++++
2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4a008bdc/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
index 2ae77c8..72fc31d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
@@ -36,6 +36,7 @@ import org.apache.ambari.server.state.ComponentInfo;
import org.apache.ambari.server.state.ConfigHelper;
import org.apache.ambari.server.state.Host;
import org.apache.ambari.server.state.HostComponentAdminState;
+import org.apache.ambari.server.state.PassiveState;
import org.apache.ambari.server.state.RepositoryInfo;
import org.apache.ambari.server.state.Service;
import org.apache.ambari.server.state.ServiceComponent;
@@ -421,7 +422,6 @@ public class AmbariCustomCommandExecutionHelper {
if (actionParameters != null) { // If defined
execCmd.setRoleParams(actionParameters);
}
-
}
private Set<String> getHostList(Map<String, String> cmdParameters, String key) {
@@ -508,11 +508,13 @@ public class AmbariCustomCommandExecutionHelper {
if (excludedHosts.contains(sch.getHostName())) {
sch.setComponentAdminState(HostComponentAdminState.DECOMMISSIONED);
listOfExcludedHosts.add(sch.getHostName());
- LOG.info("Adding " + slaveCompType + " host to decommissioned list : " + sch.getHostName());
+ sch.setPassiveState(PassiveState.PASSIVE);
+ LOG.info("Decommissioning " + slaveCompType + " and marking it PASSIVE on " + sch.getHostName());
}
if (includedHosts.contains(sch.getHostName())) {
sch.setComponentAdminState(HostComponentAdminState.INSERVICE);
- LOG.info("Removing " + slaveCompType + " host from the decommissioned list: " + sch.getHostName());
+ sch.setPassiveState(PassiveState.ACTIVE);
+ LOG.info("Recommissioning " + slaveCompType + " and marking it ACTIVE on " + sch.getHostName());
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/4a008bdc/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
index f36471f..251aa5f 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
@@ -5715,6 +5715,7 @@ public class AmbariManagementControllerTest {
Assert.assertNotNull(execCmd.getConfigurationTags().get("hdfs-site"));
Assert.assertEquals(1, storedTasks.size());
Assert.assertEquals(HostComponentAdminState.DECOMMISSIONED, scHost.getComponentAdminState());
+ Assert.assertEquals(PassiveState.PASSIVE, scHost.getPassiveState());
HostRoleCommand command = storedTasks.get(0);
Assert.assertEquals(Role.NAMENODE, command.getRole());
Assert.assertEquals(RoleCommand.CUSTOM_COMMAND, command.getRoleCommand());
@@ -5741,6 +5742,7 @@ public class AmbariManagementControllerTest {
Assert.assertNotNull(storedTasks);
Assert.assertEquals(1, storedTasks.size());
Assert.assertEquals(HostComponentAdminState.DECOMMISSIONED, scHost.getComponentAdminState());
+ Assert.assertEquals(PassiveState.PASSIVE, scHost.getPassiveState());
cInfo = execCmd.getClusterHostInfo();
Assert.assertTrue(cInfo.containsKey("decom_dn_hosts"));
Assert.assertEquals("0,1", cInfo.get("decom_dn_hosts").iterator().next());
@@ -5775,6 +5777,7 @@ public class AmbariManagementControllerTest {
Assert.assertNotNull(storedTasks);
scHost = s.getServiceComponent("DATANODE").getServiceComponentHost("h2");
Assert.assertEquals(HostComponentAdminState.INSERVICE, scHost.getComponentAdminState());
+ Assert.assertEquals(PassiveState.ACTIVE, scHost.getPassiveState());
execCmd = storedTasks.get(0).getExecutionCommandWrapper
().getExecutionCommand();
Assert.assertNotNull(storedTasks);
@@ -5785,6 +5788,7 @@ public class AmbariManagementControllerTest {
// Slave components will have admin state as INSERVICE even if the state in DB is null
scHost.setComponentAdminState(null);
Assert.assertEquals(HostComponentAdminState.INSERVICE, scHost.getComponentAdminState());
+ Assert.assertEquals(PassiveState.ACTIVE, scHost.getPassiveState());
}
@Test