You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/09/03 19:52:58 UTC
[1/2] ambari git commit: AMBARI-12699. Stop-and-Start Upgrade: DB
Schema Changes (alejandro)
Repository: ambari
Updated Branches:
refs/heads/branch-dev-stop-all-upgrade cca303d2a -> ddd5d928e
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java
index 442bcb2..c01dcd2 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java
@@ -42,6 +42,7 @@ import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
import org.apache.ambari.server.orm.dao.ClusterVersionDAO;
import org.apache.ambari.server.orm.dao.RepositoryVersionDAO;
import org.apache.ambari.server.orm.dao.StackDAO;
+import org.apache.ambari.server.orm.entities.ClusterEntity;
import org.apache.ambari.server.orm.entities.ClusterVersionEntity;
import org.apache.ambari.server.orm.entities.RepositoryVersionEntity;
import org.apache.ambari.server.orm.entities.StackEntity;
@@ -67,16 +68,41 @@ import com.google.inject.persist.PersistService;
*/
public class RepositoryVersionResourceProviderTest {
+ private ClusterVersionDAO clusterVersionDAO;
+
private static Injector injector;
private static String jsonStringRedhat6 = "[{\"OperatingSystems\":{\"os_type\":\"redhat6\"},\"repositories\":[]}]";
private static String jsonStringRedhat7 = "[{\"OperatingSystems\":{\"os_type\":\"redhat7\"},\"repositories\":[]}]";
+ private List<ClusterVersionEntity> getNoClusterVersions() {
+ final List<ClusterVersionEntity> emptyList = new ArrayList<ClusterVersionEntity>();
+ return emptyList;
+ }
+
+ private List<ClusterVersionEntity> getInstallFailedClusterVersions() {
+ ClusterEntity cluster = new ClusterEntity();
+ cluster.setClusterName("c1");
+ cluster.setClusterId(1L);
+
+ final List<ClusterVersionEntity> clusterVersions = new ArrayList<ClusterVersionEntity>();
+ final RepositoryVersionEntity repositoryVersion = new RepositoryVersionEntity();
+ repositoryVersion.setId(1L);
+ final ClusterVersionEntity installFailedVersion = new ClusterVersionEntity();
+ installFailedVersion.setState(RepositoryVersionState.INSTALL_FAILED);
+ installFailedVersion.setRepositoryVersion(repositoryVersion);
+ installFailedVersion.setClusterEntity(cluster);
+ clusterVersions.add(installFailedVersion);
+ cluster.setClusterVersionEntities(clusterVersions);
+ return clusterVersions;
+ }
+
@Before
public void before() throws Exception {
final Set<String> validVersions = Sets.newHashSet("1.1", "1.1-17", "1.1.1.1", "1.1.343432.2", "1.1.343432.2-234234324");
final AmbariMetaInfo ambariMetaInfo = Mockito.mock(AmbariMetaInfo.class);
- final ClusterVersionDAO clusterVersionDAO = Mockito.mock(ClusterVersionDAO.class);
+ clusterVersionDAO = Mockito.mock(ClusterVersionDAO.class);
+
final InMemoryDefaultTestModule injectorModule = new InMemoryDefaultTestModule() {
@Override
protected void configure() {
@@ -93,12 +119,22 @@ public class RepositoryVersionResourceProviderTest {
final Map<String, UpgradePack> map = new HashMap<String, UpgradePack>();
final UpgradePack pack1 = new UpgradePack() {
@Override
+ public String getName() {
+ return "pack1";
+ }
+
+ @Override
public String getTarget() {
return "1.1.*.*";
}
};
final UpgradePack pack2 = new UpgradePack() {
@Override
+ public String getName() {
+ return "pack2";
+ }
+
+ @Override
public String getTarget() {
return "1.1.*.*";
}
@@ -151,29 +187,17 @@ public class RepositoryVersionResourceProviderTest {
}
});
- Mockito.when(
- clusterVersionDAO.findByStackAndVersion(Mockito.anyString(),
- Mockito.anyString(), Mockito.anyString())).thenAnswer(
+ Mockito.when(clusterVersionDAO.findByStackAndVersion(Mockito.anyString(), Mockito.anyString(), Mockito.anyString())).thenAnswer(
new Answer<List<ClusterVersionEntity>>() {
-
@Override
- public List<ClusterVersionEntity> answer(InvocationOnMock invocation)
- throws Throwable {
+ public List<ClusterVersionEntity> answer(InvocationOnMock invocation) throws Throwable {
final String stack = invocation.getArguments()[0].toString();
final String version = invocation.getArguments()[1].toString();
+
if (stack.equals("HDP-1.1") && version.equals("1.1.1.1")) {
- final List<ClusterVersionEntity> notEmptyList = new ArrayList<ClusterVersionEntity>();
- notEmptyList.add(null);
- return notEmptyList;
+ return getNoClusterVersions();
} else {
- final List<ClusterVersionEntity> clusterVersions = new ArrayList<ClusterVersionEntity>();
- final RepositoryVersionEntity repositoryVersion = new RepositoryVersionEntity();
- repositoryVersion.setId(1L);
- final ClusterVersionEntity installFailedVersion = new ClusterVersionEntity();
- installFailedVersion.setState(RepositoryVersionState.INSTALL_FAILED);
- installFailedVersion.setRepositoryVersion(repositoryVersion);
- clusterVersions.add(installFailedVersion);
- return clusterVersions;
+ return getInstallFailedClusterVersions();
}
}
});
@@ -198,7 +222,6 @@ public class RepositoryVersionResourceProviderTest {
properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_DISPLAY_NAME_PROPERTY_ID, "name");
properties.put(RepositoryVersionResourceProvider.SUBRESOURCE_OPERATING_SYSTEMS_PROPERTY_ID, new Gson().fromJson("[{\"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"1\",\"Repositories/repo_name\":\"1\",\"Repositories/base_url\":\"1\"}]}]", Object.class));
properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_STACK_NAME_PROPERTY_ID, "HDP");
- properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_UPGRADE_PACK_PROPERTY_ID, "pack1");
properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_STACK_VERSION_PROPERTY_ID, "1.1");
properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_REPOSITORY_VERSION_PROPERTY_ID, "1.1.1.1");
propertySet.add(properties);
@@ -251,7 +274,6 @@ public class RepositoryVersionResourceProviderTest {
final RepositoryVersionEntity entity = new RepositoryVersionEntity();
entity.setDisplayName("name");
entity.setStack(stackEntity);
- entity.setUpgradePackage("pack1");
entity.setVersion("1.1");
entity.setOperatingSystems("[{\"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"1\",\"Repositories/repo_name\":\"1\",\"Repositories/base_url\":\"http://example.com/repo1\"}]}]");
@@ -281,13 +303,6 @@ public class RepositoryVersionResourceProviderTest {
} catch (Exception ex) {
}
- entity.setUpgradePackage("pack2");
- try {
- provider.validateRepositoryVersion(entity);
- Assert.fail("Should throw exception");
- } catch (Exception ex) {
- }
-
StackEntity bigtop = new StackEntity();
stackEntity.setStackName("BIGTOP");
entity.setStack(bigtop);
@@ -300,7 +315,6 @@ public class RepositoryVersionResourceProviderTest {
final RepositoryVersionDAO repositoryVersionDAO = injector.getInstance(RepositoryVersionDAO.class);
entity.setDisplayName("name");
entity.setStack(stackEntity);
- entity.setUpgradePackage("pack1");
entity.setVersion("1.1");
entity.setOperatingSystems("[{\"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"1\",\"Repositories/repo_name\":\"1\",\"Repositories/base_url\":\"http://example.com/repo1\"}]}]");
repositoryVersionDAO.create(entity);
@@ -309,7 +323,6 @@ public class RepositoryVersionResourceProviderTest {
entity2.setId(2l);
entity2.setDisplayName("name2");
entity2.setStack(stackEntity);
- entity2.setUpgradePackage("pack1");
entity2.setVersion("1.2");
entity2.setOperatingSystems("[{\"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"1\",\"Repositories/repo_name\":\"1\",\"Repositories/base_url\":\"http://example.com/repo1\"}]}]");
@@ -330,7 +343,6 @@ public class RepositoryVersionResourceProviderTest {
properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_DISPLAY_NAME_PROPERTY_ID, "name");
properties.put(RepositoryVersionResourceProvider.SUBRESOURCE_OPERATING_SYSTEMS_PROPERTY_ID, new Gson().fromJson("[{\"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"1\",\"Repositories/repo_name\":\"1\",\"Repositories/base_url\":\"1\"}]}]", Object.class));
properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_STACK_NAME_PROPERTY_ID, "HDP");
- properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_UPGRADE_PACK_PROPERTY_ID, "pack1");
properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_STACK_VERSION_PROPERTY_ID, "1.1");
properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_REPOSITORY_VERSION_PROPERTY_ID, "1.1.1.2");
propertySet.add(properties);
@@ -355,12 +367,19 @@ public class RepositoryVersionResourceProviderTest {
public void testUpdateResources() throws Exception {
final ResourceProvider provider = injector.getInstance(ResourceProviderFactory.class).getRepositoryVersionResourceProvider();
+ Mockito.when(clusterVersionDAO.findByStackAndVersion(Mockito.anyString(), Mockito.anyString(), Mockito.anyString())).thenAnswer(
+ new Answer<List<ClusterVersionEntity>>() {
+ @Override
+ public List<ClusterVersionEntity> answer(InvocationOnMock invocation) throws Throwable {
+ return getNoClusterVersions();
+ }
+ });
+
final Set<Map<String, Object>> propertySet = new LinkedHashSet<Map<String, Object>>();
final Map<String, Object> properties = new LinkedHashMap<String, Object>();
properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_DISPLAY_NAME_PROPERTY_ID, "name");
properties.put(RepositoryVersionResourceProvider.SUBRESOURCE_OPERATING_SYSTEMS_PROPERTY_ID, new Gson().fromJson("[{\"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"1\",\"Repositories/repo_name\":\"1\",\"Repositories/base_url\":\"http://example.com/repo1\"}]}]", Object.class));
properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_STACK_NAME_PROPERTY_ID, "HDP");
- properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_UPGRADE_PACK_PROPERTY_ID, "pack1");
properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_STACK_VERSION_PROPERTY_ID, "1.1");
properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_REPOSITORY_VERSION_PROPERTY_ID, "1.1.1.1");
propertySet.add(properties);
@@ -369,8 +388,7 @@ public class RepositoryVersionResourceProviderTest {
final Predicate predicateStackVersion = new PredicateBuilder().property(RepositoryVersionResourceProvider.REPOSITORY_VERSION_STACK_VERSION_PROPERTY_ID).equals("1.1").toPredicate();
final Request getRequest = PropertyHelper.getReadRequest(
RepositoryVersionResourceProvider.REPOSITORY_VERSION_DISPLAY_NAME_PROPERTY_ID,
- RepositoryVersionResourceProvider.SUBRESOURCE_OPERATING_SYSTEMS_PROPERTY_ID,
- RepositoryVersionResourceProvider.REPOSITORY_VERSION_UPGRADE_PACK_PROPERTY_ID);
+ RepositoryVersionResourceProvider.SUBRESOURCE_OPERATING_SYSTEMS_PROPERTY_ID);
Assert.assertEquals(0, provider.getResources(getRequest, new AndPredicate(predicateStackName, predicateStackVersion)).size());
final Request createRequest = PropertyHelper.getCreateRequest(propertySet, null);
@@ -379,8 +397,6 @@ public class RepositoryVersionResourceProviderTest {
Assert.assertEquals(1, provider.getResources(getRequest, new AndPredicate(predicateStackName, predicateStackVersion)).size());
Assert.assertEquals("name", provider.getResources(getRequest, new AndPredicate(predicateStackName, predicateStackVersion)).iterator().next().getPropertyValue(RepositoryVersionResourceProvider.REPOSITORY_VERSION_DISPLAY_NAME_PROPERTY_ID));
- properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_UPGRADE_PACK_PROPERTY_ID, null);
-
properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_ID_PROPERTY_ID, "1");
properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_DISPLAY_NAME_PROPERTY_ID, "name2");
final Request updateRequest = PropertyHelper.getUpdateRequest(properties, null);
@@ -391,7 +407,15 @@ public class RepositoryVersionResourceProviderTest {
properties.put(RepositoryVersionResourceProvider.SUBRESOURCE_OPERATING_SYSTEMS_PROPERTY_ID, new Gson().fromJson("[{\"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"2\",\"Repositories/repo_name\":\"2\",\"Repositories/base_url\":\"2\"}]}]", Object.class));
provider.updateResources(updateRequest, new AndPredicate(predicateStackName, predicateStackVersion));
- properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_UPGRADE_PACK_PROPERTY_ID, "pack2");
+ // Now, insert a cluster version whose state is INSTALL_FAILED, so the operation will not be permitted.
+ Mockito.when(clusterVersionDAO.findByStackAndVersion(Mockito.anyString(), Mockito.anyString(), Mockito.anyString())).thenAnswer(
+ new Answer<List<ClusterVersionEntity>>() {
+ @Override
+ public List<ClusterVersionEntity> answer(InvocationOnMock invocation) throws Throwable {
+ return getInstallFailedClusterVersions();
+ }
+ });
+
try {
provider.updateResources(updateRequest, new AndPredicate(predicateStackName, predicateStackVersion));
Assert.fail("Update of upgrade pack should not be allowed when repo version is installed on any cluster");
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java
index 166b665..e35d584 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java
@@ -169,7 +169,6 @@ public class UpgradeResourceProviderHDP22Test {
repoVersionEntity.setDisplayName("For Stack Version 2.2.0");
repoVersionEntity.setOperatingSystems("");
repoVersionEntity.setStack(stackEntity);
- repoVersionEntity.setUpgradePackage("upgrade_test");
repoVersionEntity.setVersion("2.2.0.0");
repoVersionDao.create(repoVersionEntity);
@@ -177,7 +176,6 @@ public class UpgradeResourceProviderHDP22Test {
repoVersionEntity.setDisplayName("For Stack Version 2.2.4.2");
repoVersionEntity.setOperatingSystems("");
repoVersionEntity.setStack(stackEntity);
- repoVersionEntity.setUpgradePackage("upgrade_test");
repoVersionEntity.setVersion("2.2.4.2");
repoVersionDao.create(repoVersionEntity);
@@ -261,6 +259,7 @@ public class UpgradeResourceProviderHDP22Test {
Map<String, Object> requestProps = new HashMap<String, Object>();
requestProps.put(UpgradeResourceProvider.UPGRADE_CLUSTER_NAME, "c1");
requestProps.put(UpgradeResourceProvider.UPGRADE_VERSION, "2.2.4.2");
+ requestProps.put(UpgradeResourceProvider.UPGRADE_PACK, "upgrade_test");
ResourceProvider upgradeResourceProvider = createProvider(amc);
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java
index 7d2c117..6708422 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java
@@ -81,6 +81,7 @@ import org.apache.ambari.server.state.ServiceComponentHost;
import org.apache.ambari.server.state.StackId;
import org.apache.ambari.server.state.stack.UpgradePack;
import org.apache.ambari.server.state.stack.upgrade.Direction;
+import org.apache.ambari.server.state.stack.upgrade.UpgradeType;
import org.apache.ambari.server.topology.TopologyManager;
import org.apache.ambari.server.utils.StageUtils;
import org.apache.ambari.server.view.ViewRegistry;
@@ -156,41 +157,42 @@ public class UpgradeResourceProviderTest {
replay(publisher);
ViewRegistry.initInstance(new ViewRegistry(publisher));
- StackEntity stackEntity = stackDAO.find("HDP", "2.1.1");
+ StackEntity stackEntity211 = stackDAO.find("HDP", "2.1.1");
+ StackEntity stackEntity220 = stackDAO.find("HDP", "2.2.0");
+ StackId stack211 = new StackId("HDP-2.1.1");
+ StackId stack220 = new StackId("HDP-2.2.0");
RepositoryVersionEntity repoVersionEntity = new RepositoryVersionEntity();
repoVersionEntity.setDisplayName("My New Version 1");
repoVersionEntity.setOperatingSystems("");
- repoVersionEntity.setStack(stackEntity);
- repoVersionEntity.setUpgradePackage("upgrade_test");
+ repoVersionEntity.setStack(stackEntity211);
repoVersionEntity.setVersion("2.1.1.0");
repoVersionDao.create(repoVersionEntity);
repoVersionEntity = new RepositoryVersionEntity();
- repoVersionEntity.setDisplayName("My New Version 2");
+ repoVersionEntity.setDisplayName("My New Version 2 for patch upgrade");
repoVersionEntity.setOperatingSystems("");
- repoVersionEntity.setStack(stackEntity);
- repoVersionEntity.setUpgradePackage("upgrade_test");
+ repoVersionEntity.setStack(stackEntity211);
repoVersionEntity.setVersion("2.1.1.1");
repoVersionDao.create(repoVersionEntity);
repoVersionEntity = new RepositoryVersionEntity();
- repoVersionEntity.setDisplayName("For Stack Version 2.2.0");
+ repoVersionEntity.setDisplayName("My New Version 3 for major upgrade");
repoVersionEntity.setOperatingSystems("");
- repoVersionEntity.setStack(stackDAO.find("HDP", "2.2.0"));
- repoVersionEntity.setUpgradePackage("upgrade_test");
+ repoVersionEntity.setStack(stackEntity220);
repoVersionEntity.setVersion("2.2.0.0");
repoVersionDao.create(repoVersionEntity);
clusters = injector.getInstance(Clusters.class);
- StackId stackId = new StackId("HDP-2.1.1");
- clusters.addCluster("c1", stackId);
+ clusters.addCluster("c1", stack211);
Cluster cluster = clusters.getCluster("c1");
- helper.getOrCreateRepositoryVersion(stackId, stackId.getStackVersion());
- cluster.createClusterVersion(stackId, stackId.getStackVersion(), "admin", RepositoryVersionState.UPGRADING);
- cluster.transitionClusterVersion(stackId, stackId.getStackVersion(), RepositoryVersionState.CURRENT);
+ helper.getOrCreateRepositoryVersion(stack211, stack211.getStackVersion());
+ helper.getOrCreateRepositoryVersion(stack220, stack220.getStackVersion());
+
+ cluster.createClusterVersion(stack211, stack211.getStackVersion(), "admin", RepositoryVersionState.UPGRADING);
+ cluster.transitionClusterVersion(stack211, stack211.getStackVersion(), RepositoryVersionState.CURRENT);
clusters.addHost("h1");
Host host = clusters.getHost("h1");
@@ -237,6 +239,7 @@ public class UpgradeResourceProviderTest {
Map<String, Object> requestProps = new HashMap<String, Object>();
requestProps.put(UpgradeResourceProvider.UPGRADE_CLUSTER_NAME, "c1");
requestProps.put(UpgradeResourceProvider.UPGRADE_VERSION, "2.1.1.1");
+ requestProps.put(UpgradeResourceProvider.UPGRADE_PACK, "upgrade_test");
ResourceProvider upgradeResourceProvider = createProvider(amc);
@@ -428,6 +431,8 @@ public class UpgradeResourceProviderTest {
upgradeEntity.setDirection(Direction.UPGRADE);
upgradeEntity.setFromVersion("2.1.1.1");
upgradeEntity.setToVersion("2.2.2.2");
+ upgradeEntity.setUpgradePackage("upgrade_test");
+ upgradeEntity.setUpgradeType(UpgradeType.ROLLING);
upgradeEntity.setRequestId(1L);
upgradeDao.create(upgradeEntity);
@@ -440,6 +445,7 @@ public class UpgradeResourceProviderTest {
Map<String, Object> requestProps = new HashMap<String, Object>();
requestProps.put(UpgradeResourceProvider.UPGRADE_CLUSTER_NAME, "c1");
requestProps.put(UpgradeResourceProvider.UPGRADE_VERSION, "2.1.1.1");
+ requestProps.put(UpgradeResourceProvider.UPGRADE_PACK, "upgrade_test");
Map<String, String> requestInfoProperties = new HashMap<String, String>();
requestInfoProperties.put(UpgradeResourceDefinition.DOWNGRADE_DIRECTIVE, "true");
@@ -472,6 +478,7 @@ public class UpgradeResourceProviderTest {
Map<String, Object> requestProps = new HashMap<String, Object>();
requestProps.put(UpgradeResourceProvider.UPGRADE_CLUSTER_NAME, "c1");
requestProps.put(UpgradeResourceProvider.UPGRADE_VERSION, "2.1.1.1");
+ requestProps.put(UpgradeResourceProvider.UPGRADE_PACK, "upgrade_test");
ResourceProvider upgradeResourceProvider = createProvider(amc);
@@ -484,6 +491,7 @@ public class UpgradeResourceProviderTest {
requestProps = new HashMap<String, Object>();
requestProps.put(UpgradeResourceProvider.UPGRADE_CLUSTER_NAME, "c1");
requestProps.put(UpgradeResourceProvider.UPGRADE_VERSION, "2.2");
+ requestProps.put(UpgradeResourceProvider.UPGRADE_PACK, "upgrade_test");
request = PropertyHelper.getCreateRequest(Collections.singleton(requestProps), null);
try {
status = upgradeResourceProvider.createResources(request);
@@ -493,7 +501,8 @@ public class UpgradeResourceProviderTest {
}
requestProps.put(UpgradeResourceProvider.UPGRADE_CLUSTER_NAME, "c1");
- requestProps.put(UpgradeResourceProvider.UPGRADE_VERSION, "2.2");
+ requestProps.put(UpgradeResourceProvider.UPGRADE_VERSION, "2.2.0.0");
+ requestProps.put(UpgradeResourceProvider.UPGRADE_PACK, "upgrade_test");
requestProps.put(UpgradeResourceProvider.UPGRADE_FROM_VERSION, "2.1.1.0");
Map<String, String> requestInfoProperties = new HashMap<String, String>();
@@ -508,7 +517,7 @@ public class UpgradeResourceProviderTest {
UpgradeEntity entity = upgradeDao.findUpgrade(Long.parseLong(id));
assertNotNull(entity);
assertEquals("2.1.1", entity.getFromVersion());
- assertEquals("2.2", entity.getToVersion());
+ assertEquals("2.2.0.0", entity.getToVersion());
assertEquals(Direction.DOWNGRADE, entity.getDirection());
StageDAO dao = injector.getInstance(StageDAO.class);
@@ -606,13 +615,13 @@ public class UpgradeResourceProviderTest {
repoVersionEntity.setDisplayName("My New Version 3");
repoVersionEntity.setOperatingSystems("");
repoVersionEntity.setStack(stackEntity);
- repoVersionEntity.setUpgradePackage("upgrade_direction");
repoVersionEntity.setVersion("2.2.2.3");
repoVersionDao.create(repoVersionEntity);
Map<String, Object> requestProps = new HashMap<String, Object>();
requestProps.put(UpgradeResourceProvider.UPGRADE_CLUSTER_NAME, "c1");
requestProps.put(UpgradeResourceProvider.UPGRADE_VERSION, "2.2.2.3");
+ requestProps.put(UpgradeResourceProvider.UPGRADE_PACK, "upgrade_direction");
ResourceProvider upgradeResourceProvider = createProvider(amc);
@@ -625,12 +634,20 @@ public class UpgradeResourceProviderTest {
UpgradeEntity upgrade = upgrades.get(0);
Long id = upgrade.getRequestId();
assertEquals(3, upgrade.getUpgradeGroups().size());
+ // Ensure that there are no items related to downgrade in the upgrade direction
UpgradeGroupEntity group = upgrade.getUpgradeGroups().get(2);
- assertEquals(1, group.getItems().size());
+ Assert.assertEquals("POST_CLUSTER", group.getName());
+ Assert.assertTrue(!group.getItems().isEmpty());
+ for (UpgradeItemEntity item : group.getItems()) {
+ Assert.assertFalse(item.getText().toLowerCase().contains("downgrade"));
+ }
+
requestProps.clear();
+ // Now perform a downgrade
requestProps.put(UpgradeResourceProvider.UPGRADE_CLUSTER_NAME, "c1");
requestProps.put(UpgradeResourceProvider.UPGRADE_VERSION, "2.2");
+ requestProps.put(UpgradeResourceProvider.UPGRADE_PACK, "upgrade_direction");
requestProps.put(UpgradeResourceProvider.UPGRADE_FROM_VERSION, "2.2.2.3");
Map<String, String> requestInfoProps = new HashMap<String, String>();
@@ -734,6 +751,7 @@ public class UpgradeResourceProviderTest {
Map<String, Object> requestProps = new HashMap<String, Object>();
requestProps.put(UpgradeResourceProvider.UPGRADE_CLUSTER_NAME, "c1");
requestProps.put(UpgradeResourceProvider.UPGRADE_VERSION, "2.2.0.0");
+ requestProps.put(UpgradeResourceProvider.UPGRADE_PACK, "upgrade_test");
ResourceProvider upgradeResourceProvider = createProvider(amc);
@@ -864,7 +882,8 @@ public class UpgradeResourceProviderTest {
UpgradeResourceProvider upgradeResourceProvider = createProvider(amc);
Map<String, UpgradePack> upgradePacks = ambariMetaInfo.getUpgradePacks("HDP", "2.1.1");
- upgradeResourceProvider.processConfigurations(stack211.getStackName(), cluster, "2.2.0.0", Direction.UPGRADE, upgradePacks.get("upgrade_to_new_stack"));
+ UpgradePack upgrade = upgradePacks.get("upgrade_to_new_stack");
+ upgradeResourceProvider.processConfigurations(stack211.getStackName(), cluster, "2.2.0.0", Direction.UPGRADE, upgrade);
Map<String, Map<String, String>> expectedConfigurations = expectedConfigurationsCapture.getValue();
Map<String, String> expectedFooType = expectedConfigurations.get("foo-site");
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java
index 53f7432..62807d9 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java
@@ -613,7 +613,7 @@ public class OrmTestHelper {
if (repositoryVersion == null) {
try {
repositoryVersion = repositoryVersionDAO.create(stackEntity, version,
- String.valueOf(System.currentTimeMillis()), "pack", "");
+ String.valueOf(System.currentTimeMillis()), "");
} catch (Exception ex) {
Assert.fail(MessageFormat.format("Unable to create Repo Version for Stack {0} and version {1}",
stackEntity.getStackName() + "-" + stackEntity.getStackVersion(), version));
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/CrudDAOTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/CrudDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/CrudDAOTest.java
index 8777d33..6b5b297 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/CrudDAOTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/CrudDAOTest.java
@@ -69,7 +69,6 @@ public class CrudDAOTest {
entity.setDisplayName("display name" + uniqueCounter);
entity.setOperatingSystems("repositories");
entity.setStack(stackEntity);
- entity.setUpgradePackage("upgrade package");
entity.setVersion("version");
repositoryVersionDAO.create(entity);
uniqueCounter++;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAOTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAOTest.java
index adda018..9d390a9 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAOTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAOTest.java
@@ -81,7 +81,6 @@ public class RepositoryVersionDAOTest {
entity.setDisplayName("display name");
entity.setOperatingSystems("repositories");
entity.setStack(stackEntity);
- entity.setUpgradePackage("upgrade package");
entity.setVersion("version");
repositoryVersionDAO.create(entity);
@@ -103,12 +102,11 @@ public class RepositoryVersionDAOTest {
dupVersion.setDisplayName("display name " + uuid.toString());
dupVersion.setOperatingSystems("repositories");
dupVersion.setStack(stackEntity);
- dupVersion.setUpgradePackage("upgrade package");
dupVersion.setVersion(first.getVersion());
boolean exceptionThrown = false;
try {
- repositoryVersionDAO.create(stackEntity, dupVersion.getVersion(), dupVersion.getDisplayName(), dupVersion.getUpgradePackage(), dupVersion.getOperatingSystemsJson());
+ repositoryVersionDAO.create(stackEntity, dupVersion.getVersion(), dupVersion.getDisplayName(), dupVersion.getOperatingSystemsJson());
} catch (AmbariException e) {
exceptionThrown = true;
Assert.assertTrue(e.getMessage().contains("already exists"));
@@ -121,7 +119,7 @@ public class RepositoryVersionDAOTest {
// The version must belong to the stack
dupVersion.setVersion("2.3-1234");
try {
- repositoryVersionDAO.create(stackEntity, dupVersion.getVersion(), dupVersion.getDisplayName(), dupVersion.getUpgradePackage(), dupVersion.getOperatingSystemsJson());
+ repositoryVersionDAO.create(stackEntity, dupVersion.getVersion(), dupVersion.getDisplayName(), dupVersion.getOperatingSystemsJson());
} catch (AmbariException e) {
exceptionThrown = true;
Assert.assertTrue(e.getMessage().contains("needs to belong to stack"));
@@ -132,7 +130,7 @@ public class RepositoryVersionDAOTest {
// Success
dupVersion.setVersion(stackEntity.getStackVersion() + "-1234");
try {
- repositoryVersionDAO.create(stackEntity, dupVersion.getVersion(), dupVersion.getDisplayName(), dupVersion.getUpgradePackage(), dupVersion.getOperatingSystemsJson());
+ repositoryVersionDAO.create(stackEntity, dupVersion.getVersion(), dupVersion.getDisplayName(), dupVersion.getOperatingSystemsJson());
} catch (AmbariException e) {
Assert.fail("Did not expect a failure creating the Repository Version");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/UpgradeDAOTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/UpgradeDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/UpgradeDAOTest.java
index 0b12e97..f6d1acf 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/UpgradeDAOTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/UpgradeDAOTest.java
@@ -35,6 +35,7 @@ import org.apache.ambari.server.orm.entities.UpgradeGroupEntity;
import org.apache.ambari.server.orm.entities.UpgradeItemEntity;
import org.apache.ambari.server.state.UpgradeState;
import org.apache.ambari.server.state.stack.upgrade.Direction;
+import org.apache.ambari.server.state.stack.upgrade.UpgradeType;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -69,13 +70,14 @@ public class UpgradeDAOTest {
helper = injector.getInstance(OrmTestHelper.class);
clusterId = helper.createCluster();
-
// create upgrade entities
UpgradeEntity entity = new UpgradeEntity();
entity.setClusterId(Long.valueOf(1));
entity.setRequestId(Long.valueOf(1));
entity.setFromVersion("");
entity.setToVersion("");
+ entity.setUpgradeType(UpgradeType.ROLLING);
+ entity.setUpgradePackage("test-upgrade");
UpgradeGroupEntity group = new UpgradeGroupEntity();
group.setName("group_name");
@@ -144,6 +146,8 @@ public class UpgradeDAOTest {
entity1.setRequestId(Long.valueOf(1));
entity1.setFromVersion("2.2.0.0-1234");
entity1.setToVersion("2.3.0.0-4567");
+ entity1.setUpgradeType(UpgradeType.ROLLING);
+ entity1.setUpgradePackage("test-upgrade");
dao.create(entity1);
UpgradeEntity entity2 = new UpgradeEntity();
entity2.setId(22L);
@@ -152,6 +156,8 @@ public class UpgradeDAOTest {
entity2.setRequestId(Long.valueOf(1));
entity2.setFromVersion("2.3.0.0-4567");
entity2.setToVersion("2.2.0.0-1234");
+ entity2.setUpgradeType(UpgradeType.ROLLING);
+ entity2.setUpgradePackage("test-upgrade");
dao.create(entity2);
UpgradeEntity entity3 = new UpgradeEntity();
entity3.setId(33L);
@@ -160,6 +166,8 @@ public class UpgradeDAOTest {
entity3.setRequestId(Long.valueOf(1));
entity3.setFromVersion("2.2.0.0-1234");
entity3.setToVersion("2.3.1.1-4567");
+ entity3.setUpgradeType(UpgradeType.ROLLING);
+ entity3.setUpgradePackage("test-upgrade");
dao.create(entity3);
UpgradeEntity lastUpgradeForCluster = dao.findLastUpgradeForCluster(1);
assertNotNull(lastUpgradeForCluster);
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ConfigureActionTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ConfigureActionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ConfigureActionTest.java
index 93e29b5..e702e0a 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ConfigureActionTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ConfigureActionTest.java
@@ -633,8 +633,7 @@ public class ConfigureActionTest {
String urlInfo = "[{'repositories':["
+ "{'Repositories/base_url':'http://foo1','Repositories/repo_name':'HDP','Repositories/repo_id':'HDP-2.2.0'}"
+ "], 'OperatingSystems/os_type':'redhat6'}]";
- repoVersionDAO.create(stackEntity, HDP_2_2_0_1, String.valueOf(System.currentTimeMillis()),
- "pack", urlInfo);
+ repoVersionDAO.create(stackEntity, HDP_2_2_0_1, String.valueOf(System.currentTimeMillis()), urlInfo);
c.createClusterVersion(HDP_220_STACK, HDP_2_2_0_1, "admin", RepositoryVersionState.INSTALLING);
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/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 91a2788..79d2355 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
@@ -214,8 +214,7 @@ public class UpgradeActionTest {
String urlInfo = "[{'repositories':["
+ "{'Repositories/base_url':'http://foo1','Repositories/repo_name':'HDP','Repositories/repo_id':'" + targetStack.getStackId() + "'}"
+ "], 'OperatingSystems/os_type':'redhat6'}]";
- repoVersionDAO.create(stackEntityTarget, targetRepo, String.valueOf(System.currentTimeMillis()),
- "pack", urlInfo);
+ repoVersionDAO.create(stackEntityTarget, targetRepo, String.valueOf(System.currentTimeMillis()), urlInfo);
// Start upgrading the newer repo
c.createClusterVersion(targetStack, targetRepo, "admin", RepositoryVersionState.INSTALLING);
@@ -275,8 +274,7 @@ public class UpgradeActionTest {
String urlInfo = "[{'repositories':["
+ "{'Repositories/base_url':'http://foo1','Repositories/repo_name':'HDP','Repositories/repo_id':'" + targetRepo + "'}"
+ "], 'OperatingSystems/os_type':'redhat6'}]";
- repoVersionDAO.create(stackEntityTarget, targetRepo, String.valueOf(System.currentTimeMillis()),
- "pack", urlInfo);
+ repoVersionDAO.create(stackEntityTarget, targetRepo, String.valueOf(System.currentTimeMillis()), urlInfo);
// Start upgrading the newer repo
c.createClusterVersion(targetStack, targetRepo, "admin", RepositoryVersionState.INSTALLING);
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java
index f7898ee..2eee2df 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java
@@ -131,7 +131,6 @@ public class UpgradeHelperTest {
ComponentInfo ci = si.getComponentByName("ZOOKEEPER_SERVER");
ci.setDisplayName("ZooKeeper1 Server2");
-
assertTrue(upgrades.containsKey("upgrade_test"));
UpgradePack upgrade = upgrades.get("upgrade_test");
assertNotNull(upgrade);
@@ -372,9 +371,7 @@ public class UpgradeHelperTest {
@Test
public void testConditionalDeleteTask() throws Exception {
- Map<String, UpgradePack> upgrades = ambariMetaInfo.getUpgradePacks("HDP",
- "2.1.1");
-
+ Map<String, UpgradePack> upgrades = ambariMetaInfo.getUpgradePacks("HDP", "2.1.1");
assertTrue(upgrades.containsKey("upgrade_test"));
UpgradePack upgrade = upgrades.get("upgrade_test");
assertNotNull(upgrade);
@@ -384,8 +381,7 @@ public class UpgradeHelperTest {
UpgradeContext context = new UpgradeContext(m_masterHostResolver, HDP_21,
HDP_21, UPGRADE_VERSION, Direction.UPGRADE, UpgradeType.ROLLING);
- List<UpgradeGroupHolder> groups = m_upgradeHelper.createSequence(upgrade,
- context);
+ List<UpgradeGroupHolder> groups = m_upgradeHelper.createSequence(upgrade, context);
assertEquals(6, groups.size());
@@ -446,9 +442,7 @@ public class UpgradeHelperTest {
@Test
public void testConfigureTask() throws Exception {
- Map<String, UpgradePack> upgrades = ambariMetaInfo.getUpgradePacks("HDP",
- "2.1.1");
-
+ Map<String, UpgradePack> upgrades = ambariMetaInfo.getUpgradePacks("HDP", "2.1.1");
assertTrue(upgrades.containsKey("upgrade_test"));
UpgradePack upgrade = upgrades.get("upgrade_test");
assertNotNull(upgrade);
@@ -523,11 +517,9 @@ public class UpgradeHelperTest {
@Test
public void testConfigureTaskWithMultipleConfigurations() throws Exception {
Map<String, UpgradePack> upgrades = ambariMetaInfo.getUpgradePacks("HDP", "2.1.1");
-
assertTrue(upgrades.containsKey("upgrade_test"));
UpgradePack upgrade = upgrades.get("upgrade_test");
assertNotNull(upgrade);
-
Cluster cluster = makeCluster();
UpgradeContext context = new UpgradeContext(m_masterHostResolver, HDP_21, HDP_21,
@@ -937,6 +929,7 @@ public class UpgradeHelperTest {
Direction.DOWNGRADE, UpgradeType.ROLLING);
Map<String, UpgradePack> upgrades = ambariMetaInfo.getUpgradePacks("HDP", "2.1.1");
+ assertTrue(upgrades.containsKey("upgrade_direction"));
UpgradePack upgrade = upgrades.get("upgrade_direction");
assertNotNull(upgrade);
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/test/java/org/apache/ambari/server/state/stack/UpgradePackTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/UpgradePackTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/UpgradePackTest.java
index a73775f..fc731d9 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/UpgradePackTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/UpgradePackTest.java
@@ -88,9 +88,8 @@ public class UpgradePackTest {
Map<String, UpgradePack> upgrades = ambariMetaInfo.getUpgradePacks("HDP", "2.1.1");
assertTrue(upgrades.size() > 0);
assertTrue(upgrades.containsKey("upgrade_test"));
-
- UpgradePack up = upgrades.get("upgrade_test");
- assertEquals("2.2.*", up.getTarget());
+ UpgradePack upgrade = upgrades.get("upgrade_test");
+ assertEquals("2.2.*.*", upgrade.getTarget());
Map<String, List<String>> expectedStages = new LinkedHashMap<String, List<String>>() {{
put("ZOOKEEPER", Arrays.asList("ZOOKEEPER_SERVER"));
@@ -100,24 +99,24 @@ public class UpgradePackTest {
// !!! test the tasks
int i = 0;
for (Entry<String, List<String>> entry : expectedStages.entrySet()) {
- assertTrue(up.getTasks().containsKey(entry.getKey()));
- assertEquals(i++, indexOf(up.getTasks(), entry.getKey()));
+ assertTrue(upgrade.getTasks().containsKey(entry.getKey()));
+ assertEquals(i++, indexOf(upgrade.getTasks(), entry.getKey()));
// check that the number of components matches
- assertEquals(entry.getValue().size(), up.getTasks().get(entry.getKey()).size());
+ assertEquals(entry.getValue().size(), upgrade.getTasks().get(entry.getKey()).size());
// check component ordering
int j = 0;
for (String comp : entry.getValue()) {
- assertEquals(j++, indexOf(up.getTasks().get(entry.getKey()), comp));
+ assertEquals(j++, indexOf(upgrade.getTasks().get(entry.getKey()), comp));
}
}
// !!! test specific tasks
- assertTrue(up.getTasks().containsKey("HDFS"));
- assertTrue(up.getTasks().get("HDFS").containsKey("NAMENODE"));
+ assertTrue(upgrade.getTasks().containsKey("HDFS"));
+ assertTrue(upgrade.getTasks().get("HDFS").containsKey("NAMENODE"));
- ProcessingComponent pc = up.getTasks().get("HDFS").get("NAMENODE");
+ ProcessingComponent pc = upgrade.getTasks().get("HDFS").get("NAMENODE");
assertNotNull(pc.preTasks);
assertNotNull(pc.postTasks);
assertNotNull(pc.tasks);
@@ -129,17 +128,17 @@ public class UpgradePackTest {
assertEquals(RestartTask.class, pc.tasks.get(0).getClass());
- assertTrue(up.getTasks().containsKey("ZOOKEEPER"));
- assertTrue(up.getTasks().get("ZOOKEEPER").containsKey("ZOOKEEPER_SERVER"));
+ assertTrue(upgrade.getTasks().containsKey("ZOOKEEPER"));
+ assertTrue(upgrade.getTasks().get("ZOOKEEPER").containsKey("ZOOKEEPER_SERVER"));
- pc = up.getTasks().get("HDFS").get("DATANODE");
+ pc = upgrade.getTasks().get("HDFS").get("DATANODE");
assertNotNull(pc.preDowngradeTasks);
assertEquals(0, pc.preDowngradeTasks.size());
assertNotNull(pc.postDowngradeTasks);
assertEquals(1, pc.postDowngradeTasks.size());
- pc = up.getTasks().get("ZOOKEEPER").get("ZOOKEEPER_SERVER");
+ pc = upgrade.getTasks().get("ZOOKEEPER").get("ZOOKEEPER_SERVER");
assertNotNull(pc.preTasks);
assertEquals(1, pc.preTasks.size());
assertNotNull(pc.postTasks);
@@ -147,7 +146,7 @@ public class UpgradePackTest {
assertNotNull(pc.tasks);
assertEquals(1, pc.tasks.size());
- pc = up.getTasks().get("YARN").get("NODEMANAGER");
+ pc = upgrade.getTasks().get("YARN").get("NODEMANAGER");
assertNotNull(pc.preTasks);
assertEquals(2, pc.preTasks.size());
Task t = pc.preTasks.get(1);
@@ -195,8 +194,7 @@ public class UpgradePackTest {
Map<String, UpgradePack> upgrades = ambariMetaInfo.getUpgradePacks("HDP", "2.1.1");
assertTrue(upgrades.size() > 0);
assertTrue(upgrades.containsKey("upgrade_test_checks"));
-
- UpgradePack up = upgrades.get("upgrade_test_checks");
+ UpgradePack upgrade = upgrades.get("upgrade_test_checks");
List<String> expected_up = Arrays.asList(
"PRE_CLUSTER",
@@ -217,14 +215,14 @@ public class UpgradePackTest {
"POST_CLUSTER");
int i = 0;
- List<Grouping> groups = up.getGroups(Direction.UPGRADE);
+ List<Grouping> groups = upgrade.getGroups(Direction.UPGRADE);
for (Grouping g : groups) {
assertEquals(expected_up.get(i), g.name);
i++;
}
i = 0;
- groups = up.getGroups(Direction.DOWNGRADE);
+ groups = upgrade.getGroups(Direction.DOWNGRADE);
for (Grouping g : groups) {
assertEquals(expected_down.get(i), g.name);
i++;
@@ -238,8 +236,7 @@ public class UpgradePackTest {
Map<String, UpgradePack> upgrades = ambariMetaInfo.getUpgradePacks("HDP", "2.1.1");
assertTrue(upgrades.size() > 0);
assertTrue(upgrades.containsKey("upgrade_test_nonrolling"));
-
- UpgradePack up = upgrades.get("upgrade_test_nonrolling");
+ UpgradePack upgrade = upgrades.get("upgrade_test_nonrolling");
List<String> expected_up = Arrays.asList(
"PRE_CLUSTER",
@@ -253,7 +250,7 @@ public class UpgradePackTest {
"POST_CLUSTER");
int i = 0;
- List<Grouping> groups = up.getGroups(Direction.UPGRADE);
+ List<Grouping> groups = upgrade.getGroups(Direction.UPGRADE);
for (Grouping g : groups) {
assertEquals(expected_up.get(i), g.name);
i++;
@@ -266,11 +263,10 @@ public class UpgradePackTest {
Map<String, UpgradePack> upgrades = ambariMetaInfo.getUpgradePacks("HDP", "2.1.1");
assertTrue(upgrades.size() > 0);
assertTrue(upgrades.containsKey("upgrade_direction"));
+ UpgradePack upgrade = upgrades.get("upgrade_direction");
+ assertTrue(upgrade.getType() == UpgradeType.ROLLING);
- UpgradePack up = upgrades.get("upgrade_direction");
- assertTrue(up.getType() == UpgradeType.ROLLING);
-
- List<Grouping> groups = up.getGroups(Direction.UPGRADE);
+ List<Grouping> groups = upgrade.getGroups(Direction.UPGRADE);
assertEquals(4, groups.size());
Grouping group = groups.get(2);
assertEquals(ClusterGrouping.class, group.getClass());
@@ -283,7 +279,7 @@ public class UpgradePackTest {
assertNotNull(stages.get(0).intendedDirection);
assertEquals(Direction.DOWNGRADE, stages.get(0).intendedDirection);
- groups = up.getGroups(Direction.DOWNGRADE);
+ groups = upgrade.getGroups(Direction.DOWNGRADE);
assertEquals(3, groups.size());
// there are two clustergroupings at the end
group = groups.get(1);
@@ -300,11 +296,10 @@ public class UpgradePackTest {
Map<String, UpgradePack> upgrades = ambariMetaInfo.getUpgradePacks("HDP", "2.1.1");
assertTrue(upgrades.size() > 0);
assertTrue(upgrades.containsKey("upgrade_test_nonrolling"));
+ UpgradePack upgrade = upgrades.get("upgrade_test_nonrolling");
+ assertTrue(upgrade.getType() == UpgradeType.NON_ROLLING);
- UpgradePack up = upgrades.get("upgrade_test_nonrolling");
- assertTrue(up.getType() == UpgradeType.NONROLLING);
-
- List<Grouping> groups = up.getGroups(Direction.UPGRADE);
+ List<Grouping> groups = upgrade.getGroups(Direction.UPGRADE);
assertEquals(9, groups.size());
Grouping group = null;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java
new file mode 100644
index 0000000..6268f91
--- /dev/null
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java
@@ -0,0 +1,195 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ambari.server.upgrade;
+
+
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.capture;
+import static org.easymock.EasyMock.createNiceMock;
+import static org.easymock.EasyMock.createStrictMock;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.reset;
+import static org.easymock.EasyMock.verify;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.google.inject.persist.PersistService;
+import org.apache.ambari.server.configuration.Configuration;
+import org.apache.ambari.server.orm.DBAccessor;
+import org.apache.ambari.server.orm.GuiceJpaInitializer;
+import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
+import org.apache.ambari.server.orm.dao.DaoUtils;
+import org.apache.ambari.server.state.stack.OsFamily;
+
+import org.easymock.Capture;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.google.inject.Binder;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Module;
+
+import javax.persistence.EntityManager;
+import java.lang.reflect.Field;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+
+/**
+ * {@link UpgradeCatalog212} unit tests.
+ */
+public class UpgradeCatalog212Test {
+
+ private Injector injector;
+ private Provider<EntityManager> entityManagerProvider = createStrictMock(Provider.class);
+ private EntityManager entityManager = createNiceMock(EntityManager.class);
+
+ @Before
+ public void init() {
+ reset(entityManagerProvider);
+ expect(entityManagerProvider.get()).andReturn(entityManager).anyTimes();
+ replay(entityManagerProvider);
+ injector = Guice.createInjector(new InMemoryDefaultTestModule());
+ injector.getInstance(GuiceJpaInitializer.class);
+ }
+
+ @After
+ public void tearDown() {
+ injector.getInstance(PersistService.class).stop();
+ }
+
+ @Test
+ public void testExecuteDDLUpdates() throws Exception {
+ final DBAccessor dbAccessor = createNiceMock(DBAccessor.class);
+ UpgradeCatalog212 upgradeCatalog = (UpgradeCatalog212) getUpgradeCatalog(dbAccessor);
+
+ upgradeCatalog.executeDDLUpdates();
+ }
+
+ @Test
+ public void testExecuteDMLUpdates() throws Exception {
+ final DBAccessor dbAccessor = createNiceMock(DBAccessor.class);
+ Configuration configuration = createNiceMock(Configuration.class);
+ Connection connection = createNiceMock(Connection.class);
+ Statement statement = createNiceMock(Statement.class);
+ ResultSet resultSet = createNiceMock(ResultSet.class);
+ expect(configuration.getDatabaseUrl()).andReturn(Configuration.JDBC_IN_MEMORY_URL).anyTimes();
+ dbAccessor.getConnection();
+ expectLastCall().andReturn(connection).anyTimes();
+ connection.createStatement();
+ expectLastCall().andReturn(statement).anyTimes();
+ statement.executeQuery(anyObject(String.class));
+ expectLastCall().andReturn(resultSet).anyTimes();
+
+ // Technically, this is a DDL, but it has to be ran during the DML portion
+ // because it requires the persistence layer to be started.
+ UpgradeSectionDDL upgradeSectionDDL = new UpgradeSectionDDL();
+
+ // Execute any DDL schema changes
+ upgradeSectionDDL.execute(dbAccessor);
+
+ // Replay sections
+ replay(dbAccessor, configuration, resultSet, connection, statement);
+
+ AbstractUpgradeCatalog upgradeCatalog = getUpgradeCatalog(dbAccessor);
+ Class<?> c = AbstractUpgradeCatalog.class;
+ Field f = c.getDeclaredField("configuration");
+ f.setAccessible(true);
+ f.set(upgradeCatalog, configuration);
+
+ upgradeCatalog.executeDMLUpdates();
+ verify(dbAccessor, configuration, resultSet, connection, statement);
+
+ // Verify sections
+ upgradeSectionDDL.verify(dbAccessor);
+ }
+
+ @Test
+ public void testGetTargetVersion() throws Exception {
+ final DBAccessor dbAccessor = createNiceMock(DBAccessor.class);
+ UpgradeCatalog upgradeCatalog = getUpgradeCatalog(dbAccessor);
+
+ Assert.assertEquals("2.1.2", upgradeCatalog.getTargetVersion());
+ }
+
+ @Test
+ public void testGetSourceVersion() {
+ final DBAccessor dbAccessor = createNiceMock(DBAccessor.class);
+ UpgradeCatalog upgradeCatalog = getUpgradeCatalog(dbAccessor);
+ Assert.assertEquals("2.1.1", upgradeCatalog.getSourceVersion());
+ }
+
+ private AbstractUpgradeCatalog getUpgradeCatalog(final DBAccessor dbAccessor) {
+ Module module = new Module() {
+ @Override
+ public void configure(Binder binder) {
+ binder.bind(DBAccessor.class).toInstance(dbAccessor);
+ binder.bind(EntityManager.class).toInstance(entityManager);
+ binder.bind(OsFamily.class).toInstance(createNiceMock(OsFamily.class));
+ binder.bind(DaoUtils.class).toInstance(createNiceMock(DaoUtils.class));
+ }
+ };
+ Injector injector = Guice.createInjector(module);
+ return injector.getInstance(UpgradeCatalog212.class);
+ }
+
+ // *********** Inner Classes that represent sections of the DDL ***********
+ // ************************************************************************
+
+ /**
+ * Verify that the upgrade table has two columns added to it.
+ */
+ class UpgradeSectionDDL implements SectionDDL {
+
+ Capture<DBAccessor.DBColumnInfo> upgradeTablePackageNameColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
+ Capture<DBAccessor.DBColumnInfo> upgradeTableUpgradeTypeColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void execute(DBAccessor dbAccessor) throws SQLException {
+ // Add columns
+ dbAccessor.addColumn(eq("upgrade"), capture(upgradeTablePackageNameColumnCapture));
+ dbAccessor.addColumn(eq("upgrade"), capture(upgradeTableUpgradeTypeColumnCapture));
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void verify(DBAccessor dbAccessor) throws SQLException {
+ // Verification section
+ DBAccessor.DBColumnInfo packageNameCol = upgradeTablePackageNameColumnCapture.getValue();
+ Assert.assertEquals(String.class, packageNameCol.getType());
+ Assert.assertEquals("upgrade_package", packageNameCol.getName());
+
+ DBAccessor.DBColumnInfo upgradeTypeCol = upgradeTableUpgradeTypeColumnCapture.getValue();
+ Assert.assertEquals(String.class, upgradeTypeCol.getType());
+ Assert.assertEquals("upgrade_type", upgradeTypeCol.getName());
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_bucket_test.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_bucket_test.xml b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_bucket_test.xml
index 8c2c205..8c076f0 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_bucket_test.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_bucket_test.xml
@@ -16,8 +16,9 @@
limitations under the License.
-->
<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <target>2.2.*</target>
- <type>rolling</type>
+ <target>2.2.*.*</target>
+ <target-stack>HDP-2.2.0</target-stack>
+ <type>ROLLING</type>
<order>
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_direction.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_direction.xml b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_direction.xml
index 693c5ec..5a90674 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_direction.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_direction.xml
@@ -16,8 +16,9 @@
limitations under the License.
-->
<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <target>2.2.*</target>
- <type>rolling</type>
+ <target>2.2.*.*</target>
+ <target-stack>HDP-2.2.0</target-stack>
+ <type>ROLLING</type>
<order>
<group name="ZOOKEEPER" title="Zookeeper">
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test.xml b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test.xml
index e1dde1b..0d133f9 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test.xml
@@ -16,8 +16,9 @@
limitations under the License.
-->
<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <target>2.2.*</target>
- <type>rolling</type>
+ <target>2.2.*.*</target>
+ <target-stack>HDP-2.2.0</target-stack>
+ <type>ROLLING</type>
<order>
<group xsi:type="cluster" name="PRE_CLUSTER" title="Pre {{direction.text.proper}}">
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_checks.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_checks.xml b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_checks.xml
index 84d7a5a..0544c34 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_checks.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_checks.xml
@@ -16,8 +16,9 @@
limitations under the License.
-->
<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <target>2.2.*</target>
- <type>rolling</type>
+ <target>2.2.*.*</target>
+ <target-stack>HDP-2.2.0</target-stack>
+ <type>ROLLING</type>
<order>
<group xsi:type="cluster" name="PRE_CLUSTER" title="Pre Upgrade" stage="pre">
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_nonrolling.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_nonrolling.xml b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_nonrolling.xml
index a22e68b..13c5d1f 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_nonrolling.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_nonrolling.xml
@@ -19,7 +19,8 @@
<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<target>2.2.*.*</target>
- <type>nonrolling</type>
+ <target-stack>HDP-2.2.0</target-stack>
+ <type>NON_ROLLING</type>
<order>
<group xsi:type="cluster" name="PRE_CLUSTER" title="Prepare Upgrade">
@@ -54,7 +55,7 @@
<execute-stage service="HDFS" component="NAMENODE" title="Snapshot HDFS">
<task xsi:type="execute" hosts="master">
<script>scripts/namenode.py</script>
- <function>prepare_nonrolling_upgrade</function>
+ <function>prepare_non_rolling_upgrade</function>
</task>
</execute-stage>
</group>
@@ -149,7 +150,7 @@
<execute-stage service="HDFS" component="NAMENODE" title="Execute HDFS Finalize">
<task xsi:type="execute" hosts="master">
<script>scripts/namenode.py</script>
- <function>finalize_nonrolling_upgrade</function>
+ <function>finalize_non_rolling_upgrade</function>
</task>
</execute-stage>
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_to_new_stack.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_to_new_stack.xml b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_to_new_stack.xml
index fa2a00e..0ec5994 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_to_new_stack.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_to_new_stack.xml
@@ -16,9 +16,9 @@
limitations under the License.
-->
<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <target>2.2.*</target>
+ <target>2.2.*.*</target>
<target-stack>HDP-2.2.0</target-stack>
- <type>rolling</type>
+ <type>ROLLING</type>
<order>
<group xsi:type="cluster" name="PRE_CLUSTER" title="Pre {{direction.text.proper}}">
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test.xml b/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test.xml
index 96dd8f7..0c007d2 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test.xml
@@ -17,7 +17,7 @@
-->
<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<target>2.2.*</target>
- <type>rolling</type>
+ <type>ROLLING</type>
<order>
<group xsi:type="cluster" name="PRE_CLUSTER" title="Pre {{direction.text.proper}}">
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_checks.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_checks.xml b/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_checks.xml
index 099bbd7..ffb4e1f 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_checks.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_checks.xml
@@ -17,7 +17,7 @@
-->
<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<target>2.2.*</target>
- <type>rolling</type>
+ <type>ROLLING</type>
<order>
<group xsi:type="cluster" name="PRE_CLUSTER" title="Pre Upgrade" stage="pre">
[2/2] ambari git commit: AMBARI-12699. Stop-and-Start Upgrade: DB
Schema Changes (alejandro)
Posted by al...@apache.org.
AMBARI-12699. Stop-and-Start Upgrade: DB Schema Changes (alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ddd5d928
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ddd5d928
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ddd5d928
Branch: refs/heads/branch-dev-stop-all-upgrade
Commit: ddd5d928ed09561cfcfdfd1c6fa8d01162f0f689
Parents: cca303d
Author: Alejandro Fernandez <af...@hortonworks.com>
Authored: Thu Aug 20 17:24:48 2015 -0700
Committer: Alejandro Fernandez <af...@hortonworks.com>
Committed: Wed Sep 2 13:07:58 2015 -0700
----------------------------------------------------------------------
.../checks/HostsMasterMaintenanceCheck.java | 4 +-
.../checks/SecondaryNamenodeDeletedCheck.java | 5 +
.../server/controller/PrereqCheckRequest.java | 20 +-
...atibleRepositoryVersionResourceProvider.java | 3 -
.../PreUpgradeCheckResourceProvider.java | 16 +-
.../RepositoryVersionResourceProvider.java | 28 +-
.../internal/UpgradeResourceProvider.java | 47 ++-
.../server/orm/dao/RepositoryVersionDAO.java | 6 +-
.../ambari/server/orm/dao/UpgradeDAO.java | 19 +-
.../orm/entities/RepositoryVersionEntity.java | 18 +-
.../server/orm/entities/UpgradeEntity.java | 89 +++++
.../ambari/server/stack/StackDirectory.java | 7 +-
.../apache/ambari/server/state/StackInfo.java | 2 +-
.../ambari/server/state/UpgradeContext.java | 2 +-
.../ambari/server/state/UpgradeHelper.java | 5 +-
.../ambari/server/state/stack/UpgradePack.java | 18 +-
.../stack/upgrade/RepositoryVersionHelper.java | 33 +-
.../server/state/stack/upgrade/UpgradeType.java | 6 +-
.../svccomphost/ServiceComponentHostImpl.java | 1 -
.../server/upgrade/SchemaUpgradeHelper.java | 1 +
.../server/upgrade/UpgradeCatalog212.java | 323 +++++++++++++++++++
.../main/resources/Ambari-DDL-MySQL-CREATE.sql | 3 +-
.../main/resources/Ambari-DDL-Oracle-CREATE.sql | 3 +-
.../resources/Ambari-DDL-Postgres-CREATE.sql | 3 +-
.../Ambari-DDL-Postgres-EMBEDDED-CREATE.sql | 3 +-
.../resources/Ambari-DDL-SQLServer-CREATE.sql | 3 +-
.../HDFS/2.1.0.2.0/package/scripts/namenode.py | 4 +-
.../HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml | 6 +-
.../stacks/HDP/2.2/upgrades/upgrade-2.2.xml | 2 +-
.../stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 2 +-
.../stacks/HDP/2.3/upgrades/upgrade-2.3.xml | 2 +-
.../checks/HostsMasterMaintenanceCheckTest.java | 9 +-
...leRepositoryVersionResourceProviderTest.java | 16 +
.../RepositoryVersionResourceProviderTest.java | 96 +++---
.../UpgradeResourceProviderHDP22Test.java | 3 +-
.../internal/UpgradeResourceProviderTest.java | 57 ++--
.../apache/ambari/server/orm/OrmTestHelper.java | 2 +-
.../ambari/server/orm/dao/CrudDAOTest.java | 1 -
.../orm/dao/RepositoryVersionDAOTest.java | 8 +-
.../ambari/server/orm/dao/UpgradeDAOTest.java | 10 +-
.../upgrades/ConfigureActionTest.java | 3 +-
.../upgrades/UpgradeActionTest.java | 6 +-
.../ambari/server/state/UpgradeHelperTest.java | 15 +-
.../server/state/stack/UpgradePackTest.java | 57 ++--
.../server/upgrade/UpgradeCatalog212Test.java | 195 +++++++++++
.../HDP/2.1.1/upgrades/upgrade_bucket_test.xml | 5 +-
.../HDP/2.1.1/upgrades/upgrade_direction.xml | 5 +-
.../stacks/HDP/2.1.1/upgrades/upgrade_test.xml | 5 +-
.../HDP/2.1.1/upgrades/upgrade_test_checks.xml | 5 +-
.../2.1.1/upgrades/upgrade_test_nonrolling.xml | 7 +-
.../HDP/2.1.1/upgrades/upgrade_to_new_stack.xml | 4 +-
.../stacks/HDP/2.2.0/upgrades/upgrade_test.xml | 2 +-
.../HDP/2.2.0/upgrades/upgrade_test_checks.xml | 2 +-
53 files changed, 957 insertions(+), 240 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/main/java/org/apache/ambari/server/checks/HostsMasterMaintenanceCheck.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/HostsMasterMaintenanceCheck.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/HostsMasterMaintenanceCheck.java
index ef93337..b1b6b68 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/checks/HostsMasterMaintenanceCheck.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/HostsMasterMaintenanceCheck.java
@@ -68,7 +68,9 @@ public class HostsMasterMaintenanceCheck extends AbstractCheckDescriptor {
final Cluster cluster = clustersProvider.get().getCluster(clusterName);
final StackId stackId = cluster.getDesiredStackVersion();
final Set<String> hostsWithMasterComponent = new HashSet<String>();
- final String upgradePackName = repositoryVersionHelper.get().getUpgradePackageName(stackId.getStackName(), stackId.getStackVersion(), request.getRepositoryVersion());
+
+ // TODO AMBARI-12698, need to pass the upgrade pack to use in the request, or at least the type.
+ final String upgradePackName = repositoryVersionHelper.get().getUpgradePackageName(stackId.getStackName(), stackId.getStackVersion(), request.getRepositoryVersion(), null);
if (upgradePackName == null) {
prerequisiteCheck.setStatus(PrereqCheckStatus.FAIL);
String fail = getFailReason(KEY_NO_UPGRADE_NAME, prerequisiteCheck, request);
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/main/java/org/apache/ambari/server/checks/SecondaryNamenodeDeletedCheck.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/SecondaryNamenodeDeletedCheck.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/SecondaryNamenodeDeletedCheck.java
index 493042f..2086b67 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/checks/SecondaryNamenodeDeletedCheck.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/SecondaryNamenodeDeletedCheck.java
@@ -72,6 +72,11 @@ public class SecondaryNamenodeDeletedCheck extends AbstractCheckDescriptor {
return true;
}
+ // TODO AMBARI-12698, there are 2 ways to filter the prechecks.
+ // 1. Explictly mention them in each upgrade pack, which is more flexible, but requires adding the name of checks
+ // to perform in each upgrade pack.
+ // 2. Make each upgrade check class call a function before perform() that will determine if the check is appropriate
+ // given the type of upgrade. The PrereqCheckRequest object has a field for the type of upgrade.
@Override
public void perform(PrerequisiteCheck prerequisiteCheck, PrereqCheckRequest request) throws AmbariException {
Set<String> hosts = new HashSet<String>();
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/main/java/org/apache/ambari/server/controller/PrereqCheckRequest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/PrereqCheckRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/PrereqCheckRequest.java
index f8c5316..b8dda3a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/PrereqCheckRequest.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/PrereqCheckRequest.java
@@ -23,6 +23,7 @@ import java.util.Map;
import org.apache.ambari.server.checks.CheckDescription;
import org.apache.ambari.server.state.StackId;
import org.apache.ambari.server.state.stack.PrereqCheckStatus;
+import org.apache.ambari.server.state.stack.upgrade.UpgradeType;
/**
* Represents a prerequisite check request.
@@ -33,17 +34,34 @@ public class PrereqCheckRequest {
private StackId m_sourceStackId;
private StackId m_targetStackId;
+ private UpgradeType m_upgradeType;
+
private Map<CheckDescription, PrereqCheckStatus> m_results =
new HashMap<CheckDescription, PrereqCheckStatus>();
- public PrereqCheckRequest(String clusterName) {
+
+ public PrereqCheckRequest(String clusterName, UpgradeType upgradeType) {
m_clusterName = clusterName;
+ m_upgradeType = upgradeType;
+ }
+
+ /**
+ * Construct a request to performs checks before an Upgrade.
+ * The default type is Rolling.
+ * @param clusterName
+ */
+ public PrereqCheckRequest(String clusterName) {
+ this(clusterName, UpgradeType.ROLLING);
}
public String getClusterName() {
return m_clusterName;
}
+ public UpgradeType getUpgradeType() {
+ return m_upgradeType;
+ }
+
public String getRepositoryVersion() {
return m_repositoryVersion;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProvider.java
index 6344aa2..2a1092b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProvider.java
@@ -61,7 +61,6 @@ public class CompatibleRepositoryVersionResourceProvider extends ReadOnlyResourc
public static final String REPOSITORY_VERSION_STACK_VERSION_PROPERTY_ID = "CompatibleRepositoryVersions/stack_version";
public static final String REPOSITORY_VERSION_REPOSITORY_VERSION_PROPERTY_ID = "CompatibleRepositoryVersions/repository_version";
public static final String REPOSITORY_VERSION_DISPLAY_NAME_PROPERTY_ID = "CompatibleRepositoryVersions/display_name";
- public static final String REPOSITORY_VERSION_UPGRADE_PACK_PROPERTY_ID = "CompatibleRepositoryVersions/upgrade_pack";
public static final String SUBRESOURCE_OPERATING_SYSTEMS_PROPERTY_ID = new OperatingSystemResourceDefinition().getPluralName();
public static final String SUBRESOURCE_REPOSITORIES_PROPERTY_ID = new RepositoryResourceDefinition().getPluralName();
@@ -73,7 +72,6 @@ public class CompatibleRepositoryVersionResourceProvider extends ReadOnlyResourc
REPOSITORY_VERSION_DISPLAY_NAME_PROPERTY_ID,
REPOSITORY_VERSION_STACK_NAME_PROPERTY_ID,
REPOSITORY_VERSION_STACK_VERSION_PROPERTY_ID,
- REPOSITORY_VERSION_UPGRADE_PACK_PROPERTY_ID,
SUBRESOURCE_OPERATING_SYSTEMS_PROPERTY_ID);
static Map<Type, String> keyPropertyIds = new HashMap<Type, String>() {
@@ -151,7 +149,6 @@ public class CompatibleRepositoryVersionResourceProvider extends ReadOnlyResourc
setResourceProperty(resource, REPOSITORY_VERSION_STACK_NAME_PROPERTY_ID, entity.getStackName(), requestedIds);
setResourceProperty(resource, REPOSITORY_VERSION_STACK_VERSION_PROPERTY_ID, entity.getStackVersion(), requestedIds);
setResourceProperty(resource, REPOSITORY_VERSION_DISPLAY_NAME_PROPERTY_ID, entity.getDisplayName(), requestedIds);
- setResourceProperty(resource, REPOSITORY_VERSION_UPGRADE_PACK_PROPERTY_ID, entity.getUpgradePackage(), requestedIds);
setResourceProperty(resource, REPOSITORY_VERSION_REPOSITORY_VERSION_PROPERTY_ID, entity.getVersion(), requestedIds);
resources.add(resource);
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java
index c394498..65b5794 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java
@@ -20,11 +20,13 @@ package org.apache.ambari.server.controller.internal;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.StaticallyInject;
+import org.apache.ambari.server.checks.AbstractCheckDescriptor;
import org.apache.ambari.server.checks.UpgradeCheckRegistry;
import org.apache.ambari.server.controller.AmbariManagementController;
import org.apache.ambari.server.controller.PrereqCheckRequest;
@@ -47,6 +49,7 @@ import org.apache.ambari.server.state.stack.PrerequisiteCheck;
import com.google.common.collect.Sets;
import com.google.inject.Inject;
import com.google.inject.Provider;
+import org.apache.ambari.server.state.stack.upgrade.UpgradeType;
/**
* Resource provider for pre-upgrade checks.
@@ -64,6 +67,7 @@ public class PreUpgradeCheckResourceProvider extends ReadOnlyResourceProvider {
public static final String UPGRADE_CHECK_FAILED_DETAIL_PROPERTY_ID = PropertyHelper.getPropertyId("UpgradeChecks", "failed_detail");
public static final String UPGRADE_CHECK_CHECK_TYPE_PROPERTY_ID = PropertyHelper.getPropertyId("UpgradeChecks", "check_type");
public static final String UPGRADE_CHECK_CLUSTER_NAME_PROPERTY_ID = PropertyHelper.getPropertyId("UpgradeChecks", "cluster_name");
+ public static final String UPGRADE_CHECK_UPGRADE_TYPE_PROPERTY_ID = PropertyHelper.getPropertyId("UpgradeChecks", "upgrade_type");
public static final String UPGRADE_CHECK_REPOSITORY_VERSION_PROPERTY_ID = PropertyHelper.getPropertyId("UpgradeChecks", "repository_version");
@Inject
@@ -86,6 +90,7 @@ public class PreUpgradeCheckResourceProvider extends ReadOnlyResourceProvider {
UPGRADE_CHECK_FAILED_DETAIL_PROPERTY_ID,
UPGRADE_CHECK_CHECK_TYPE_PROPERTY_ID,
UPGRADE_CHECK_CLUSTER_NAME_PROPERTY_ID,
+ UPGRADE_CHECK_UPGRADE_TYPE_PROPERTY_ID,
UPGRADE_CHECK_REPOSITORY_VERSION_PROPERTY_ID);
@@ -119,6 +124,9 @@ public class PreUpgradeCheckResourceProvider extends ReadOnlyResourceProvider {
for (Map<String, Object> propertyMap: propertyMaps) {
final String clusterName = propertyMap.get(UPGRADE_CHECK_CLUSTER_NAME_PROPERTY_ID).toString();
+ // TODO AMBARI-12698, uncomment once the UI starts passing the property.
+ // final UpgradeType upgradeType = (UpgradeType) propertyMap.get(UPGRADE_CHECK_UPGRADE_TYPE_PROPERTY_ID);
+ final UpgradeType upgradeType = UpgradeType.NON_ROLLING;
final Cluster cluster;
try {
@@ -129,7 +137,7 @@ public class PreUpgradeCheckResourceProvider extends ReadOnlyResourceProvider {
String stackName = cluster.getCurrentStackVersion().getStackName();
- final PrereqCheckRequest upgradeCheckRequest = new PrereqCheckRequest(clusterName);
+ final PrereqCheckRequest upgradeCheckRequest = new PrereqCheckRequest(clusterName, upgradeType);
upgradeCheckRequest.setSourceStackId(cluster.getCurrentStackVersion());
if (propertyMap.containsKey(UPGRADE_CHECK_REPOSITORY_VERSION_PROPERTY_ID)) {
@@ -141,7 +149,10 @@ public class PreUpgradeCheckResourceProvider extends ReadOnlyResourceProvider {
upgradeCheckRequest.setTargetStackId(repositoryVersionEntity.getStackId());
}
- for (PrerequisiteCheck prerequisiteCheck : checkHelper.performChecks(upgradeCheckRequest, upgradeCheckRegistry.getUpgradeChecks())) {
+ // TODO AMBARI-12698, filter the upgrade checks to run based on the stack and upgrade type, or the upgrade pack.
+ List<AbstractCheckDescriptor> upgradeChecksToRun = upgradeCheckRegistry.getUpgradeChecks();
+
+ for (PrerequisiteCheck prerequisiteCheck : checkHelper.performChecks(upgradeCheckRequest, upgradeChecksToRun)) {
final Resource resource = new ResourceImpl(Resource.Type.PreUpgradeCheck);
setResourceProperty(resource, UPGRADE_CHECK_ID_PROPERTY_ID, prerequisiteCheck.getId(), requestedIds);
setResourceProperty(resource, UPGRADE_CHECK_CHECK_PROPERTY_ID, prerequisiteCheck.getDescription(), requestedIds);
@@ -151,6 +162,7 @@ public class PreUpgradeCheckResourceProvider extends ReadOnlyResourceProvider {
setResourceProperty(resource, UPGRADE_CHECK_FAILED_DETAIL_PROPERTY_ID,prerequisiteCheck.getFailedDetail(), requestedIds);
setResourceProperty(resource, UPGRADE_CHECK_CHECK_TYPE_PROPERTY_ID, prerequisiteCheck.getType(), requestedIds);
setResourceProperty(resource, UPGRADE_CHECK_CLUSTER_NAME_PROPERTY_ID, prerequisiteCheck.getClusterName(), requestedIds);
+ setResourceProperty(resource, UPGRADE_CHECK_UPGRADE_TYPE_PROPERTY_ID, upgradeType, requestedIds);
if (upgradeCheckRequest.getRepositoryVersion() != null) {
setResourceProperty(resource, UPGRADE_CHECK_REPOSITORY_VERSION_PROPERTY_ID, upgradeCheckRequest.getRepositoryVersion(), requestedIds);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java
index f1fa3bf..1c2328d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java
@@ -73,7 +73,6 @@ public class RepositoryVersionResourceProvider extends AbstractResourceProvider
public static final String REPOSITORY_VERSION_STACK_VERSION_PROPERTY_ID = PropertyHelper.getPropertyId("RepositoryVersions", "stack_version");
public static final String REPOSITORY_VERSION_REPOSITORY_VERSION_PROPERTY_ID = PropertyHelper.getPropertyId("RepositoryVersions", "repository_version");
public static final String REPOSITORY_VERSION_DISPLAY_NAME_PROPERTY_ID = PropertyHelper.getPropertyId("RepositoryVersions", "display_name");
- public static final String REPOSITORY_VERSION_UPGRADE_PACK_PROPERTY_ID = PropertyHelper.getPropertyId("RepositoryVersions", "upgrade_pack");
public static final String SUBRESOURCE_OPERATING_SYSTEMS_PROPERTY_ID = new OperatingSystemResourceDefinition().getPluralName();
public static final String SUBRESOURCE_REPOSITORIES_PROPERTY_ID = new RepositoryResourceDefinition().getPluralName();
@@ -92,7 +91,6 @@ public class RepositoryVersionResourceProvider extends AbstractResourceProvider
add(REPOSITORY_VERSION_DISPLAY_NAME_PROPERTY_ID);
add(REPOSITORY_VERSION_STACK_NAME_PROPERTY_ID);
add(REPOSITORY_VERSION_STACK_VERSION_PROPERTY_ID);
- add(REPOSITORY_VERSION_UPGRADE_PACK_PROPERTY_ID);
add(SUBRESOURCE_OPERATING_SYSTEMS_PROPERTY_ID);
}
};
@@ -214,7 +212,6 @@ public class RepositoryVersionResourceProvider extends AbstractResourceProvider
setResourceProperty(resource, REPOSITORY_VERSION_STACK_NAME_PROPERTY_ID, entity.getStackName(), requestedIds);
setResourceProperty(resource, REPOSITORY_VERSION_STACK_VERSION_PROPERTY_ID, entity.getStackVersion(), requestedIds);
setResourceProperty(resource, REPOSITORY_VERSION_DISPLAY_NAME_PROPERTY_ID, entity.getDisplayName(), requestedIds);
- setResourceProperty(resource, REPOSITORY_VERSION_UPGRADE_PACK_PROPERTY_ID, entity.getUpgradePackage(), requestedIds);
setResourceProperty(resource, REPOSITORY_VERSION_REPOSITORY_VERSION_PROPERTY_ID, entity.getVersion(), requestedIds);
resources.add(resource);
@@ -243,22 +240,18 @@ public class RepositoryVersionResourceProvider extends AbstractResourceProvider
throw new ObjectNotFoundException("There is no repository version with id " + id);
}
- if (StringUtils.isNotBlank(ObjectUtils.toString(propertyMap.get(REPOSITORY_VERSION_UPGRADE_PACK_PROPERTY_ID)))) {
- StackEntity stackEntity = entity.getStack();
- String stackName = stackEntity.getStackName();
- String stackVersion = stackEntity.getStackVersion();
+ // Prevent changing repo version if there's already a cluster version that has performed some meaningful action on it.
+ StackEntity stackEntity = entity.getStack();
+ String stackName = stackEntity.getStackName();
+ String stackVersion = stackEntity.getStackVersion();
- final List<ClusterVersionEntity> clusterVersionEntities = clusterVersionDAO.findByStackAndVersion(
- stackName, stackVersion, entity.getVersion());
+ final List<ClusterVersionEntity> clusterVersionEntities = clusterVersionDAO.findByStackAndVersion(
+ stackName, stackVersion, entity.getVersion());
- if (!clusterVersionEntities.isEmpty()) {
- final ClusterVersionEntity firstClusterVersion = clusterVersionEntities.get(0);
- throw new AmbariException("Upgrade pack can't be changed for repository version which is " +
- firstClusterVersion.getState().name() + " on cluster " + firstClusterVersion.getClusterEntity().getClusterName());
- }
-
- final String upgradePackage = propertyMap.get(REPOSITORY_VERSION_UPGRADE_PACK_PROPERTY_ID).toString();
- entity.setUpgradePackage(upgradePackage);
+ if (!clusterVersionEntities.isEmpty()) {
+ final ClusterVersionEntity firstClusterVersion = clusterVersionEntities.get(0);
+ throw new AmbariException("Upgrade pack can't be changed for repository version which has a state of " +
+ firstClusterVersion.getState().name() + " on cluster " + firstClusterVersion.getClusterEntity().getClusterName());
}
if (StringUtils.isNotBlank(ObjectUtils.toString(propertyMap.get(SUBRESOURCE_OPERATING_SYSTEMS_PROPERTY_ID)))) {
@@ -430,7 +423,6 @@ public class RepositoryVersionResourceProvider extends AbstractResourceProvider
throw new AmbariException("Json structure for operating systems is incorrect", ex);
}
entity.setOperatingSystems(operatingSystemsJson);
- entity.setUpgradePackage(repositoryVersionHelper.getUpgradePackageName(stackName, stackVersion, entity.getVersion()));
return entity;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
index fa743be..dddec73 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
@@ -111,6 +111,8 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider
protected static final String UPGRADE_CLUSTER_NAME = "Upgrade/cluster_name";
protected static final String UPGRADE_VERSION = "Upgrade/repository_version";
+ protected static final String UPGRADE_TYPE = "Upgrade/type";
+ protected static final String UPGRADE_PACK = "Upgrade/pack";
protected static final String UPGRADE_REQUEST_ID = "Upgrade/request_id";
protected static final String UPGRADE_FROM_VERSION = "Upgrade/from_version";
protected static final String UPGRADE_TO_VERSION = "Upgrade/to_version";
@@ -206,6 +208,8 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider
// properties
PROPERTY_IDS.add(UPGRADE_CLUSTER_NAME);
PROPERTY_IDS.add(UPGRADE_VERSION);
+ PROPERTY_IDS.add(UPGRADE_TYPE);
+ PROPERTY_IDS.add(UPGRADE_PACK);
PROPERTY_IDS.add(UPGRADE_REQUEST_ID);
PROPERTY_IDS.add(UPGRADE_FROM_VERSION);
PROPERTY_IDS.add(UPGRADE_TO_VERSION);
@@ -423,6 +427,8 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider
ResourceImpl resource = new ResourceImpl(Resource.Type.Upgrade);
setResourceProperty(resource, UPGRADE_CLUSTER_NAME, clusterName, requestedIds);
+ setResourceProperty(resource, UPGRADE_TYPE, entity.getUpgradeType().toString(), requestedIds);
+ setResourceProperty(resource, UPGRADE_PACK, entity.getUpgradePackage(), requestedIds);
setResourceProperty(resource, UPGRADE_REQUEST_ID, entity.getRequestId(), requestedIds);
setResourceProperty(resource, UPGRADE_FROM_VERSION, entity.getFromVersion(), requestedIds);
setResourceProperty(resource, UPGRADE_TO_VERSION, entity.getToVersion(), requestedIds);
@@ -444,6 +450,16 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider
String clusterName = (String) requestMap.get(UPGRADE_CLUSTER_NAME);
String version = (String) requestMap.get(UPGRADE_VERSION);
String versionForUpgradePack = (String) requestMap.get(UPGRADE_FROM_VERSION);
+ /**
+ * For the unit tests tests, there are multiple upgrade packs for the same type, so
+ * allow picking one of them. In prod, this is empty.
+ */
+ String preferredUpgradePackName = (String) requestMap.get(UPGRADE_PACK);
+
+ // The type will determine which Upgrade Pack to use.
+ // TODO AMBARI-12698, uncomment once the UI starts passing the upgrade type.
+ //final UpgradeType upgradeType = (UpgradeType) requestMap.get(UPGRADE_TYPE);
+ final UpgradeType upgradeType = UpgradeType.ROLLING;
if (null == clusterName) {
throw new AmbariException(String.format("%s is required", UPGRADE_CLUSTER_NAME));
@@ -474,27 +490,34 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider
Map<String, UpgradePack> packs = s_metaProvider.get().getUpgradePacks(stack.getStackName(),
stack.getStackVersion());
- UpgradePack up = packs.get(versionEntity.getUpgradePackage());
+ UpgradePack pack = null;
+ if (!preferredUpgradePackName.isEmpty() && packs.containsKey(preferredUpgradePackName)) {
+ pack = packs.get(preferredUpgradePackName);
+ }
- if (null == up) {
+ if (null == pack) {
// !!! in case there is an upgrade pack that doesn't match the name
String repoStackId = versionEntity.getStackId().getStackId();
for (UpgradePack upgradePack : packs.values()) {
- if (null != upgradePack.getTargetStack()
- && upgradePack.getTargetStack().equals(repoStackId)) {
- up = upgradePack;
- break;
+ if (null != upgradePack.getTargetStack() && upgradePack.getTargetStack().equals(repoStackId) && upgradeType == upgradePack.getType()) {
+ if (null == pack) {
+ pack = upgradePack;
+ } else {
+ throw new AmbariException(
+ String.format("Unable to perform %s. Found multiple upgrade packs for type %s and target version %s",
+ direction.getText(false), upgradeType.toString(), repoVersion));
+ }
}
}
}
- if (null == up) {
+ if (null == pack) {
throw new AmbariException(
- String.format("Unable to perform %s. Could not locate upgrade pack %s for version %s",
- direction.getText(false), versionEntity.getUpgradePackage(), repoVersion));
+ String.format("Unable to perform %s. Could not locate %s upgrade pack for version %s",
+ direction.getText(false), upgradeType.toString(), repoVersion));
}
- return up;
+ return pack;
}
/**
@@ -646,6 +669,8 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider
entity.setUpgradeGroups(groupEntities);
entity.setClusterId(Long.valueOf(cluster.getClusterId()));
entity.setDirection(direction);
+ entity.setUpgradePackage(pack.getName());
+ entity.setUpgradeType(pack.getType());
req.getRequestStatusResponse();
@@ -1015,7 +1040,7 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider
if (context.getType() == UpgradeType.ROLLING) {
commandParams.put(COMMAND_PARAM_RESTART_TYPE, "rolling_upgrade");
}
- if (context.getType() == UpgradeType.NONROLLING) {
+ if (context.getType() == UpgradeType.NON_ROLLING) {
commandParams.put(COMMAND_PARAM_RESTART_TYPE, "nonrolling_upgrade");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
index 4ac1314..9f5f6f1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
@@ -129,15 +129,13 @@ public class RepositoryVersionDAO extends CrudDAO<RepositoryVersionEntity, Long>
* @param stackEntity Stack entity.
* @param version Stack version, e.g., 2.2 or 2.2.0.1-885
* @param displayName Unique display name
- * @param upgradePack Optional upgrade pack, e.g, upgrade-2.2
* @param operatingSystems JSON structure of repository URLs for each OS
* @return Returns the object created if successful, and throws an exception otherwise.
* @throws AmbariException
*/
@Transactional
public RepositoryVersionEntity create(StackEntity stackEntity,
- String version, String displayName, String upgradePack,
- String operatingSystems) throws AmbariException {
+ String version, String displayName, String operatingSystems) throws AmbariException {
if (stackEntity == null || version == null || version.isEmpty()
|| displayName == null || displayName.isEmpty()) {
@@ -164,7 +162,7 @@ public class RepositoryVersionDAO extends CrudDAO<RepositoryVersionEntity, Long>
}
RepositoryVersionEntity newEntity = new RepositoryVersionEntity(
- stackEntity, version, displayName, upgradePack, operatingSystems);
+ stackEntity, version, displayName, operatingSystems);
this.create(newEntity);
return newEntity;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/UpgradeDAO.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/UpgradeDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/UpgradeDAO.java
index bc0652c..06f6ac1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/UpgradeDAO.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/UpgradeDAO.java
@@ -48,6 +48,18 @@ public class UpgradeDAO {
private DaoUtils daoUtils;
/**
+ * Get all items.
+ * @return List of all of the UpgradeEntity items.
+ */
+ @RequiresSession
+ public List<UpgradeEntity> findAll() {
+ TypedQuery<UpgradeEntity> query = entityManagerProvider.get().createNamedQuery(
+ "UpgradeEntity.findAll", UpgradeEntity.class);
+
+ return daoUtils.selectList(query);
+ }
+
+ /**
* @param clusterId the cluster id
* @return the list of upgrades initiated for the cluster
*/
@@ -157,8 +169,7 @@ public class UpgradeDAO {
}
/**
- * @param requestId the request id
- * @param stageId the stage id
+ * @param clusterId the cluster id
* @return the upgrade entity, or {@code null} if not found
*/
@RequiresSession
@@ -174,4 +185,8 @@ public class UpgradeDAO {
return daoUtils.selectSingle(query);
}
+ @Transactional
+ public UpgradeEntity merge(UpgradeEntity upgradeEntity) {
+ return entityManagerProvider.get().merge(upgradeEntity);
+ }
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
index 0fb2f10..16b7c1c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
@@ -90,9 +90,6 @@ public class RepositoryVersionEntity {
@Column(name = "display_name")
private String displayName;
- @Column(name = "upgrade_package")
- private String upgradePackage;
-
@Lob
@Column(name = "repositories")
private String operatingSystems;
@@ -110,11 +107,10 @@ public class RepositoryVersionEntity {
}
public RepositoryVersionEntity(StackEntity stack, String version,
- String displayName, String upgradePackage, String operatingSystems) {
+ String displayName, String operatingSystems) {
this.stack = stack;
this.version = version;
this.displayName = displayName;
- this.upgradePackage = upgradePackage;
this.operatingSystems = operatingSystems;
}
@@ -161,14 +157,6 @@ public class RepositoryVersionEntity {
this.displayName = displayName;
}
- public String getUpgradePackage() {
- return upgradePackage;
- }
-
- public void setUpgradePackage(String upgradePackage) {
- this.upgradePackage = upgradePackage;
- }
-
public String getOperatingSystemsJson() {
return operatingSystems;
}
@@ -233,9 +221,6 @@ public class RepositoryVersionEntity {
if (displayName != null ? !displayName.equals(that.displayName) : that.displayName != null) {
return false;
}
- if (upgradePackage != null ? !upgradePackage.equals(that.upgradePackage) : that.upgradePackage != null) {
- return false;
- }
if (operatingSystems != null ? !operatingSystems.equals(that.operatingSystems) : that.operatingSystems != null) {
return false;
}
@@ -249,7 +234,6 @@ public class RepositoryVersionEntity {
result = 31 * result + (stack != null ? stack.hashCode() : 0);
result = 31 * result + (version != null ? version.hashCode() : 0);
result = 31 * result + (displayName != null ? displayName.hashCode() : 0);
- result = 31 * result + (upgradePackage != null ? upgradePackage.hashCode() : 0);
result = 31 * result + (operatingSystems != null ? operatingSystems.hashCode() : 0);
return result;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java
index 802ea03..ad9073a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java
@@ -34,6 +34,7 @@ import javax.persistence.Table;
import javax.persistence.TableGenerator;
import org.apache.ambari.server.state.stack.upgrade.Direction;
+import org.apache.ambari.server.state.stack.upgrade.UpgradeType;
/**
* Models the data representation of an upgrade
@@ -44,6 +45,8 @@ import org.apache.ambari.server.state.stack.upgrade.Direction;
table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value",
pkColumnValue = "upgrade_id_seq", initialValue = 0)
@NamedQueries({
+ @NamedQuery(name = "UpgradeEntity.findAll",
+ query = "SELECT u FROM UpgradeEntity u"),
@NamedQuery(name = "UpgradeEntity.findAllForCluster",
query = "SELECT u FROM UpgradeEntity u WHERE u.clusterId = :clusterId"),
@NamedQuery(name = "UpgradeEntity.findUpgrade",
@@ -74,6 +77,13 @@ public class UpgradeEntity {
@Enumerated(value = EnumType.STRING)
private Direction direction = Direction.UPGRADE;
+ @Column(name="upgrade_package", nullable = false)
+ private String upgradePackage;
+
+ @Column(name="upgrade_type", nullable = false)
+ @Enumerated(value = EnumType.STRING)
+ private UpgradeType upgradeType;
+
@OneToMany(mappedBy = "upgradeEntity", cascade = { CascadeType.ALL })
private List<UpgradeGroupEntity> upgradeGroupEntities;
@@ -179,5 +189,84 @@ public class UpgradeEntity {
this.direction = direction;
}
+ /**
+ * @return the upgrade type, such as rolling or non_rolling
+ */
+ public UpgradeType getUpgradeType() {
+ return upgradeType;
+ }
+
+ /**
+ * @param upgradeType the upgrade type to set
+ */
+ public void setUpgradeType(UpgradeType upgradeType) {
+ this.upgradeType = upgradeType;
+ }
+
+ /**
+ * @return the upgrade package name, without the extension.
+ */
+ public String getUpgradePackage() {
+ return upgradePackage;
+ }
+
+ /**
+ * @param upgradePackage the upgrade pack to set
+ */
+ public void setUpgradePackage(String upgradePackage) {
+ this.upgradePackage = upgradePackage;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ UpgradeEntity that = (UpgradeEntity) o;
+
+ if (upgradeId != null ? !upgradeId.equals(that.upgradeId) : that.upgradeId != null) {
+ return false;
+ }
+ if (clusterId != null ? !clusterId.equals(that.clusterId) : that.clusterId != null) {
+ return false;
+ }
+ if (requestId != null ? !requestId.equals(that.requestId) : that.requestId != null) {
+ return false;
+ }
+ if (fromVersion != null ? !fromVersion.equals(that.fromVersion) : that.fromVersion != null) {
+ return false;
+ }
+ if (toVersion != null ? !toVersion.equals(that.toVersion) : that.toVersion != null) {
+ return false;
+ }
+ if (direction != null ? !direction.equals(that.direction) : that.direction != null) {
+ return false;
+ }
+ if (upgradeType != null ? !upgradeType.equals(that.upgradeType) : that.upgradeType != null) {
+ return false;
+ }
+ if (upgradePackage != null ? !upgradePackage.equals(that.upgradePackage) : that.upgradePackage != null) {
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = upgradeId != null ? upgradeId.hashCode() : 0;
+ result = 31 * result + (clusterId != null ? clusterId.hashCode() : 0);
+ result = 31 * result + (requestId != null ? requestId.hashCode() : 0);
+ result = 31 * result + (fromVersion != null ? fromVersion.hashCode() : 0);
+ result = 31 * result + (toVersion != null ? toVersion.hashCode() : 0);
+ result = 31 * result + (direction != null ? direction.hashCode() : 0);
+ result = 31 * result + (upgradeType != null ? upgradeType.hashCode() : 0);
+ result = 31 * result + (upgradePackage != null ? upgradePackage.hashCode() : 0);
+ return result;
+ }
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/main/java/org/apache/ambari/server/stack/StackDirectory.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackDirectory.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackDirectory.java
index 89c10c6..db947ca 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackDirectory.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackDirectory.java
@@ -95,7 +95,6 @@ public class StackDirectory extends StackDefinitionDirectory {
/**
* map of upgrade pack name to upgrade pack
*/
- //todo: should be a collection but upgrade pack doesn't have a name attribute
private Map<String, UpgradePack> upgradePacks;
/**
@@ -412,8 +411,10 @@ public class StackDirectory extends StackDefinitionDirectory {
upgradesDir = f.getAbsolutePath();
for (File upgradeFile : f.listFiles(XML_FILENAME_FILTER)) {
try {
- upgradeMap.put(FilenameUtils.removeExtension(upgradeFile.getName()),
- unmarshaller.unmarshal(UpgradePack.class, upgradeFile));
+ String upgradePackName = FilenameUtils.removeExtension(upgradeFile.getName());
+ UpgradePack pack = unmarshaller.unmarshal(UpgradePack.class, upgradeFile);
+ pack.setName(upgradePackName);
+ upgradeMap.put(upgradePackName, pack);
} catch (JAXBException e) {
throw new AmbariException("Unable to parse stack upgrade file at location: " +
upgradeFile.getAbsolutePath(), e);
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/main/java/org/apache/ambari/server/state/StackInfo.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/StackInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/state/StackInfo.java
index 2aa89cc..87301e5 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/StackInfo.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/StackInfo.java
@@ -356,7 +356,7 @@ public class StackInfo implements Comparable<StackInfo>, Validable{
/**
* Set upgrade packs.
*
- * @param upgradePacks map of upgrade packs
+ * @param upgradePacks map of upgrade packs
*/
public void setUpgradePacks(Map<String, UpgradePack> upgradePacks) {
this.upgradePacks = upgradePacks;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java b/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java
index 8b17d49..d86210a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java
@@ -77,7 +77,7 @@ public class UpgradeContext {
* @param direction
* the direction for the upgrade
* @param type
- * the type of upgrade, either rolling or nonrolling
+ * the type of upgrade, either rolling or non_rolling
*/
public UpgradeContext(MasterHostResolver resolver, StackId sourceStackId,
StackId targetStackId, String version,
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
index 3e25d01..ecefe6e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
@@ -216,7 +216,7 @@ public class UpgradeHelper {
// NonRolling defaults to not performing service checks on a group.
// Of course, a Service Check Group does indeed run them.
- if (upgradePack.getType() == UpgradeType.NONROLLING) {
+ if (upgradePack.getType() == UpgradeType.NON_ROLLING) {
group.performServiceCheck = false;
}
@@ -273,7 +273,7 @@ public class UpgradeHelper {
ProcessingComponent pc = null;
if (upgradePack.getType() == UpgradeType.ROLLING) {
pc = allTasks.get(service.serviceName).get(component);
- } else if (upgradePack.getType() == UpgradeType.NONROLLING) {
+ } else if (upgradePack.getType() == UpgradeType.NON_ROLLING) {
// Construct a processing task on-the-fly
if (null != functionName) {
pc = new ProcessingComponent();
@@ -564,5 +564,4 @@ public class UpgradeHelper {
LOG.debug("Could not get service detail", e);
}
}
-
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/main/java/org/apache/ambari/server/state/stack/UpgradePack.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/UpgradePack.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/UpgradePack.java
index 79b8eb5..bd06ea8 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/UpgradePack.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/UpgradePack.java
@@ -45,6 +45,11 @@ import org.apache.ambari.server.state.stack.upgrade.UpgradeType;
@XmlAccessorType(XmlAccessType.FIELD)
public class UpgradePack {
+ /**
+ * Name of the file without the extension, such as upgrade-2.2
+ */
+ private String name;
+
@XmlElement(name="target")
private String target;
@@ -60,7 +65,7 @@ public class UpgradePack {
/**
* In the case of a rolling upgrade, will specify processing logic for a particular component.
- * Nonrolling upgrades are simpler so the "processing" is embedded into the group's "type", which is a function like
+ * NonRolling upgrades are simpler so the "processing" is embedded into the group's "type", which is a function like
* "stop" or "start".
*/
@XmlElementWrapper(name="processing")
@@ -74,6 +79,13 @@ public class UpgradePack {
@XmlTransient
private boolean m_resolvedGroups = false;
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
/**
* @return the target version for the upgrade pack
*/
@@ -89,7 +101,7 @@ public class UpgradePack {
}
/**
- * @return the type of upgrade, e.g., "rolling" or "nonrolling"
+ * @return the type of upgrade, e.g., "ROLLING" or "NON_ROLLING"
*/
public UpgradeType getType() {
return type;
@@ -108,7 +120,7 @@ public class UpgradePack {
} else {
if (type == UpgradeType.ROLLING) {
list = getDowngradeGroupsForRolling();
- } else if (type == UpgradeType.NONROLLING) {
+ } else if (type == UpgradeType.NON_ROLLING) {
list = getDowngradeGroupsForNonrolling();
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/RepositoryVersionHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/RepositoryVersionHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/RepositoryVersionHelper.java
index 2e17cf4..615029d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/RepositoryVersionHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/RepositoryVersionHelper.java
@@ -159,14 +159,19 @@ public class RepositoryVersionHelper {
* @param stackName stack name
* @param stackVersion stack version
* @param repositoryVersion target repository version
+ * @param upgradeType if not {@code null} null, will only return upgrade packs whose type matches.
* @return upgrade pack name
* @throws AmbariException if no upgrade packs suit the requirements
*/
- public String getUpgradePackageName(String stackName, String stackVersion, String repositoryVersion) throws AmbariException {
+ public String getUpgradePackageName(String stackName, String stackVersion, String repositoryVersion, UpgradeType upgradeType) throws AmbariException {
final Map<String, UpgradePack> upgradePacks = ambariMetaInfo.getUpgradePacks(stackName, stackVersion);
- for (Entry<String, UpgradePack> upgradePackEntry : upgradePacks.entrySet()) {
- final UpgradePack upgradePack = upgradePackEntry.getValue();
- final String upgradePackName = upgradePackEntry.getKey();
+ for (UpgradePack upgradePack : upgradePacks.values()) {
+ final String upgradePackName = upgradePack.getName();
+
+ if (null != upgradeType && upgradePack.getType() != upgradeType) {
+ continue;
+ }
+
// check that upgrade pack has <target> node
if (StringUtils.isBlank(upgradePack.getTarget())) {
LOG.error("Upgrade pack " + upgradePackName + " is corrupted, it should contain <target> node");
@@ -183,23 +188,7 @@ public class RepositoryVersionHelper {
return upgradePackName;
}
}
- throw new AmbariException("There were no suitable upgrade packs for stack " + stackName + " " + stackVersion);
- }
-
- /**
- * Scans the given stack for upgrade packages which can be applied to update the cluster to given repository version.
- * Returns NONE if there were no suitable packages.
- *
- * @param stackName stack name
- * @param stackVersion stack version
- * @param repositoryVersion target repository version
- * @return upgrade pack name or NONE
- */
- public String getUpgradePackageNameSafe(String stackName, String stackVersion, String repositoryVersion) {
- try {
- return getUpgradePackageName(stackName, stackVersion, repositoryVersion);
- } catch (AmbariException ex) {
- return "NONE";
- }
+ throw new AmbariException("There were no suitable upgrade packs for stack " + stackName + " " + stackVersion +
+ ((null != upgradeType) ? " and upgrade type " + upgradeType : ""));
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/UpgradeType.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/UpgradeType.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/UpgradeType.java
index 17ee22c..3acfb9f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/UpgradeType.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/UpgradeType.java
@@ -26,11 +26,11 @@ public enum UpgradeType {
/**
* Services are up the entire time
*/
- @XmlEnumValue("rolling")
+ @XmlEnumValue("ROLLING")
ROLLING,
/**
* All services are stopped, then started
*/
- @XmlEnumValue("nonrolling")
- NONROLLING;
+ @XmlEnumValue("NON_ROLLING")
+ NON_ROLLING;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java
index 63f015b..e3ad814 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java
@@ -1543,7 +1543,6 @@ public class ServiceComponentHostImpl implements ServiceComponentHost {
stackEntity,
version,
stackId.getStackName() + "-" + version,
- repositoryVersionHelper.getUpgradePackageNameSafe(stackId.getStackName(), stackId.getStackVersion(), version),
repositoryVersionHelper.serializeOperatingSystems(stackInfo.getRepositories()));
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
index 77e2e93..2fa4275 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
@@ -178,6 +178,7 @@ public class SchemaUpgradeHelper {
catalogBinder.addBinding().to(UpgradeCatalog200.class);
catalogBinder.addBinding().to(UpgradeCatalog210.class);
catalogBinder.addBinding().to(UpgradeCatalog211.class);
+ catalogBinder.addBinding().to(UpgradeCatalog212.class);
catalogBinder.addBinding().to(UpgradeCatalog220.class);
catalogBinder.addBinding().to(FinalUpgradeCatalog.class);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java
new file mode 100644
index 0000000..6919e64
--- /dev/null
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java
@@ -0,0 +1,323 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server.upgrade;
+
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+import com.google.inject.persist.Transactional;
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.configuration.Configuration;
+import org.apache.ambari.server.orm.DBAccessor.DBColumnInfo;
+import org.apache.ambari.server.orm.dao.ClusterDAO;
+import org.apache.ambari.server.orm.dao.RepositoryVersionDAO;
+import org.apache.ambari.server.orm.entities.ClusterEntity;
+import org.apache.ambari.server.orm.entities.RepositoryVersionEntity;
+import org.apache.ambari.server.orm.entities.StackEntity;
+import org.apache.ambari.server.state.stack.upgrade.Direction;
+import org.apache.ambari.server.state.stack.upgrade.UpgradeType;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.MessageFormat;
+
+
+/**
+ * Upgrade catalog for version 2.1.2.
+ */
+public class UpgradeCatalog212 extends AbstractUpgradeCatalog {
+
+ public static final String UPGRADE_PACKAGE_COL = "upgrade_package";
+ public static final String UPGRADE_TYPE_COL = "upgrade_type";
+ public static final String UPGRADE_TABLE = "upgrade";
+ public static final String REPO_VERSION_TABLE = "repo_version";
+
+ /**
+ * Logger.
+ */
+ private static final Logger LOG = LoggerFactory.getLogger(UpgradeCatalog212.class);
+
+ @Inject
+ private RepositoryVersionDAO repositoryVersionDAO;
+
+ @Inject
+ private ClusterDAO clusterDAO;
+
+
+ // ----- Constructors ------------------------------------------------------
+
+ /**
+ * Don't forget to register new UpgradeCatalogs in {@link org.apache.ambari.server.upgrade.SchemaUpgradeHelper.UpgradeHelperModule#configure()}
+ *
+ * @param injector Guice injector to track dependencies and uses bindings to inject them.
+ */
+ @Inject
+ public UpgradeCatalog212(Injector injector) {
+ super(injector);
+ this.injector = injector;
+ }
+
+ // ----- UpgradeCatalog ----------------------------------------------------
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getTargetVersion() {
+ return "2.1.2";
+ }
+
+ // ----- AbstractUpgradeCatalog --------------------------------------------
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getSourceVersion() {
+ return "2.1.1";
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void executeDDLUpdates() throws AmbariException, SQLException {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void executePreDMLUpdates() throws AmbariException, SQLException {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void executeDMLUpdates() throws AmbariException, SQLException {
+ executeStackUpgradeDDLUpdates();
+ }
+
+ // ----- UpgradeCatalog212 --------------------------------------------
+
+ /**
+ * Move the upgrade_package column from the repo_version table to the upgrade table as follows,
+ * add column upgrade_package to upgrade table as String 255 and nullable
+ * populate column in the upgrade table
+ * drop the column in the repo_version table
+ * make the column in the upgrade table non-nullable.
+ * This has to be called as part of DML and not DDL since the persistence service has to be started.
+ * @throws AmbariException
+ * @throws SQLException
+ */
+ @Transactional
+ private void executeStackUpgradeDDLUpdates() throws SQLException, AmbariException {
+ final Configuration.DatabaseType databaseType = configuration.getDatabaseType();
+
+ // Add columns
+ if (!dbAccessor.tableHasColumn(UPGRADE_TABLE, UPGRADE_PACKAGE_COL)) {
+ LOG.info("Adding upgrade_package column to upgrade table.");
+ dbAccessor.addColumn(UPGRADE_TABLE, new DBColumnInfo(UPGRADE_PACKAGE_COL, String.class, 255, null, true));
+ }
+ if (!dbAccessor.tableHasColumn(UPGRADE_TABLE, UPGRADE_TYPE_COL)) {
+ LOG.info("Adding upgrade_type column to upgrade table.");
+ dbAccessor.addColumn(UPGRADE_TABLE, new DBColumnInfo(UPGRADE_TYPE_COL, String.class, 32, null, true));
+ }
+
+ // Populate values in upgrade table.
+ boolean success = this.populateUpgradeTable();
+
+ if (!success) {
+ throw new AmbariException("Errors found while populating the upgrade table with values for columns upgrade_type and upgrade_package.");
+ }
+
+ if (dbAccessor.tableHasColumn(REPO_VERSION_TABLE, UPGRADE_PACKAGE_COL)) {
+ LOG.info("Dropping upgrade_package column from repo_version table.");
+ dbAccessor.dropColumn(REPO_VERSION_TABLE, UPGRADE_PACKAGE_COL);
+
+ // Now, make the added column non-nullable
+ // Make the hosts id non-null after all the values are populated
+ LOG.info("Making upgrade_package column in the upgrade table non-nullable.");
+ if (databaseType == Configuration.DatabaseType.DERBY) {
+ // This is a workaround for UpgradeTest.java unit test
+ dbAccessor.executeQuery("ALTER TABLE " + UPGRADE_TABLE + " ALTER column " + UPGRADE_PACKAGE_COL + " NOT NULL");
+ } else {
+ dbAccessor.alterColumn(UPGRADE_TABLE, new DBColumnInfo(UPGRADE_PACKAGE_COL, String.class, 255, null, false));
+ }
+ }
+
+ if (dbAccessor.tableHasColumn(REPO_VERSION_TABLE, UPGRADE_TYPE_COL)) {
+ // Now, make the added column non-nullable
+ // Make the hosts id non-null after all the values are populated
+ LOG.info("Making upgrade_type column in the upgrade table non-nullable.");
+ if (databaseType == Configuration.DatabaseType.DERBY) {
+ // This is a workaround for UpgradeTest.java unit test
+ dbAccessor.executeQuery("ALTER TABLE " + UPGRADE_TABLE + " ALTER column " + UPGRADE_TYPE_COL + " NOT NULL");
+ } else {
+ dbAccessor.alterColumn(UPGRADE_TABLE, new DBColumnInfo(UPGRADE_TYPE_COL, String.class, 32, null, false));
+ }
+ }
+ }
+
+ /**
+ * Populate the upgrade table with values for the columns upgrade_type and upgrade_package.
+ * The upgrade_type will default to {@code org.apache.ambari.server.state.stack.upgrade.UpgradeType.ROLLING}
+ * whereas the upgrade_package will be calculated.
+ * @return {@code} true on success, and {@code} false otherwise.
+ */
+ private boolean populateUpgradeTable() {
+ boolean success = true;
+ Statement statement = null;
+ ResultSet rs = null;
+ try {
+ statement = dbAccessor.getConnection().createStatement();
+ if (statement != null) {
+ // Need to use SQL since the schema is changing and some of the columns have not yet been added..
+ rs = statement.executeQuery("SELECT upgrade_id, cluster_id, from_version, to_version, direction, upgrade_package, upgrade_type FROM upgrade");
+ if (rs != null) {
+ try {
+ while (rs.next()) {
+ final long upgradeId = rs.getLong("upgrade_id");
+ final long clusterId = rs.getLong("cluster_id");
+ final String fromVersion = rs.getString("from_version");
+ final String toVersion = rs.getString("to_version");
+ final Direction direction = Direction.valueOf(rs.getString("direction"));
+ // These two values are likely null.
+ String upgradePackage = rs.getString("upgrade_package");
+ String upgradeType = rs.getString("upgrade_type");
+
+ LOG.info(MessageFormat.format("Populating rows for the upgrade table record with " +
+ "upgrade_id: {0}, cluster_id: {1}, from_version: {2}, to_version: {3}, direction: {4}",
+ upgradeId, clusterId, fromVersion, toVersion, direction));
+
+ // Set all upgrades that have been done so far to type "rolling"
+ if (StringUtils.isEmpty(upgradeType)) {
+ LOG.info("Updating the record's upgrade_type to " + UpgradeType.ROLLING);
+ dbAccessor.executeQuery("UPDATE upgrade SET upgrade_type = '" + UpgradeType.ROLLING + "' WHERE upgrade_id = " + upgradeId);
+ }
+
+ if (StringUtils.isEmpty(upgradePackage)) {
+ String version = null;
+ StackEntity stack = null;
+
+ if (direction == Direction.UPGRADE) {
+ version = toVersion;
+ } else if (direction == Direction.DOWNGRADE) {
+ // TODO AMBARI-12698, this is going to be a problem.
+ // During a downgrade, the "to_version" is overwritten to the source version, but the "from_version"
+ // doesn't swap. E.g.,
+ // upgrade_id | from_version | to_version | direction
+ // ------------+--------------+--------------+----------
+ // 1 | 2.2.6.0-2800 | 2.3.0.0-2557 | UPGRADE
+ // 2 | 2.2.6.0-2800 | 2.2.6.0-2800 | DOWNGRADE
+ version = fromVersion;
+ }
+
+ ClusterEntity cluster = clusterDAO.findById(clusterId);
+
+ if (null != cluster) {
+ stack = cluster.getDesiredStack();
+ upgradePackage = this.calculateUpgradePackage(stack, version);
+ } else {
+ LOG.error("Could not find a cluster with cluster_id " + clusterId);
+ }
+
+ if (!StringUtils.isEmpty(upgradePackage)) {
+ LOG.info("Updating the record's upgrade_package to " + upgradePackage);
+ dbAccessor.executeQuery("UPDATE upgrade SET upgrade_package = '" + upgradePackage + "' WHERE upgrade_id = " + upgradeId);
+ } else {
+ success = false;
+ LOG.error("Unable to populate column upgrade_package for record in table upgrade with id " + upgradeId);
+ }
+ }
+ }
+ } catch (Exception e) {
+ success = false;
+ e.printStackTrace();
+ LOG.error("Unable to populate the upgrade_type and upgrade_package columns of the upgrade table. " + e);
+ }
+ }
+ }
+ } catch (Exception e) {
+ success = false;
+ e.printStackTrace();
+ LOG.error("Failed to retrieve records from the upgrade table to populate the upgrade_type and upgrade_package columns. Exception: " + e);
+ } finally {
+ try {
+ if (rs != null) {
+ rs.close();
+ }
+ if (statement != null) {
+ statement.close();
+ }
+ } catch (SQLException e) {
+ ;
+ }
+ }
+ return success;
+ }
+
+ /**
+ * Find the single Repo Version for the given stack and version, and return its upgrade_package column.
+ * Because the upgrade_package column is going to be removed from this entity, must use raw SQL
+ * instead of the entity class.
+ * @param stack Stack
+ * @param version Stack version
+ * @return The value of the upgrade_package column, or null if not found.
+ */
+
+ private String calculateUpgradePackage(StackEntity stack, String version) {
+ String upgradePackage = null;
+ // Find the corresponding repo_version, and extract its upgrade_package
+ if (null != version && null != stack) {
+ RepositoryVersionEntity repoVersion = repositoryVersionDAO.findByStackNameAndVersion(stack.getStackName(), version);
+
+ Statement statement = null;
+ ResultSet rs = null;
+ try {
+ statement = dbAccessor.getConnection().createStatement();
+ if (statement != null) {
+ // Need to use SQL since the schema is changing and the entity will no longer have the upgrade_package column.
+ rs = statement.executeQuery("SELECT upgrade_package FROM repo_version WHERE repo_version_id = " + repoVersion.getId());
+ if (rs != null && rs.next()) {
+ upgradePackage = rs.getString("upgrade_package");
+ }
+ }
+ } catch (Exception e) {
+ LOG.error("Failed to retrieve upgrade_package for repo_version record with id " + repoVersion.getId() + ". Exception: " + e.getMessage());
+ } finally {
+ try {
+ if (rs != null) {
+ rs.close();
+ }
+ if (statement != null) {
+ statement.close();
+ }
+ } catch (SQLException e) {
+ ;
+ }
+ }
+ }
+ return upgradePackage;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
index 265e42e..976fdbd 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
@@ -540,7 +540,6 @@ CREATE TABLE repo_version (
stack_id BIGINT NOT NULL,
version VARCHAR(255) NOT NULL,
display_name VARCHAR(128) NOT NULL,
- upgrade_package VARCHAR(255) NOT NULL,
repositories LONGTEXT NOT NULL,
PRIMARY KEY(repo_version_id)
);
@@ -881,6 +880,8 @@ CREATE TABLE upgrade (
from_version VARCHAR(255) DEFAULT '' NOT NULL,
to_version VARCHAR(255) DEFAULT '' NOT NULL,
direction VARCHAR(255) DEFAULT 'UPGRADE' NOT NULL,
+ upgrade_package VARCHAR(255) NOT NULL,
+ upgrade_type VARCHAR(32) NOT NULL,
PRIMARY KEY (upgrade_id),
FOREIGN KEY (cluster_id) REFERENCES clusters(cluster_id),
FOREIGN KEY (request_id) REFERENCES request(request_id)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
index 0053837..3c6205f 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
@@ -529,7 +529,6 @@ CREATE TABLE repo_version (
stack_id NUMBER(19) NOT NULL,
version VARCHAR2(255) NOT NULL,
display_name VARCHAR2(128) NOT NULL,
- upgrade_package VARCHAR2(255) NOT NULL,
repositories CLOB NOT NULL,
PRIMARY KEY(repo_version_id)
);
@@ -870,6 +869,8 @@ CREATE TABLE upgrade (
from_version VARCHAR2(255) DEFAULT '' NOT NULL,
to_version VARCHAR2(255) DEFAULT '' NOT NULL,
direction VARCHAR2(255) DEFAULT 'UPGRADE' NOT NULL,
+ upgrade_package VARCHAR2(255) NOT NULL,
+ upgrade_type VARCHAR2(32) NOT NULL,
PRIMARY KEY (upgrade_id),
FOREIGN KEY (cluster_id) REFERENCES clusters(cluster_id),
FOREIGN KEY (request_id) REFERENCES request(request_id)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
index 30b669d..3acf8c3 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
@@ -534,7 +534,6 @@ CREATE TABLE repo_version (
stack_id BIGINT NOT NULL,
version VARCHAR(255) NOT NULL,
display_name VARCHAR(128) NOT NULL,
- upgrade_package VARCHAR(255) NOT NULL,
repositories TEXT NOT NULL,
PRIMARY KEY(repo_version_id)
);
@@ -872,6 +871,8 @@ CREATE TABLE upgrade (
from_version VARCHAR(255) DEFAULT '' NOT NULL,
to_version VARCHAR(255) DEFAULT '' NOT NULL,
direction VARCHAR(255) DEFAULT 'UPGRADE' NOT NULL,
+ upgrade_package VARCHAR(255) NOT NULL,
+ upgrade_type VARCHAR(32) NOT NULL,
PRIMARY KEY (upgrade_id),
FOREIGN KEY (cluster_id) REFERENCES clusters(cluster_id),
FOREIGN KEY (request_id) REFERENCES request(request_id)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql
index 4f7569c..f1b6580 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql
@@ -601,7 +601,6 @@ CREATE TABLE ambari.repo_version (
stack_id BIGINT NOT NULL,
version VARCHAR(255) NOT NULL,
display_name VARCHAR(128) NOT NULL,
- upgrade_package VARCHAR(255) NOT NULL,
repositories TEXT NOT NULL,
PRIMARY KEY(repo_version_id)
);
@@ -963,6 +962,8 @@ CREATE TABLE ambari.upgrade (
from_version VARCHAR(255) DEFAULT '' NOT NULL,
to_version VARCHAR(255) DEFAULT '' NOT NULL,
direction VARCHAR(255) DEFAULT 'UPGRADE' NOT NULL,
+ upgrade_package VARCHAR(255) NOT NULL,
+ upgrade_type VARCHAR(32) NOT NULL,
PRIMARY KEY (upgrade_id),
FOREIGN KEY (cluster_id) REFERENCES ambari.clusters(cluster_id),
FOREIGN KEY (request_id) REFERENCES ambari.request(request_id)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
index 81d0e6f..99abbdc 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
@@ -640,7 +640,6 @@ CREATE TABLE repo_version (
stack_id BIGINT NOT NULL,
version VARCHAR(255) NOT NULL,
display_name VARCHAR(128) NOT NULL,
- upgrade_package VARCHAR(255) NOT NULL,
repositories VARCHAR(MAX) NOT NULL,
PRIMARY KEY CLUSTERED (repo_version_id)
);
@@ -987,6 +986,8 @@ CREATE TABLE upgrade (
from_version VARCHAR(255) DEFAULT '' NOT NULL,
to_version VARCHAR(255) DEFAULT '' NOT NULL,
direction VARCHAR(255) DEFAULT 'UPGRADE' NOT NULL,
+ upgrade_package VARCHAR(255) NOT NULL,
+ upgrade_type VARCHAR(32) NOT NULL,
PRIMARY KEY CLUSTERED (upgrade_id),
FOREIGN KEY (cluster_id) REFERENCES clusters(cluster_id),
FOREIGN KEY (request_id) REFERENCES request(request_id)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py
index 09d4d56..07be496 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py
@@ -114,14 +114,14 @@ class NameNodeDefault(NameNode):
print "TODO AMBARI-12698"
pass
- def prepare_nonrolling_upgrade(self, env):
+ def prepare_non_rolling_upgrade(self, env):
print "TODO AMBARI-12698"
pass
def prepare_rolling_upgrade(self, env):
namenode_upgrade.prepare_rolling_upgrade()
- def finalize_nonrolling_upgrade(self, env):
+ def finalize_non_rolling_upgrade(self, env):
print "TODO AMBARI-12698"
pass
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml
index bf237c6..01022b8 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml
@@ -19,7 +19,7 @@
<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<target>2.2.*.*</target>
- <type>nonrolling</type>
+ <type>NON_ROLLING</type>
<order>
<group xsi:type="cluster" name="PRE_CLUSTER" title="Prepare Upgrade">
@@ -128,7 +128,7 @@
<execute-stage service="HDFS" component="NAMENODE" title="Snapshot HDFS">
<task xsi:type="execute" hosts="master"> <!-- TODO, this can be any NameNode, not just the active. -->
<script>scripts/namenode.py</script>
- <function>prepare_nonrolling_upgrade</function>
+ <function>prepare_non_rolling_upgrade</function>
</task>
</execute-stage>
@@ -446,7 +446,7 @@
<execute-stage service="HDFS" component="NAMENODE" title="Execute HDFS Finalize">
<task xsi:type="execute" hosts="master"> <!-- TODO, what happens if there's no HA. -->
<script>scripts/namenode.py</script>
- <function>finalize_nonrolling_upgrade</function>
+ <function>finalize_non_rolling_upgrade</function>
</task>
</execute-stage>
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
index 9b7848f..74eb499 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
@@ -19,7 +19,7 @@
<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<target>2.2.*.*</target>
- <type>rolling</type>
+ <type>ROLLING</type>
<order>
<group xsi:type="cluster" name="PRE_CLUSTER" title="Prepare Upgrade">
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
index 25df73a..7c1a1f9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
@@ -20,7 +20,7 @@
<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<target>2.3.*.*</target>
<target-stack>HDP-2.3</target-stack>
- <type>rolling</type>
+ <type>ROLLING</type>
<order>
<group xsi:type="cluster" name="PRE_CLUSTER" title="Prepare Upgrade">
<direction>UPGRADE</direction>
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml
index e9671e3..044c43a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml
@@ -19,7 +19,7 @@
<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<target>2.3.*.*</target>
- <type>rolling</type>
+ <type>ROLLING</type>
<order>
<group xsi:type="cluster" name="PRE_CLUSTER" title="Prepare Upgrade">
<direction>UPGRADE</direction>
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/test/java/org/apache/ambari/server/checks/HostsMasterMaintenanceCheckTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/HostsMasterMaintenanceCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/HostsMasterMaintenanceCheckTest.java
index fc0f9bc..d37d8a9 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/checks/HostsMasterMaintenanceCheckTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/HostsMasterMaintenanceCheckTest.java
@@ -33,6 +33,7 @@ import org.apache.ambari.server.state.stack.PrerequisiteCheck;
import org.apache.ambari.server.state.stack.UpgradePack;
import org.apache.ambari.server.state.stack.UpgradePack.ProcessingComponent;
import org.apache.ambari.server.state.stack.upgrade.RepositoryVersionHelper;
+import org.apache.ambari.server.state.stack.upgrade.UpgradeType;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;
@@ -61,6 +62,7 @@ public class HostsMasterMaintenanceCheckTest {
@Test
public void testPerform() throws Exception {
+ final String upgradePackName = "upgrade_pack";
final HostsMasterMaintenanceCheck hostsMasterMaintenanceCheck = new HostsMasterMaintenanceCheck();
hostsMasterMaintenanceCheck.clustersProvider = new Provider<Clusters>() {
@@ -92,13 +94,13 @@ public class HostsMasterMaintenanceCheckTest {
Mockito.when(cluster.getClusterId()).thenReturn(1L);
Mockito.when(clusters.getCluster("cluster")).thenReturn(cluster);
Mockito.when(cluster.getDesiredStackVersion()).thenReturn(new StackId("HDP", "1.0"));
- Mockito.when(repositoryVersionHelper.getUpgradePackageName(Mockito.anyString(), Mockito.anyString(), Mockito.anyString())).thenReturn(null);
+ Mockito.when(repositoryVersionHelper.getUpgradePackageName(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), (UpgradeType) Mockito.anyObject())).thenReturn(null);
PrerequisiteCheck check = new PrerequisiteCheck(null, null);
hostsMasterMaintenanceCheck.perform(check, new PrereqCheckRequest("cluster"));
Assert.assertEquals(PrereqCheckStatus.FAIL, check.getStatus());
- Mockito.when(repositoryVersionHelper.getUpgradePackageName(Mockito.anyString(), Mockito.anyString(), Mockito.anyString())).thenReturn("upgrade pack");
+ Mockito.when(repositoryVersionHelper.getUpgradePackageName(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), (UpgradeType) Mockito.anyObject())).thenReturn(upgradePackName);
Mockito.when(ambariMetaInfo.getUpgradePacks(Mockito.anyString(), Mockito.anyString())).thenReturn(new HashMap<String, UpgradePack>());
check = new PrerequisiteCheck(null, null);
@@ -107,7 +109,8 @@ public class HostsMasterMaintenanceCheckTest {
final Map<String, UpgradePack> upgradePacks = new HashMap<String, UpgradePack>();
final UpgradePack upgradePack = Mockito.mock(UpgradePack.class);
- upgradePacks.put("upgrade pack", upgradePack);
+ Mockito.when(upgradePack.getName()).thenReturn(upgradePackName);
+ upgradePacks.put(upgradePack.getName(), upgradePack);
Mockito.when(ambariMetaInfo.getUpgradePacks(Mockito.anyString(), Mockito.anyString())).thenReturn(upgradePacks);
Mockito.when(upgradePack.getTasks()).thenReturn(new HashMap<String, Map<String,ProcessingComponent>>());
Mockito.when(cluster.getServices()).thenReturn(new HashMap<String, Service>());
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddd5d928/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProviderTest.java
index ea6e56e..ab06a5c 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProviderTest.java
@@ -102,6 +102,12 @@ public class CompatibleRepositoryVersionResourceProviderTest {
Map<String, UpgradePack> map = new HashMap<String, UpgradePack>();
UpgradePack pack1 = new UpgradePack() {
+
+ @Override
+ public String getName() {
+ return "pack1";
+ }
+
@Override
public String getTarget() {
return "1.1.*.*";
@@ -110,6 +116,11 @@ public class CompatibleRepositoryVersionResourceProviderTest {
final UpgradePack pack2 = new UpgradePack() {
@Override
+ public String getName() {
+ return "pack2";
+ }
+
+ @Override
public String getTarget() {
return "2.2.*.*";
}
@@ -133,6 +144,11 @@ public class CompatibleRepositoryVersionResourceProviderTest {
UpgradePack pack = new UpgradePack() {
@Override
+ public String getName() {
+ return "pack2";
+ }
+
+ @Override
public String getTarget() {
return "2.2.*.*";
}