Repository: ambari Updated Branches: refs/heads/branch-2.2 fb8e9aa9c -> 29860c9ba
AMBARI-14891. RU/EU should only delete configs on downgrade if source stack matches stack whose status is CURRENT (alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/29860c9b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/29860c9b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/29860c9b Branch: refs/heads/branch-2.2 Commit: 29860c9ba49c8890fd020860a0aa148587278445 Parents: fb8e9aa Author: Alejandro Fernandez <afernan...@hortonworks.com> Authored: Wed Feb 3 09:58:17 2016 -0800 Committer: Alejandro Fernandez <afernan...@hortonworks.com> Committed: Wed Feb 3 09:58:17 2016 -0800 ---------------------------------------------------------------------- .../upgrades/FinalizeUpgradeAction.java | 23 ++- .../upgrades/UpgradeActionTest.java | 160 ++++++++++++++++--- 2 files changed, 156 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/29860c9b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java index 9331ef0..03d407a 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java @@ -39,6 +39,7 @@ import org.apache.ambari.server.orm.entities.ClusterVersionEntity; import org.apache.ambari.server.orm.entities.HostComponentStateEntity; import org.apache.ambari.server.orm.entities.HostEntity; import org.apache.ambari.server.orm.entities.HostVersionEntity; +import org.apache.ambari.server.orm.entities.RepositoryVersionEntity; import org.apache.ambari.server.serveraction.AbstractServerAction; import org.apache.ambari.server.state.Cluster; import org.apache.ambari.server.state.Clusters; @@ -64,6 +65,8 @@ public class FinalizeUpgradeAction extends AbstractServerAction { public static final String CLUSTER_NAME_KEY = "cluster_name"; public static final String UPGRADE_DIRECTION_KEY = "upgrade_direction"; public static final String VERSION_KEY = "version"; + public static final String PREVIOUS_UPGRADE_NOT_COMPLETED_MSG = "It is possible that a previous upgrade was not finalized. " + + "For this reason, Ambari will not remove any configs. Please ensure that all database records are correct."; /** * The original "current" stack of the cluster before the upgrade started. @@ -308,9 +311,25 @@ public class FinalizeUpgradeAction extends AbstractServerAction { Cluster cluster = clusters.getCluster(clusterName); StackId currentClusterStackId = cluster.getCurrentStackVersion(); - // this was a cross-stack upgrade, meaning that configurations were - // created that now need to be removed + // Safety check that the cluster's stack (from clusterstate's current_stack_id) is equivalent to the + // cluster's CURRENT repo version's stack. This is to avoid deleting configs from the target stack if the customer + // ended up modifying their database manually after a stack upgrade and forgot to call "Save DB State". + ClusterVersionEntity currentClusterVersion = cluster.getCurrentClusterVersion(); + RepositoryVersionEntity currentRepoVersion = currentClusterVersion.getRepositoryVersion(); + StackId currentRepoStackId = currentRepoVersion.getStackId(); + if (!currentRepoStackId.equals(originalStackId)) { + String msg = String.format("The stack of Cluster %s's CURRENT repo version is %s, yet the original stack id from " + + "the Stack Upgrade has a different value of %s. %s", + clusterName, currentRepoStackId.getStackId(), originalStackId.getStackId(), PREVIOUS_UPGRADE_NOT_COMPLETED_MSG); + out.append(msg); + err.append(msg); + throw new AmbariException("The source target stack doesn't match the cluster's CURRENT repo version's stack."); + } + + // This was a cross-stack upgrade, meaning that configurations were created that now need to be removed. if (!originalStackId.equals(targetStackId)) { + out.append(String.format("Will remove configs since the original stack %s differs from the target stack %s " + + "that Ambari just downgraded from.", originalStackId.getStackId(), targetStackId.getStackId())); cluster.removeConfigurations(targetStackId); } http://git-wip-us.apache.org/repos/asf/ambari/blob/29860c9b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeActionTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeActionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeActionTest.java index b6bc82e..e401443 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeActionTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeActionTest.java @@ -92,10 +92,13 @@ import com.google.inject.persist.UnitOfWork; * Tests upgrade-related server side actions */ public class UpgradeActionTest { + private static final String clusterName = "c1"; + private static final String HDP_2_1_1_0 = "2.1.1.0-1"; private static final String HDP_2_1_1_1 = "2.1.1.1-2"; private static final String HDP_2_2_0_1 = "2.2.0.1-3"; + private static final String HDP_2_2_0_2 = "2.2.0.2-4"; private static final StackId HDP_21_STACK = new StackId("HDP-2.1.1"); private static final StackId HDP_22_STACK = new StackId("HDP-2.2.0"); @@ -161,7 +164,6 @@ public class UpgradeActionTest { } private void makeDowngradeCluster(StackId sourceStack, String sourceRepo, StackId targetStack, String targetRepo) throws Exception { - String clusterName = "c1"; String hostName = "h1"; clusters.addCluster(clusterName, sourceStack); @@ -200,8 +202,71 @@ public class UpgradeActionTest { hostVersionDAO.create(entity); } + private void makeTwoUpgradesWhereLastDidNotComplete(StackId sourceStack, String sourceRepo, StackId midStack, String midRepo, StackId targetStack, String targetRepo) throws Exception { + String hostName = "h1"; + + clusters.addCluster(clusterName, sourceStack); + + Cluster c = clusters.getCluster(clusterName); + + // add a host component + clusters.addHost(hostName); + + Host host = clusters.getHost(hostName); + + Map<String, String> hostAttributes = new HashMap<String, String>(); + hostAttributes.put("os_family", "redhat"); + hostAttributes.put("os_release_version", "6"); + host.setHostAttributes(hostAttributes); + host.persist(); + + // Create the starting repo version + m_helper.getOrCreateRepositoryVersion(sourceStack, sourceRepo); + c.createClusterVersion(sourceStack, sourceRepo, "admin", RepositoryVersionState.UPGRADING); + c.transitionClusterVersion(sourceStack, sourceRepo, RepositoryVersionState.CURRENT); + + // Start upgrading the mid repo + m_helper.getOrCreateRepositoryVersion(midStack, midRepo); + c.setDesiredStackVersion(midStack); + c.createClusterVersion(midStack, midRepo, "admin", RepositoryVersionState.INSTALLING); + c.transitionClusterVersion(midStack, midRepo, RepositoryVersionState.INSTALLED); + c.transitionClusterVersion(midStack, midRepo, RepositoryVersionState.UPGRADING); + c.transitionClusterVersion(midStack, midRepo, RepositoryVersionState.UPGRADED); + c.transitionClusterVersion(midStack, midRepo, RepositoryVersionState.CURRENT); + + // Set original version as INSTALLED + c.transitionClusterVersion(sourceStack, sourceRepo, RepositoryVersionState.INSTALLED); + + // Notice that we have not yet changed the cluster current stack to the mid stack to simulate + // the user skipping this step. + + m_helper.getOrCreateRepositoryVersion(targetStack, targetRepo); + c.setDesiredStackVersion(targetStack); + c.createClusterVersion(targetStack, targetRepo, "admin", RepositoryVersionState.INSTALLING); + c.transitionClusterVersion(targetStack, targetRepo, RepositoryVersionState.INSTALLED); + c.transitionClusterVersion(targetStack, targetRepo, RepositoryVersionState.UPGRADING); + c.transitionClusterVersion(targetStack, targetRepo, RepositoryVersionState.UPGRADED); + + // Create a host version for the starting repo in INSTALLED + HostVersionEntity entitySource = new HostVersionEntity(); + entitySource.setHostEntity(hostDAO.findByName(hostName)); + entitySource.setRepositoryVersion(repoVersionDAO.findByStackAndVersion(sourceStack, sourceRepo)); + entitySource.setState(RepositoryVersionState.INSTALL_FAILED); + hostVersionDAO.create(entitySource); + + // Create a host version for the mid repo in CURRENT + c.mapHostVersions(Collections.singleton(hostName), c.getCurrentClusterVersion(), + RepositoryVersionState.CURRENT); + + // Create a host version for the target repo in UPGRADED + HostVersionEntity entityTarget = new HostVersionEntity(); + entityTarget.setHostEntity(hostDAO.findByName(hostName)); + entityTarget.setRepositoryVersion(repoVersionDAO.findByStackAndVersion(targetStack, targetRepo)); + entityTarget.setState(RepositoryVersionState.UPGRADED); + hostVersionDAO.create(entityTarget); + } + private void makeUpgradeCluster(StackId sourceStack, String sourceRepo, StackId targetStack, String targetRepo) throws Exception { - String clusterName = "c1"; String hostName = "h1"; Clusters clusters = m_injector.getInstance(Clusters.class); @@ -272,7 +337,6 @@ public class UpgradeActionTest { } private void makeCrossStackUpgradeCluster(StackId sourceStack, String sourceRepo, StackId targetStack, String targetRepo) throws Exception { - String clusterName = "c1"; String hostName = "h1"; Clusters clusters = m_injector.getInstance(Clusters.class); @@ -356,7 +420,7 @@ public class UpgradeActionTest { RepositoryVersionEntity targetRve = repoVersionDAO.findByStackNameAndVersion("HDP", targetRepo); Assert.assertNotNull(targetRve); - Cluster cluster = clusters.getCluster("c1"); + Cluster cluster = clusters.getCluster(clusterName); // Install ZK and HDFS with some components Service zk = installService(cluster, "ZOOKEEPER"); @@ -391,7 +455,7 @@ public class UpgradeActionTest { String userName = "admin"; roleParams.put(ServerAction.ACTION_USER_NAME, userName); executionCommand.setRoleParams(roleParams); - executionCommand.setClusterName("c1"); + executionCommand.setClusterName(clusterName); HostRoleCommand hostRoleCommand = hostRoleCommandFactory.create(null, null, null, null); hostRoleCommand.setExecutionCommandWrapper(new ExecutionCommandWrapper(executionCommand)); @@ -430,10 +494,12 @@ public class UpgradeActionTest { Map<String, String> commandParams = new HashMap<String, String>(); commandParams.put(FinalizeUpgradeAction.UPGRADE_DIRECTION_KEY, "downgrade"); commandParams.put(FinalizeUpgradeAction.VERSION_KEY, sourceRepo); + commandParams.put(FinalizeUpgradeAction.ORIGINAL_STACK_KEY, sourceStack.getStackId()); + commandParams.put(FinalizeUpgradeAction.TARGET_STACK_KEY, targetStack.getStackId()); ExecutionCommand executionCommand = new ExecutionCommand(); executionCommand.setCommandParams(commandParams); - executionCommand.setClusterName("c1"); + executionCommand.setClusterName(clusterName); HostRoleCommand hostRoleCommand = hostRoleCommandFactory.create(null, null, null, null); hostRoleCommand.setExecutionCommandWrapper(new ExecutionCommandWrapper(executionCommand)); @@ -446,7 +512,7 @@ public class UpgradeActionTest { assertNotNull(report); assertEquals(HostRoleStatus.COMPLETED.name(), report.getStatus()); - for (HostVersionEntity entity : hostVersionDAO.findByClusterAndHost("c1", "h1")) { + for (HostVersionEntity entity : hostVersionDAO.findByClusterAndHost(clusterName, "h1")) { if (entity.getRepositoryVersion().getVersion().equals(sourceRepo)) { assertEquals(RepositoryVersionState.CURRENT, entity.getState()); } else if (entity.getRepositoryVersion().getVersion().equals(targetRepo)) { @@ -454,7 +520,7 @@ public class UpgradeActionTest { } } - for (ClusterVersionEntity entity : clusterVersionDAO.findByCluster("c1")) { + for (ClusterVersionEntity entity : clusterVersionDAO.findByCluster(clusterName)) { if (entity.getRepositoryVersion().getVersion().equals(sourceRepo)) { assertEquals(RepositoryVersionState.CURRENT, entity.getState()); } else if (entity.getRepositoryVersion().getVersion().equals(targetRepo)) { @@ -463,6 +529,50 @@ public class UpgradeActionTest { } } + /** + * Test a case in which a customer performs an upgrade from HDP 2.1 to 2.2 (e.g., 2.2.0.0), but skips the step to + * finalize, which calls "Save DB State". Therefore, the cluster's current stack is still on HDP 2.1. + * They can still modify the database manually to mark HDP 2.2 as CURRENT in the cluster_version and then begin + * another upgrade to 2.2.0.2 and then downgrade. + * In the downgrade, the original stack is still 2.1 but the stack for the version marked as CURRENT is 2.2; this + * mismatch means that the downgrade should not delete configs and will report a warning. + * @throws Exception + */ + @Test + public void testFinalizeDowngradeWhenDidNotFinalizePreviousUpgrade() throws Exception { + StackId sourceStack = HDP_21_STACK; + StackId midStack = HDP_22_STACK; + StackId targetStack = HDP_22_STACK; + + String sourceRepo = HDP_2_1_1_0; + String midRepo = HDP_2_2_0_1; + String targetRepo = HDP_2_2_0_2; + + makeTwoUpgradesWhereLastDidNotComplete(sourceStack, sourceRepo, midStack, midRepo, targetStack, targetRepo); + + Map<String, String> commandParams = new HashMap<String, String>(); + commandParams.put(FinalizeUpgradeAction.UPGRADE_DIRECTION_KEY, "downgrade"); + commandParams.put(FinalizeUpgradeAction.VERSION_KEY, midRepo); + commandParams.put(FinalizeUpgradeAction.ORIGINAL_STACK_KEY, sourceStack.getStackId()); + commandParams.put(FinalizeUpgradeAction.TARGET_STACK_KEY, targetStack.getStackId()); + + ExecutionCommand executionCommand = new ExecutionCommand(); + executionCommand.setCommandParams(commandParams); + executionCommand.setClusterName(clusterName); + + HostRoleCommand hostRoleCommand = hostRoleCommandFactory.create(null, null, null, null); + hostRoleCommand.setExecutionCommandWrapper(new ExecutionCommandWrapper(executionCommand)); + + FinalizeUpgradeAction action = m_injector.getInstance(FinalizeUpgradeAction.class); + action.setExecutionCommand(executionCommand); + action.setHostRoleCommand(hostRoleCommand); + + CommandReport report = action.execute(null); + assertNotNull(report); + assertEquals(HostRoleStatus.FAILED.name(), report.getStatus()); + assertTrue(report.getStdErr().contains(FinalizeUpgradeAction.PREVIOUS_UPGRADE_NOT_COMPLETED_MSG)); + } + @Test public void testFinalizeUpgrade() throws Exception { StackId sourceStack = HDP_21_STACK; @@ -476,7 +586,7 @@ public class UpgradeActionTest { AmbariMetaInfo metaInfo = m_injector.getInstance(AmbariMetaInfo.class); AmbariCustomCommandExecutionHelper helper = m_injector.getInstance(AmbariCustomCommandExecutionHelper.class); Host host = clusters.getHost("h1"); - Cluster cluster = clusters.getCluster("c1"); + Cluster cluster = clusters.getCluster(clusterName); RepositoryInfo repo = metaInfo.getRepository(sourceStack.getStackName(), sourceStack.getStackVersion(), "redhat6", sourceStack.getStackId()); assertEquals(HDP_211_CENTOS6_REPO_URL, repo.getBaseUrl()); @@ -489,7 +599,7 @@ public class UpgradeActionTest { ExecutionCommand executionCommand = new ExecutionCommand(); executionCommand.setCommandParams(commandParams); - executionCommand.setClusterName("c1"); + executionCommand.setClusterName(clusterName); HostRoleCommand hostRoleCommand = hostRoleCommandFactory.create(null, null, null, null); hostRoleCommand.setExecutionCommandWrapper(new ExecutionCommandWrapper(executionCommand)); @@ -539,7 +649,7 @@ public class UpgradeActionTest { AmbariMetaInfo metaInfo = m_injector.getInstance(AmbariMetaInfo.class); AmbariCustomCommandExecutionHelper helper = m_injector.getInstance(AmbariCustomCommandExecutionHelper.class); Host host = clusters.getHost("h1"); - Cluster cluster = clusters.getCluster("c1"); + Cluster cluster = clusters.getCluster(clusterName); RepositoryInfo repo = metaInfo.getRepository(sourceStack.getStackName(), sourceStack.getStackVersion(), "redhat6", sourceStack.getStackId()); @@ -553,7 +663,7 @@ public class UpgradeActionTest { ExecutionCommand executionCommand = new ExecutionCommand(); executionCommand.setCommandParams(commandParams); - executionCommand.setClusterName("c1"); + executionCommand.setClusterName(clusterName); HostRoleCommand hostRoleCommand = hostRoleCommandFactory.create(null, null, null, null); hostRoleCommand.setExecutionCommandWrapper(new ExecutionCommandWrapper(executionCommand)); @@ -589,7 +699,7 @@ public class UpgradeActionTest { makeCrossStackUpgradeCluster(sourceStack, sourceRepo, targetStack, targetRepo); - Cluster cluster = clusters.getCluster("c1"); + Cluster cluster = clusters.getCluster(clusterName); // setup the cluster for the upgrade across stacks cluster.setCurrentStackVersion(sourceStack); @@ -603,7 +713,7 @@ public class UpgradeActionTest { ExecutionCommand executionCommand = new ExecutionCommand(); executionCommand.setCommandParams(commandParams); - executionCommand.setClusterName("c1"); + executionCommand.setClusterName(clusterName); HostRoleCommand hostRoleCommand = hostRoleCommandFactory.create(null, null, null, null); @@ -640,7 +750,7 @@ public class UpgradeActionTest { String targetRepo = HDP_2_2_0_1; makeCrossStackUpgradeCluster(sourceStack, sourceRepo, targetStack, targetRepo); - Cluster cluster = clusters.getCluster("c1"); + Cluster cluster = clusters.getCluster(clusterName); // install HDFS with some components Service service = installService(cluster, "HDFS"); @@ -661,7 +771,7 @@ public class UpgradeActionTest { createConfigs(cluster); // verify we have configs in both HDP stacks - cluster = clusters.getCluster("c1"); + cluster = clusters.getCluster(clusterName); Collection<Config> configs = cluster.getAllConfigs(); assertEquals(8, configs.size()); @@ -673,7 +783,7 @@ public class UpgradeActionTest { ExecutionCommand executionCommand = new ExecutionCommand(); executionCommand.setCommandParams(commandParams); - executionCommand.setClusterName("c1"); + executionCommand.setClusterName(clusterName); HostRoleCommand hostRoleCommand = hostRoleCommandFactory.create(null, null, null, null); @@ -681,7 +791,7 @@ public class UpgradeActionTest { HostVersionDAO dao = m_injector.getInstance(HostVersionDAO.class); - List<HostVersionEntity> hosts = dao.findByClusterStackAndVersion("c1", targetStack, targetRepo); + List<HostVersionEntity> hosts = dao.findByClusterStackAndVersion(clusterName, targetStack, targetRepo); assertFalse(hosts.isEmpty()); for (HostVersionEntity hve : hosts) { assertFalse(hve.getState() == RepositoryVersionState.INSTALLED); @@ -704,11 +814,11 @@ public class UpgradeActionTest { assertEquals(sourceStack, desiredStackId); // verify we have configs in only 1 stack - cluster = clusters.getCluster("c1"); + cluster = clusters.getCluster(clusterName); configs = cluster.getAllConfigs(); assertEquals(4, configs.size()); - hosts = dao.findByClusterStackAndVersion("c1", targetStack, targetRepo); + hosts = dao.findByClusterStackAndVersion(clusterName, targetStack, targetRepo); assertFalse(hosts.isEmpty()); for (HostVersionEntity hve : hosts) { assertTrue(hve.getState() == RepositoryVersionState.INSTALLED); @@ -731,7 +841,7 @@ public class UpgradeActionTest { makeCrossStackUpgradeCluster(sourceStack, sourceRepo, targetStack, targetRepo); - Cluster cluster = clusters.getCluster("c1"); + Cluster cluster = clusters.getCluster(clusterName); Service service = installService(cluster, "HDFS"); addServiceComponent(cluster, service, "NAMENODE"); @@ -754,14 +864,14 @@ public class UpgradeActionTest { // inject an unhappy path where the cluster repo version is still UPGRADING // even though all of the hosts are UPGRADED ClusterVersionEntity upgradingClusterVersion = clusterVersionDAO.findByClusterAndStackAndVersion( - "c1", HDP_22_STACK, targetRepo); + clusterName, HDP_22_STACK, targetRepo); upgradingClusterVersion.setState(RepositoryVersionState.UPGRADING); upgradingClusterVersion = clusterVersionDAO.merge(upgradingClusterVersion); // verify the conditions for the test are met properly - upgradingClusterVersion = clusterVersionDAO.findByClusterAndStackAndVersion("c1", HDP_22_STACK, targetRepo); - List<HostVersionEntity> hostVersions = hostVersionDAO.findByClusterStackAndVersion("c1", HDP_22_STACK, targetRepo); + upgradingClusterVersion = clusterVersionDAO.findByClusterAndStackAndVersion(clusterName, HDP_22_STACK, targetRepo); + List<HostVersionEntity> hostVersions = hostVersionDAO.findByClusterStackAndVersion(clusterName, HDP_22_STACK, targetRepo); assertEquals(RepositoryVersionState.UPGRADING, upgradingClusterVersion.getState()); assertTrue(hostVersions.size() > 0); @@ -779,7 +889,7 @@ public class UpgradeActionTest { ExecutionCommand executionCommand = new ExecutionCommand(); executionCommand.setCommandParams(commandParams); - executionCommand.setClusterName("c1"); + executionCommand.setClusterName(clusterName); HostRoleCommand hostRoleCommand = hostRoleCommandFactory.create(null, null, null, null);
