You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2017/02/21 22:37:00 UTC
[1/6] ambari git commit: AMBARI-20054 - Remove Entities Associated
With clusterconfigmapping (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/trunk 59daf8b0e -> 6553ffaee
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4638d24/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ServiceConfigDAOTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ServiceConfigDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ServiceConfigDAOTest.java
index a0732ab..77593a7 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ServiceConfigDAOTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ServiceConfigDAOTest.java
@@ -29,7 +29,6 @@ import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.orm.GuiceJpaInitializer;
import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
import org.apache.ambari.server.orm.entities.ClusterConfigEntity;
-import org.apache.ambari.server.orm.entities.ClusterConfigMappingEntity;
import org.apache.ambari.server.orm.entities.ClusterEntity;
import org.apache.ambari.server.orm.entities.ConfigGroupConfigMappingEntity;
import org.apache.ambari.server.orm.entities.ConfigGroupEntity;
@@ -41,7 +40,6 @@ import org.apache.ambari.server.security.authorization.ResourceType;
import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.StackId;
-import org.apache.ambari.server.state.cluster.ClusterImpl;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -443,39 +441,52 @@ public class ServiceConfigDAOTest {
ClusterEntity clusterEntity = clusterDAO.findByName("c1");
Assert.assertTrue(!clusterEntity.getClusterConfigEntities().isEmpty());
- Assert.assertTrue(!clusterEntity.getConfigMappingEntities().isEmpty());
Assert.assertEquals(5, clusterEntity.getClusterConfigEntities().size());
- Assert.assertEquals(3, clusterEntity.getConfigMappingEntities().size());
}
+ /**
+ * Tests the ability to find the latest configuration by stack, regardless of
+ * whether that configuration is enabled.
+ *
+ * @throws Exception
+ */
@Test
- public void testGetClusterConfigMappingByStack() throws Exception{
+ public void testGetLatestClusterConfigsByStack() throws Exception {
initClusterEntities();
ClusterEntity clusterEntity = clusterDAO.findByName("c1");
- List<ClusterConfigMappingEntity> clusterConfigMappingEntities = clusterDAO.getClusterConfigMappingsByStack(clusterEntity.getClusterId(), HDP_01);
- Assert.assertEquals(2, clusterConfigMappingEntities .size());
+ // there should be 3 configs in HDP-0.1 for this cluster, none selected
+ List<ClusterConfigEntity> clusterConfigEntities = clusterDAO.getLatestConfigurations(clusterEntity.getClusterId(), HDP_01);
+ Assert.assertEquals(1, clusterConfigEntities.size());
- ClusterConfigMappingEntity e1 = clusterConfigMappingEntities.get(0);
- String tag1 = e1.getTag();
- Assert.assertEquals("version1", tag1);
- String type1 = e1.getType();
- Assert.assertEquals("oozie-site", type1);
+ ClusterConfigEntity entity = clusterConfigEntities.get(0);
+ Assert.assertEquals("version3", entity.getTag());
+ Assert.assertEquals("oozie-site", entity.getType());
+ Assert.assertFalse(entity.isSelected());
- ClusterConfigMappingEntity e2 = clusterConfigMappingEntities.get(1);
- String tag2 = e2.getTag();
- Assert.assertEquals("version2", tag2);
- String type2 = e2.getType();
- Assert.assertEquals("oozie-site", type2);
+ // there should be 2 configs in HDP-0.2 for this cluster, the latest being
+ // selected
+ clusterConfigEntities = clusterDAO.getLatestConfigurations(clusterEntity.getClusterId(), HDP_02);
+ Assert.assertEquals(1, clusterConfigEntities.size());
+
+ entity = clusterConfigEntities.get(0);
+ Assert.assertEquals("version5", entity.getTag());
+ Assert.assertEquals("oozie-site", entity.getType());
+ Assert.assertTrue(entity.isSelected());
}
/**
- * Test the get latest configuration query against clusterconfig table with configuration groups inserted
- * */
+ * Tests getting latest and enabled configurations when there is a
+ * configuration group. Configurations for configuration groups are not
+ * "selected" as they are merged in with the selected configuration. This can
+ * cause problems if searching simply for the "latest" since it will pickup
+ * the wrong configuration.
+ *
+ */
@Test
- public void testGetClusterConfigMappingByStackCG() throws Exception{
+ public void testGetClusterConfigsByStackCG() throws Exception {
initClusterEntitiesWithConfigGroups();
ClusterEntity clusterEntity = clusterDAO.findByName("c1");
@@ -487,42 +498,42 @@ public class ServiceConfigDAOTest {
ConfigGroupEntity configGroupEntity = configGroupEntities.get(0);
Assert.assertNotNull(configGroupEntity);
Assert.assertEquals("c1", configGroupEntity.getClusterEntity().getClusterName());
- Assert.assertEquals(clusterId, configGroupEntity.getClusterEntity()
- .getClusterId());
+ Assert.assertEquals(clusterId, configGroupEntity.getClusterEntity().getClusterId());
Assert.assertEquals("oozie_server", configGroupEntity.getGroupName());
Assert.assertEquals("OOZIE", configGroupEntity.getTag());
Assert.assertEquals("oozie server", configGroupEntity.getDescription());
- List<ClusterConfigMappingEntity> clusterConfigMappingEntities = clusterDAO.getClusterConfigMappingsByStack(clusterEntity.getClusterId(), HDP_01);
- Assert.assertEquals(2, clusterConfigMappingEntities .size());
+ // all 3 are HDP-0.1, but only the 2nd one is enabled
+ List<ClusterConfigEntity> clusterConfigEntities = clusterDAO.getEnabledConfigsByStack(
+ clusterEntity.getClusterId(), HDP_01);
+
+ Assert.assertEquals(1, clusterConfigEntities.size());
+
+ ClusterConfigEntity configEntity = clusterConfigEntities.get(0);
+ Assert.assertEquals("version2", configEntity.getTag());
+ Assert.assertEquals("oozie-site", configEntity.getType());
+ Assert.assertTrue(configEntity.isSelected());
- ClusterConfigMappingEntity e1 = clusterConfigMappingEntities.get(0);
- String tag1 = e1.getTag();
- Assert.assertEquals("version1", tag1);
- String type1 = e1.getType();
- Assert.assertEquals("oozie-site", type1);
+ // this should still return the 2nd one since the 3rd one has never been
+ // selected as its only for configuration groups
+ clusterConfigEntities = clusterDAO.getLatestConfigurations(clusterEntity.getClusterId(),
+ HDP_01);
- ClusterConfigMappingEntity e2 = clusterConfigMappingEntities.get(1);
- String tag2 = e2.getTag();
- Assert.assertEquals("version2", tag2);
- String type2 = e2.getType();
- Assert.assertEquals("oozie-site", type2);
+ configEntity = clusterConfigEntities.get(0);
+ Assert.assertEquals("version2", configEntity.getTag());
+ Assert.assertEquals("oozie-site", configEntity.getType());
+ Assert.assertTrue(configEntity.isSelected());
}
+
/**
- * Test
- *
- * When the last configuration of a given configuration type to be stored into the clusterconfig table is
- * for a configuration group, there is no corresponding entry generated in the clusterconfigmapping.
- *
- * Therefore, the getlatestconfiguration query should skip configuration groups stored in the clusterconfig table.
- *
- * Test to determine the latest configuration of a given type whose version_tag
- * exists in the clusterconfigmapping table.
+ * Tests that when there are multiple configurations for a stack, only the
+ * selected ones get returned.
*
- * */
+ * @throws Exception
+ */
@Test
- public void testGetLatestClusterConfigMappingByStack() throws Exception {
+ public void testGetEnabledClusterConfigByStack() throws Exception {
Clusters clusters = injector.getInstance(Clusters.class);
clusters.addCluster("c1", HDP_01);
@@ -530,30 +541,24 @@ public class ServiceConfigDAOTest {
initClusterEntities();
- Collection<ClusterConfigMappingEntity> latestMapingEntities = ((ClusterImpl) cluster).getLatestConfigMappingsForStack(
- cluster.getClusterId(), HDP_01);
+ Collection<ClusterConfigEntity> latestConfigs = clusterDAO.getEnabledConfigsByStack(
+ cluster.getClusterId(), HDP_02);
- Assert.assertEquals(1, latestMapingEntities.size());
- for(ClusterConfigMappingEntity e: latestMapingEntities){
- Assert.assertEquals("version2", e.getTag());
+ Assert.assertEquals(1, latestConfigs.size());
+ for (ClusterConfigEntity e : latestConfigs) {
+ Assert.assertEquals("version5", e.getTag());
Assert.assertEquals("oozie-site", e.getType());
}
}
/**
- * Test
- *
- * When the last configuration of a given configuration type to be stored into the clusterconfig table is
- * for a configuration group, there is no corresponding entry generated in the clusterconfigmapping.
- *
- * Therefore, the getlatestconfiguration query should skip configuration groups stored in the clusterconfig table.
- *
- * Test to determine the latest configuration of a given type whose version_tag
- * exists in the clusterconfigmapping table.
- *
- * */
+ * When the last configuration of a given configuration type to be stored into
+ * the clusterconfig table is for a configuration group, that configuration is
+ * not enabled. Therefore, it should be skipped when getting the enabled
+ * configurations for a stack.
+ */
@Test
- public void testGetLatestClusterConfigMappingByStackCG() throws Exception{
+ public void testGetLatestClusterConfigByStackCG() throws Exception {
Clusters clusters = injector.getInstance(Clusters.class);
clusters.addCluster("c1", HDP_01);
@@ -561,11 +566,11 @@ public class ServiceConfigDAOTest {
initClusterEntitiesWithConfigGroups();
- Collection<ClusterConfigMappingEntity> latestMapingEntities = ((ClusterImpl) cluster).getLatestConfigMappingsForStack(
+ Collection<ClusterConfigEntity> latestConfigs = clusterDAO.getEnabledConfigsByStack(
cluster.getClusterId(), HDP_01);
- Assert.assertEquals(1, latestMapingEntities.size());
- for(ClusterConfigMappingEntity e: latestMapingEntities){
+ Assert.assertEquals(1, latestConfigs.size());
+ for (ClusterConfigEntity e : latestConfigs) {
Assert.assertEquals("version2", e.getTag());
Assert.assertEquals("oozie-site", e.getType());
}
@@ -596,6 +601,15 @@ public class ServiceConfigDAOTest {
serviceConfigEntityList = serviceConfigDAO.getLastServiceConfigsForService(clusterId, "OOZIE");
Assert.assertEquals(1, serviceConfigEntityList.size());
}
+
+ /**
+ * Createa a cluster with 5 configurations for Oozie. Each configuration will
+ * have a tag of "version" plus a count. 3 configs will be for
+ * {@link #HDP_01}, and 2 will be for {@link #HDP_02}. Only the most recent
+ * configuration, {@code version5}, will be enabled.
+ *
+ * @throws Exception
+ */
private void initClusterEntities() throws Exception{
String userName = "admin";
@@ -615,7 +629,9 @@ public class ServiceConfigDAOTest {
String oozieSite = "oozie-site";
- for (int i = 1; i < 6; i++){
+ // create 5 Oozie Configs, with only the latest from HDP-0.2 being enabled
+ int configsToCreate = 5;
+ for (int i = 1; i <= configsToCreate; i++) {
Thread.sleep(1);
ClusterConfigEntity entity = new ClusterConfigEntity();
entity.setClusterEntity(clusterEntity);
@@ -624,60 +640,35 @@ public class ServiceConfigDAOTest {
entity.setVersion(Long.valueOf(i));
entity.setTag("version"+i);
entity.setTimestamp(new Date().getTime());
- if(i < 4) {
- entity.setStack(stackEntityHDP01);
- } else {
+
+ // set selected to true to get the last selected timestamp populated
+ entity.setSelected(true);
+
+ // now set it to false
+ entity.setSelected(false);
+
+ entity.setStack(stackEntityHDP01);
+ if (i >= 4) {
entity.setStack(stackEntityHDP02);
+ if (i == configsToCreate) {
+ entity.setSelected(true);
+ }
}
+
entity.setData("");
clusterDAO.createConfig(entity);
clusterEntity.getClusterConfigEntities().add(entity);
clusterDAO.merge(clusterEntity);
}
-
- Collection<ClusterConfigMappingEntity> entities = clusterEntity.getConfigMappingEntities();
- if(null == entities){
- entities = new ArrayList<ClusterConfigMappingEntity>();
- clusterEntity.setConfigMappingEntities(entities);
- }
-
- Thread.sleep(1);
- ClusterConfigMappingEntity e1 = new ClusterConfigMappingEntity();
- e1.setClusterEntity(clusterEntity);
- e1.setClusterId(clusterEntity.getClusterId());
- e1.setCreateTimestamp(System.currentTimeMillis());
- e1.setSelected(0);
- e1.setUser(userName);
- e1.setType(oozieSite);
- e1.setTag("version1");
- entities.add(e1);
- clusterDAO.merge(clusterEntity);
-
- Thread.sleep(1);
- ClusterConfigMappingEntity e2 = new ClusterConfigMappingEntity();
- e2.setClusterEntity(clusterEntity);
- e2.setClusterId(clusterEntity.getClusterId());
- e2.setCreateTimestamp(System.currentTimeMillis());
- e2.setSelected(0);
- e2.setUser(userName);
- e2.setType(oozieSite);
- e2.setTag("version2");
- entities.add(e2);
- clusterDAO.merge(clusterEntity);
-
- Thread.sleep(1);
- ClusterConfigMappingEntity e3 = new ClusterConfigMappingEntity();
- e3.setClusterEntity(clusterEntity);
- e3.setClusterId(clusterEntity.getClusterId());
- e3.setCreateTimestamp(System.currentTimeMillis());
- e3.setSelected(1);
- e3.setUser(userName);
- e3.setType(oozieSite);
- e3.setTag("version4");
- entities.add(e3);
- clusterDAO.merge(clusterEntity);
}
+ /**
+ * Createa a cluster with 3 configurations for Oozie in the {@link #HDP_01}
+ * stack. Only {@code version2}, will be enabled. {@code version3} will be for
+ * a new configuration group.
+ *
+ * @throws Exception
+ */
private void initClusterEntitiesWithConfigGroups() throws Exception{
String userName = "admin";
@@ -695,8 +686,9 @@ public class ServiceConfigDAOTest {
StackEntity stackEntityHDP01 = stackDAO.find(HDP_01.getStackName(),HDP_01.getStackVersion());
String oozieSite = "oozie-site";
- int count = 3;
- for (int i = 1; i < count; i++){
+ // create 2 configurations for HDP-0.1
+ int count = 2;
+ for (int i = 1; i <= count; i++) {
Thread.sleep(1);
ClusterConfigEntity entity = new ClusterConfigEntity();
entity.setClusterEntity(clusterEntity);
@@ -707,43 +699,17 @@ public class ServiceConfigDAOTest {
entity.setTimestamp(new Date().getTime());
entity.setStack(stackEntityHDP01);
entity.setData("");
+ entity.setSelected(false);
+
+ if (i == count) {
+ entity.setSelected(true);
+ }
+
clusterDAO.createConfig(entity);
clusterEntity.getClusterConfigEntities().add(entity);
clusterDAO.merge(clusterEntity);
}
- Collection<ClusterConfigMappingEntity> entities = clusterEntity.getConfigMappingEntities();
- if(null == entities){
- entities = new ArrayList<ClusterConfigMappingEntity>();
- clusterEntity.setConfigMappingEntities(entities);
- }
-
- Thread.sleep(1);
- ClusterConfigMappingEntity e1 = new ClusterConfigMappingEntity();
- e1.setClusterEntity(clusterEntity);
- e1.setClusterId(clusterEntity.getClusterId());
- e1.setCreateTimestamp(System.currentTimeMillis());
- e1.setSelected(0);
- e1.setUser(userName);
- e1.setType(oozieSite);
- e1.setTag("version1");
- entities.add(e1);
- clusterDAO.merge(clusterEntity);
-
- Thread.sleep(1);
- ClusterConfigMappingEntity e2 = new ClusterConfigMappingEntity();
- e2.setClusterEntity(clusterEntity);
- e2.setClusterId(clusterEntity.getClusterId());
- e2.setCreateTimestamp(System.currentTimeMillis());
- e2.setSelected(1);
- e2.setUser(userName);
- e2.setType(oozieSite);
- e2.setTag("version2");
- entities.add(e2);
- clusterDAO.merge(clusterEntity);
-
- ConfigGroupEntity configGroupEntity = new ConfigGroupEntity();
-
ResourceTypeEntity resourceTypeEntity = resourceTypeDAO.findById(ResourceType.CLUSTER.getId());
if (resourceTypeEntity == null) {
resourceTypeEntity = new ResourceTypeEntity();
@@ -755,50 +721,48 @@ public class ServiceConfigDAOTest {
ResourceEntity resourceEntity = new ResourceEntity();
resourceEntity.setResourceType(resourceTypeEntity);
+ // create a configuration group for oozie
+ ConfigGroupEntity configGroupEntity = new ConfigGroupEntity();
configGroupEntity.setClusterEntity(clusterEntity);
configGroupEntity.setClusterId(clusterEntity.getClusterId());
configGroupEntity.setGroupName("oozie_server");
configGroupEntity.setDescription("oozie server");
configGroupEntity.setTag("OOZIE");
+ configGroupDAO.create(configGroupEntity);
- ClusterConfigEntity configEntity = new ClusterConfigEntity();
- configEntity.setType("oozie-site");
- configEntity.setTag("version3");
- configEntity.setData("someData");
- configEntity.setAttributes("someAttributes");
- configEntity.setStack(stackEntityHDP01);
-
- List<ClusterConfigEntity> configEntities = new
- ArrayList<ClusterConfigEntity>();
- configEntities.add(configEntity);
+ // create a new configuration for oozie, for the config group
+ ClusterConfigEntity configEntityForGroup = new ClusterConfigEntity();
+ configEntityForGroup.setSelected(false);
+ configEntityForGroup.setType("oozie-site");
+ configEntityForGroup.setTag("version3");
+ configEntityForGroup.setData("someData");
+ configEntityForGroup.setAttributes("someAttributes");
+ configEntityForGroup.setStack(stackEntityHDP01);
- configGroupDAO.create(configGroupEntity);
+ List<ClusterConfigEntity> configEntitiesForGroup = new ArrayList<>();
+ configEntitiesForGroup.add(configEntityForGroup);
+ List<ConfigGroupConfigMappingEntity> configMappingEntities = new ArrayList<>();
- if (configEntities != null && !configEntities.isEmpty()) {
- List<ConfigGroupConfigMappingEntity> configMappingEntities = new
- ArrayList<ConfigGroupConfigMappingEntity>();
-
- for (ClusterConfigEntity config : configEntities) {
- config.setClusterEntity(clusterEntity);
- config.setClusterId(clusterEntity.getClusterId());
- clusterDAO.createConfig(config);
-
- Thread.sleep(1);
- ConfigGroupConfigMappingEntity configMappingEntity = new
- ConfigGroupConfigMappingEntity();
- configMappingEntity.setClusterId(clusterEntity.getClusterId());
- configMappingEntity.setClusterConfigEntity(config);
- configMappingEntity.setConfigGroupEntity(configGroupEntity);
- configMappingEntity.setConfigGroupId(configGroupEntity.getGroupId());
- configMappingEntity.setVersionTag(config.getTag());
- configMappingEntity.setConfigType(config.getType());
- configMappingEntity.setTimestamp(System.currentTimeMillis());
- configMappingEntities.add(configMappingEntity);
- configGroupConfigMappingDAO.create(configMappingEntity);
- }
+ for (ClusterConfigEntity config : configEntitiesForGroup) {
+ config.setClusterEntity(clusterEntity);
+ config.setClusterId(clusterEntity.getClusterId());
+ clusterDAO.createConfig(config);
- configGroupEntity.setConfigGroupConfigMappingEntities(configMappingEntities);
- configGroupDAO.merge(configGroupEntity);
+ Thread.sleep(1);
+ ConfigGroupConfigMappingEntity configMappingEntity = new
+ ConfigGroupConfigMappingEntity();
+ configMappingEntity.setClusterId(clusterEntity.getClusterId());
+ configMappingEntity.setClusterConfigEntity(config);
+ configMappingEntity.setConfigGroupEntity(configGroupEntity);
+ configMappingEntity.setConfigGroupId(configGroupEntity.getGroupId());
+ configMappingEntity.setVersionTag(config.getTag());
+ configMappingEntity.setConfigType(config.getType());
+ configMappingEntity.setTimestamp(System.currentTimeMillis());
+ configMappingEntities.add(configMappingEntity);
+ configGroupConfigMappingDAO.create(configMappingEntity);
}
+
+ configGroupEntity.setConfigGroupConfigMappingEntities(configMappingEntities);
+ configGroupDAO.merge(configGroupEntity);
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4638d24/ambari-server/src/test/java/org/apache/ambari/server/state/DesiredConfigTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/DesiredConfigTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/DesiredConfigTest.java
index 09aaa92..a397ef4 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/DesiredConfigTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/DesiredConfigTest.java
@@ -36,12 +36,10 @@ public class DesiredConfigTest {
DesiredConfig dc = new DesiredConfig();
dc.setServiceName("service");
dc.setTag("global");
- dc.setUser("_test");
Assert.assertEquals("Expected service 'service'", "service", dc.getServiceName());
Assert.assertEquals("Expected version 'global'", "global", dc.getTag());
Assert.assertEquals("Expected no host overrides", 0, dc.getHostOverrides().size());
- Assert.assertEquals("Expected user '_test'", "_test", dc.getUser());
List<DesiredConfig.HostOverride> hosts = Arrays.asList(
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4638d24/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java
index 6cdfbad..3d880c0 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java
@@ -71,7 +71,6 @@ import org.apache.ambari.server.orm.dao.HostVersionDAO;
import org.apache.ambari.server.orm.dao.RepositoryVersionDAO;
import org.apache.ambari.server.orm.dao.StackDAO;
import org.apache.ambari.server.orm.entities.ClusterConfigEntity;
-import org.apache.ambari.server.orm.entities.ClusterConfigMappingEntity;
import org.apache.ambari.server.orm.entities.ClusterEntity;
import org.apache.ambari.server.orm.entities.ClusterServiceEntity;
import org.apache.ambari.server.orm.entities.ClusterVersionEntity;
@@ -230,7 +229,7 @@ public class ClusterTest {
clusters.addCluster(clusterName, stackId);
- Map<String, String> hostAttributes = new HashMap<String, String>();
+ Map<String, String> hostAttributes = new HashMap<>();
hostAttributes.put("os_family", "redhat");
hostAttributes.put("os_release_version", "5.9");
@@ -279,7 +278,7 @@ public class ClusterTest {
host2.setIpv4("192.168.0.2");
host3.setIpv4("192.168.0.3");
- List<HostEntity> hostEntities = new ArrayList<HostEntity>();
+ List<HostEntity> hostEntities = new ArrayList<>();
hostEntities.add(host1);
hostEntities.add(host2);
@@ -309,7 +308,7 @@ public class ClusterTest {
when(stateEntity.getDesiredStack()).thenReturn(stackEntity);
clusterServiceEntity.setServiceDesiredStateEntity(stateEntity);
- List<ClusterServiceEntity> clusterServiceEntities = new ArrayList<ClusterServiceEntity>();
+ List<ClusterServiceEntity> clusterServiceEntities = new ArrayList<>();
clusterServiceEntities.add(clusterServiceEntity);
clusterEntity.setClusterServiceEntities(clusterServiceEntities);
return clusterEntity;
@@ -444,8 +443,8 @@ public class ClusterTest {
For some reason this still uses the metainfo.xml files for these services
from HDP-2.0.5 stack instead of the provided Stack Id
*/
- HashMap<String, Set<String>> componentsThatAdvertiseVersion = new HashMap<String, Set<String>>();
- HashMap<String, Set<String>> componentsThatDontAdvertiseVersion = new HashMap<String, Set<String>>();
+ HashMap<String, Set<String>> componentsThatAdvertiseVersion = new HashMap<>();
+ HashMap<String, Set<String>> componentsThatDontAdvertiseVersion = new HashMap<>();
Set<String> hdfsComponents = new HashSet<String>() {{ add("NAMENODE"); add("DATANODE"); add("HDFS_CLIENT"); }};
Set<String> zkComponents = new HashSet<String>() {{ add("ZOOKEEPER_SERVER"); add("ZOOKEEPER_CLIENT"); }};
@@ -567,7 +566,7 @@ public class ClusterTest {
hostInfo.setMemoryTotal(10);
hostInfo.setMemorySize(100);
hostInfo.setProcessorCount(10);
- List<DiskInfo> mounts = new ArrayList<DiskInfo>();
+ List<DiskInfo> mounts = new ArrayList<>();
mounts.add(new DiskInfo("/dev/sda", "/mnt/disk1",
"5000000", "4000000", "10%", "size", "fstype"));
hostInfo.setMounts(mounts);
@@ -839,7 +838,7 @@ public class ClusterTest {
Assert.assertEquals(1, componentHostMap.get("JOBTRACKER").size());
Assert.assertTrue(componentHostMap.get("JOBTRACKER").contains("h1"));
- componentHostMap = c1.getServiceComponentHostMap(null, new HashSet<String>(Arrays.asList("HDFS", "MAPREDUCE")));
+ componentHostMap = c1.getServiceComponentHostMap(null, new HashSet<>(Arrays.asList("HDFS", "MAPREDUCE")));
Assert.assertEquals(3, componentHostMap.size());
Assert.assertEquals(1, componentHostMap.get("NAMENODE").size());
Assert.assertTrue(componentHostMap.get("NAMENODE").contains("h1"));
@@ -896,7 +895,7 @@ public class ClusterTest {
Assert.assertEquals(1, componentHostMap.get("DATANODE").size());
Assert.assertTrue(componentHostMap.get("DATANODE").contains("h2"));
- componentHostMap = c1.getServiceComponentHostMap(new HashSet<String>(Arrays.asList("h1", "h2", "h3")), null);
+ componentHostMap = c1.getServiceComponentHostMap(new HashSet<>(Arrays.asList("h1", "h2", "h3")), null);
Assert.assertEquals(3, componentHostMap.size());
Assert.assertEquals(1, componentHostMap.get("NAMENODE").size());
Assert.assertTrue(componentHostMap.get("NAMENODE").contains("h1"));
@@ -959,10 +958,10 @@ public class ClusterTest {
public void testGetAndSetConfigs() throws Exception {
createDefaultCluster();
- Map<String, Map<String, String>> c1PropAttributes = new HashMap<String, Map<String,String>>();
+ Map<String, Map<String, String>> c1PropAttributes = new HashMap<>();
c1PropAttributes.put("final", new HashMap<String, String>());
c1PropAttributes.get("final").put("a", "true");
- Map<String, Map<String, String>> c2PropAttributes = new HashMap<String, Map<String,String>>();
+ Map<String, Map<String, String>> c2PropAttributes = new HashMap<>();
c2PropAttributes.put("final", new HashMap<String, String>());
c2PropAttributes.get("final").put("x", "true");
Config config1 = configFactory.createNew(c1, "global", "version1",
@@ -1020,15 +1019,12 @@ public class ClusterTest {
Assert.assertTrue("Expect desired config contain " + config3.getType(), desiredConfigs.containsKey("core-site"));
Assert.assertEquals("Expect desired config for global should be " + config1.getTag(),
config1.getTag(), desiredConfigs.get(config1.getType()).getTag());
- Assert.assertEquals("_test1", desiredConfigs.get(config1.getType()).getUser());
- Assert.assertEquals("_test3", desiredConfigs.get(config3.getType()).getUser());
DesiredConfig dc = desiredConfigs.get(config1.getType());
Assert.assertTrue("Expect no host-level overrides",
(null == dc.getHostOverrides() || dc.getHostOverrides().size() == 0));
Thread.sleep(1);
c1.addDesiredConfig("_test2", Collections.singleton(config2));
- Assert.assertEquals("_test2", c1.getDesiredConfigs().get(config2.getType()).getUser());
Thread.sleep(1);
c1.addDesiredConfig("_test1", Collections.singleton(config1));
@@ -1068,7 +1064,7 @@ public class ClusterTest {
host.setIPv4("ipv4");
host.setIPv6("ipv6");
- Map<String, String> hostAttributes = new HashMap<String, String>();
+ Map<String, String> hostAttributes = new HashMap<>();
hostAttributes.put("os_family", "redhat");
hostAttributes.put("os_release_version", "5.9");
host.setHostAttributes(hostAttributes);
@@ -1129,7 +1125,7 @@ public class ClusterTest {
Config config2 = configFactory.createNew(c1, "core-site", "version2",
new HashMap<String, String>() {{ put("x", "y"); }}, new HashMap<String, Map<String,String>>());
- Set<Config> configs = new HashSet<Config>();
+ Set<Config> configs = new HashSet<>();
configs.add(config1);
configs.add(config2);
@@ -1157,24 +1153,22 @@ public class ClusterTest {
// ServiceConfig
Assert.assertEquals(0,
em.createQuery("SELECT serviceConfig from ServiceConfigEntity serviceConfig").getResultList().size());
+
// ClusterConfig
- Assert.assertEquals(2,
- em.createQuery("SELECT config from ClusterConfigEntity config").getResultList().size());
- // ClusterConfigMapping
- List<ClusterConfigMappingEntity> configMappingEntities =
- em.createQuery("SELECT configmapping from ClusterConfigMappingEntity configmapping",
- ClusterConfigMappingEntity.class).getResultList();
+ List<ClusterConfigEntity> clusterConfigs = em.createQuery(
+ "SELECT config from ClusterConfigEntity config", ClusterConfigEntity.class).getResultList();
- Assert.assertEquals(2, configMappingEntities.size());
+ Assert.assertEquals(2, clusterConfigs.size());
- for (ClusterConfigMappingEntity configMappingEntity : configMappingEntities) {
- if (StringUtils.equals(configMappingEntity.getType(), "core-site")) {
+ for (ClusterConfigEntity configEntity : clusterConfigs) {
+ if (StringUtils.equals(configEntity.getType(), "core-site")) {
assertEquals("core-site is not part of HDFS in test stack, should remain mapped to cluster",
- 1, configMappingEntity.isSelected());
+ true, configEntity.isSelected());
}
- if (StringUtils.equals(configMappingEntity.getType(), "hdfs-site")) {
+
+ if (StringUtils.equals(configEntity.getType(), "hdfs-site")) {
assertEquals("hdfs-site should be unmapped from cluster when HDFS service is removed",
- 0, configMappingEntity.isSelected());
+ false, configEntity.isSelected());
}
}
@@ -1190,7 +1184,7 @@ public class ClusterTest {
Host host1 = clusters.getHost("h1");
HostEntity hostEntity1 = hostDAO.findByName("h1");
- Map<String, Map<String, String>> propAttributes = new HashMap<String, Map<String,String>>();
+ Map<String, Map<String, String>> propAttributes = new HashMap<>();
propAttributes.put("final", new HashMap<String, String>());
propAttributes.get("final").put("test", "true");
Config config = configFactory.createNew(c1, "hdfs-site", "1", new HashMap<String, String>(){{
@@ -1204,7 +1198,7 @@ public class ClusterTest {
assertTrue(configs.containsKey(hostEntity1.getHostId()));
assertEquals(1, configs.get(hostEntity1.getHostId()).size());
- List<Long> hostIds = new ArrayList<Long>();
+ List<Long> hostIds = new ArrayList<>();
hostIds.add(hostEntity1.getHostId());
configs = c1.getHostsDesiredConfigs(hostIds);
@@ -1294,7 +1288,7 @@ public class ClusterTest {
Config config2 = configFactory.createNew(c1, "core-site", "version2",
new HashMap<String, String>() {{ put("x", "y"); }}, new HashMap<String, Map<String,String>>());
- Set<Config> configs = new HashSet<Config>();
+ Set<Config> configs = new HashSet<>();
configs.add(config1);
configs.add(config2);
@@ -1949,7 +1943,7 @@ public class ClusterTest {
RepositoryVersionEntity rv1 = helper.getOrCreateRepositoryVersion(stackId, v1);
- Map<String, String> hostAttributes = new HashMap<String, String>();
+ Map<String, String> hostAttributes = new HashMap<>();
hostAttributes.put("os_family", "redhat");
hostAttributes.put("os_release_version", "6.4");
@@ -2106,7 +2100,7 @@ public class ClusterTest {
RepositoryVersionEntity rv1 = helper.getOrCreateRepositoryVersion(stackId, v1);
- Map<String, String> hostAttributes = new HashMap<String, String>();
+ Map<String, String> hostAttributes = new HashMap<>();
hostAttributes.put("os_family", "redhat");
hostAttributes.put("os_release_version", "6.4");
@@ -2180,7 +2174,7 @@ public class ClusterTest {
h.setIPv4("ipv4");
h.setIPv6("ipv6");
- Map<String, String> hostAttributes = new HashMap<String, String>();
+ Map<String, String> hostAttributes = new HashMap<>();
hostAttributes.put("os_family", "redhat");
hostAttributes.put("os_release_version", "5.9");
h.setHostAttributes(hostAttributes);
@@ -2249,7 +2243,7 @@ public class ClusterTest {
h.setIPv4("ipv4");
h.setIPv6("ipv6");
- Map<String, String> hostAttributes = new HashMap<String, String>();
+ Map<String, String> hostAttributes = new HashMap<>();
hostAttributes.put("os_family", "redhat");
hostAttributes.put("os_release_version", "5.9");
h.setHostAttributes(hostAttributes);
@@ -2393,177 +2387,142 @@ public class ClusterTest {
String configType = "foo-type";
- ClusterConfigEntity clusterConfig = new ClusterConfigEntity();
- clusterConfig.setClusterEntity(clusterEntity);
- clusterConfig.setConfigId(1L);
- clusterConfig.setStack(currentStack);
- clusterConfig.setTag("version-1");
- clusterConfig.setData("{}");
- clusterConfig.setType(configType);
- clusterConfig.setTimestamp(1L);
- clusterConfig.setVersion(1L);
-
- clusterDAO.createConfig(clusterConfig);
- clusterEntity.getClusterConfigEntities().add(clusterConfig);
+ ClusterConfigEntity clusterConfig1 = new ClusterConfigEntity();
+ clusterConfig1.setClusterEntity(clusterEntity);
+ clusterConfig1.setConfigId(1L);
+ clusterConfig1.setStack(currentStack);
+ clusterConfig1.setTag("version-1");
+ clusterConfig1.setData("{}");
+ clusterConfig1.setType(configType);
+ clusterConfig1.setTimestamp(1L);
+ clusterConfig1.setVersion(1L);
+ clusterConfig1.setSelected(true);
+
+ clusterDAO.createConfig(clusterConfig1);
+ clusterEntity.getClusterConfigEntities().add(clusterConfig1);
clusterEntity = clusterDAO.merge(clusterEntity);
- ClusterConfigEntity newClusterConfig = new ClusterConfigEntity();
- newClusterConfig.setClusterEntity(clusterEntity);
- newClusterConfig.setConfigId(2L);
- newClusterConfig.setStack(newStack);
- newClusterConfig.setTag("version-2");
- newClusterConfig.setData("{}");
- newClusterConfig.setType(configType);
- newClusterConfig.setTimestamp(2L);
- newClusterConfig.setVersion(2L);
-
- clusterDAO.createConfig(newClusterConfig);
- clusterEntity.getClusterConfigEntities().add(newClusterConfig);
+ ClusterConfigEntity clusterConfig2 = new ClusterConfigEntity();
+ clusterConfig2.setClusterEntity(clusterEntity);
+ clusterConfig2.setConfigId(2L);
+ clusterConfig2.setStack(newStack);
+ clusterConfig2.setTag("version-2");
+ clusterConfig2.setData("{}");
+ clusterConfig2.setType(configType);
+ clusterConfig2.setTimestamp(2L);
+ clusterConfig2.setVersion(2L);
+ clusterConfig2.setSelected(false);
+
+ clusterDAO.createConfig(clusterConfig2);
+ clusterEntity.getClusterConfigEntities().add(clusterConfig2);
clusterEntity = clusterDAO.merge(clusterEntity);
- // config mapping set to 1
- ClusterConfigMappingEntity configMapping = new ClusterConfigMappingEntity();
- configMapping.setClusterEntity(clusterEntity);
- configMapping.setCreateTimestamp(1L);
- configMapping.setSelected(1);
- configMapping.setTag("version-1");
- configMapping.setType(configType);
- configMapping.setUser("admin");
-
- // new config mapping set to 0
- ClusterConfigMappingEntity newConfigMapping = new ClusterConfigMappingEntity();
- newConfigMapping.setClusterEntity(clusterEntity);
- newConfigMapping.setCreateTimestamp(2L);
- newConfigMapping.setSelected(0);
- newConfigMapping.setTag("version-2");
- newConfigMapping.setType(configType);
- newConfigMapping.setUser("admin");
-
- clusterDAO.persistConfigMapping(configMapping);
- clusterDAO.persistConfigMapping(newConfigMapping);
- clusterEntity.getConfigMappingEntities().add(configMapping);
- clusterEntity.getConfigMappingEntities().add(newConfigMapping);
- clusterEntity = clusterDAO.merge(clusterEntity);
-
- // check that the original mapping is enabled
- Collection<ClusterConfigMappingEntity> clusterConfigMappings = clusterEntity.getConfigMappingEntities();
- Assert.assertEquals(2, clusterConfigMappings.size());
- for (ClusterConfigMappingEntity clusterConfigMapping : clusterConfigMappings) {
- if (clusterConfigMapping.getTag().equals("version-1")) {
- Assert.assertEquals(1, clusterConfigMapping.isSelected());
+ // check that the original config is enabled
+ Collection<ClusterConfigEntity> clusterConfigs = clusterEntity.getClusterConfigEntities();
+ Assert.assertEquals(2, clusterConfigs.size());
+ for (ClusterConfigEntity clusterConfig : clusterConfigs) {
+ if (clusterConfig.getTag().equals("version-1")) {
+ Assert.assertTrue(clusterConfig.isSelected());
} else {
- Assert.assertEquals(0, clusterConfigMapping.isSelected());
+ Assert.assertFalse(clusterConfig.isSelected());
}
}
cluster.applyLatestConfigurations(newStackId);
clusterEntity = clusterDAO.findByName("c1");
- // now check that the new config mapping is enabled
- clusterConfigMappings = clusterEntity.getConfigMappingEntities();
- Assert.assertEquals(2, clusterConfigMappings.size());
- for (ClusterConfigMappingEntity clusterConfigMapping : clusterConfigMappings) {
- if (clusterConfigMapping.getTag().equals("version-1")) {
- Assert.assertEquals(0, clusterConfigMapping.isSelected());
+ // now check that the new config is enabled
+ clusterConfigs = clusterEntity.getClusterConfigEntities();
+ Assert.assertEquals(2, clusterConfigs.size());
+ for (ClusterConfigEntity clusterConfig : clusterConfigs) {
+ if (clusterConfig.getTag().equals("version-1")) {
+ Assert.assertFalse(clusterConfig.isSelected());
} else {
- Assert.assertEquals(1, clusterConfigMapping.isSelected());
+ Assert.assertTrue(clusterConfig.isSelected());
}
}
}
/**
* Tests that {@link Cluster#applyLatestConfigurations(StackId)} sets the
- * right configs to enabled when there are duplicate mappings for type/tag.
- * Only the most recent should be enabled.
+ * right configs to enabled when setting them to a prior stack which has
+ * several configs.
*
* @throws Exception
*/
@Test
- public void testApplyLatestConfigurationsWithMultipleMappings() throws Exception {
+ public void testApplyLatestConfigurationsToPreviousStack() throws Exception {
createDefaultCluster();
Cluster cluster = clusters.getCluster("c1");
ClusterEntity clusterEntity = clusterDAO.findByName("c1");
StackId stackId = cluster.getCurrentStackVersion();
+ StackId newStackId = new StackId("HDP-2.0.6");
StackEntity currentStack = stackDAO.find(stackId.getStackName(), stackId.getStackVersion());
+ StackEntity newStack = stackDAO.find(newStackId.getStackName(), newStackId.getStackVersion());
+
+ Assert.assertFalse(stackId.equals(newStackId));
String configType = "foo-type";
- String configTag = "version-1";
- // create the config for the mappings
- ClusterConfigEntity clusterConfig = new ClusterConfigEntity();
- clusterConfig.setClusterEntity(clusterEntity);
- clusterConfig.setConfigId(1L);
- clusterConfig.setStack(currentStack);
- clusterConfig.setTag(configTag);
- clusterConfig.setData("{}");
- clusterConfig.setType(configType);
- clusterConfig.setTimestamp(1L);
- clusterConfig.setVersion(1L);
+ // create 5 configurations in the current stack
+ for (int i = 1; i <= 5; i++) {
+ ClusterConfigEntity clusterConfig = new ClusterConfigEntity();
+ clusterConfig.setClusterEntity(clusterEntity);
+ clusterConfig.setConfigId(Long.valueOf(i));
+ clusterConfig.setStack(currentStack);
+ clusterConfig.setTag("version-" + i);
+ clusterConfig.setData("{}");
+ clusterConfig.setType(configType);
+ clusterConfig.setTimestamp(System.currentTimeMillis());
+ clusterConfig.setVersion(Long.valueOf(i));
+
+ // set to true, then back to false to get a value populated in the
+ // selected timestamp
+ clusterConfig.setSelected(true);
+ clusterConfig.setSelected(false);
+
+ clusterDAO.createConfig(clusterConfig);
+ clusterEntity.getClusterConfigEntities().add(clusterConfig);
+
+ // ensure there is at least some pause between to ensure that the
+ // timestamps are different
+ Thread.sleep(5);
+ }
- clusterDAO.createConfig(clusterConfig);
- clusterEntity.getClusterConfigEntities().add(clusterConfig);
+ // save them all
clusterEntity = clusterDAO.merge(clusterEntity);
- // create 3 mappings for the same type/tag, each with a different time
-
- // config mapping 1
- ClusterConfigMappingEntity configMapping = new ClusterConfigMappingEntity();
- configMapping.setClusterEntity(clusterEntity);
- configMapping.setCreateTimestamp(1L);
- configMapping.setSelected(0);
- configMapping.setTag(configTag);
- configMapping.setType(configType);
- configMapping.setUser("admin");
- clusterDAO.persistConfigMapping(configMapping);
- clusterEntity.getConfigMappingEntities().add(configMapping);
-
- // config mapping 2
- configMapping = new ClusterConfigMappingEntity();
- configMapping.setClusterEntity(clusterEntity);
- configMapping.setCreateTimestamp(2L);
- configMapping.setSelected(0);
- configMapping.setTag(configTag);
- configMapping.setType(configType);
- configMapping.setUser("admin");
- clusterDAO.persistConfigMapping(configMapping);
- clusterEntity.getConfigMappingEntities().add(configMapping);
-
- // config mapping 3
- configMapping = new ClusterConfigMappingEntity();
- configMapping.setClusterEntity(clusterEntity);
- configMapping.setCreateTimestamp(3L);
- configMapping.setSelected(0);
- configMapping.setTag(configTag);
- configMapping.setType(configType);
- configMapping.setUser("admin");
- clusterDAO.persistConfigMapping(configMapping);
- clusterEntity.getConfigMappingEntities().add(configMapping);
-
+ // create a new configuration in the new stack and enable it
+ ClusterConfigEntity clusterConfigNewStack = new ClusterConfigEntity();
+ clusterConfigNewStack.setClusterEntity(clusterEntity);
+ clusterConfigNewStack.setConfigId(6L);
+ clusterConfigNewStack.setStack(newStack);
+ clusterConfigNewStack.setTag("version-6");
+ clusterConfigNewStack.setData("{}");
+ clusterConfigNewStack.setType(configType);
+ clusterConfigNewStack.setTimestamp(System.currentTimeMillis());
+ clusterConfigNewStack.setVersion(6L);
+ clusterConfigNewStack.setSelected(true);
+
+ clusterDAO.createConfig(clusterConfigNewStack);
+ clusterEntity.getClusterConfigEntities().add(clusterConfigNewStack);
clusterEntity = clusterDAO.merge(clusterEntity);
- // check all 3 mappings are disabled
- Collection<ClusterConfigMappingEntity> clusterConfigMappings = clusterEntity.getConfigMappingEntities();
- Assert.assertEquals(3, clusterConfigMappings.size());
- for (ClusterConfigMappingEntity clusterConfigMapping : clusterConfigMappings) {
- Assert.assertEquals(0, clusterConfigMapping.isSelected());
- }
+ // check that only the newest configuration is enabled
+ ClusterConfigEntity clusterConfig = clusterDAO.findEnabledConfigByType(
+ clusterEntity.getClusterId(), configType);
+ Assert.assertTrue(clusterConfig.isSelected());
+ Assert.assertEquals(clusterConfigNewStack.getTag(), clusterConfig.getTag());
- // apply configurations and check to see we've set the one with the latest
- // timestamp ONLY
- cluster.applyLatestConfigurations(cluster.getCurrentStackVersion());
+ // move back to the original stack
+ cluster.applyLatestConfigurations(stackId);
clusterEntity = clusterDAO.findByName("c1");
- // now check that the new config mapping is enabled
- clusterConfigMappings = clusterEntity.getConfigMappingEntities();
- Assert.assertEquals(3, clusterConfigMappings.size());
- for (ClusterConfigMappingEntity clusterConfigMapping : clusterConfigMappings) {
- if (clusterConfigMapping.getCreateTimestamp() < 3) {
- Assert.assertEquals(0, clusterConfigMapping.isSelected());
- } else {
- Assert.assertEquals(1, clusterConfigMapping.isSelected());
- }
- }
+ // now check that latest config from the original stack is enabled
+ clusterConfig = clusterDAO.findEnabledConfigByType(clusterEntity.getClusterId(), configType);
+ Assert.assertTrue(clusterConfig.isSelected());
+ Assert.assertEquals("version-5", clusterConfig.getTag());
}
/**
@@ -2582,8 +2541,8 @@ public class ClusterTest {
// make sure the stacks are different
Assert.assertFalse(stackId.equals(newStackId));
- Map<String, String> properties = new HashMap<String, String>();
- Map<String, Map<String, String>> propertiesAttributes = new HashMap<String, Map<String, String>>();
+ Map<String, String> properties = new HashMap<>();
+ Map<String, Map<String, String>> propertiesAttributes = new HashMap<>();
// foo-type for v1 on current stack
properties.put("foo-property-1", "foo-value-1");
@@ -2665,6 +2624,7 @@ public class ClusterTest {
clusterConfig.setType(configType);
clusterConfig.setTimestamp(1L);
clusterConfig.setVersion(1L);
+ clusterConfig.setSelected(true);
clusterDAO.createConfig(clusterConfig);
clusterEntity.getClusterConfigEntities().add(clusterConfig);
@@ -2679,35 +2639,12 @@ public class ClusterTest {
newClusterConfig.setType(configType);
newClusterConfig.setTimestamp(2L);
newClusterConfig.setVersion(2L);
+ newClusterConfig.setSelected(false);
clusterDAO.createConfig(newClusterConfig);
clusterEntity.getClusterConfigEntities().add(newClusterConfig);
clusterEntity = clusterDAO.merge(clusterEntity);
- // config mapping set to 1
- ClusterConfigMappingEntity configMapping = new ClusterConfigMappingEntity();
- configMapping.setClusterEntity(clusterEntity);
- configMapping.setCreateTimestamp(1L);
- configMapping.setSelected(1);
- configMapping.setTag("version-1");
- configMapping.setType(configType);
- configMapping.setUser("admin");
-
- // new config mapping set to 0
- ClusterConfigMappingEntity newConfigMapping = new ClusterConfigMappingEntity();
- newConfigMapping.setClusterEntity(clusterEntity);
- newConfigMapping.setCreateTimestamp(2L);
- newConfigMapping.setSelected(0);
- newConfigMapping.setTag("version-2");
- newConfigMapping.setType(configType);
- newConfigMapping.setUser("admin");
-
- clusterDAO.persistConfigMapping(configMapping);
- clusterDAO.persistConfigMapping(newConfigMapping);
- clusterEntity.getConfigMappingEntities().add(configMapping);
- clusterEntity.getConfigMappingEntities().add(newConfigMapping);
- clusterEntity = clusterDAO.merge(clusterEntity);
-
// get back the cluster configs for the new stack
List<ClusterConfigEntity> clusterConfigs = clusterDAO.getAllConfigurations(
cluster.getClusterId(), newStackId);
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4638d24/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersTest.java
index 5b54af4..97d560f 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersTest.java
@@ -121,7 +121,7 @@ public class ClustersTest {
}
private void setOsFamily(Host host, String osFamily, String osVersion) {
- Map<String, String> hostAttributes = new HashMap<String, String>();
+ Map<String, String> hostAttributes = new HashMap<>();
hostAttributes.put("os_family", osFamily);
hostAttributes.put("os_release_version", osVersion);
@@ -323,7 +323,7 @@ public class ClustersTest {
Cluster c4 = (Cluster) clusters.getClustersForHost(h2).toArray()[0];
Assert.assertEquals(c3, c4);
- Set<String> hostnames = new HashSet<String>();
+ Set<String> hostnames = new HashSet<>();
hostnames.add(h1);
hostnames.add(h2);
@@ -465,7 +465,7 @@ public class ClustersTest {
));
Assert.assertEquals(2, injector.getProvider(EntityManager.class).get().createQuery("SELECT config FROM ClusterConfigEntity config").getResultList().size());
Assert.assertEquals(1, injector.getProvider(EntityManager.class).get().createQuery("SELECT state FROM ClusterStateEntity state").getResultList().size());
- Assert.assertEquals(1, injector.getProvider(EntityManager.class).get().createQuery("SELECT config FROM ClusterConfigMappingEntity config").getResultList().size());
+ Assert.assertEquals(1, injector.getProvider(EntityManager.class).get().createQuery("SELECT config FROM ClusterConfigEntity config WHERE config.selected = 1").getResultList().size());
// add topology request
Blueprint bp = createNiceMock(Blueprint.class);
@@ -506,7 +506,6 @@ public class ClustersTest {
));
Assert.assertEquals(0, injector.getProvider(EntityManager.class).get().createQuery("SELECT config FROM ClusterConfigEntity config").getResultList().size());
Assert.assertEquals(0, injector.getProvider(EntityManager.class).get().createQuery("SELECT state FROM ClusterStateEntity state").getResultList().size());
- Assert.assertEquals(0, injector.getProvider(EntityManager.class).get().createQuery("SELECT config FROM ClusterConfigMappingEntity config").getResultList().size());
Assert.assertEquals(0, topologyRequestDAO.findByClusterId(cluster.getClusterId()).size());
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4638d24/ambari-server/src/test/java/org/apache/ambari/server/state/host/HostTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/host/HostTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/host/HostTest.java
index d418a80..32e8dae 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/host/HostTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/host/HostTest.java
@@ -95,7 +95,7 @@ public class HostTest {
info.setMemorySize(100);
info.setProcessorCount(10);
info.setPhysicalProcessorCount(2);
- List<DiskInfo> mounts = new ArrayList<DiskInfo>();
+ List<DiskInfo> mounts = new ArrayList<>();
mounts.add(new DiskInfo("/dev/sda", "/mnt/disk1",
"5000000", "4000000", "10%", "size", "fstype"));
info.setMounts(mounts);
@@ -146,7 +146,7 @@ public class HostTest {
HostInfo info = new HostInfo();
info.setMemorySize(100);
info.setProcessorCount(10);
- List<DiskInfo> mounts = new ArrayList<DiskInfo>();
+ List<DiskInfo> mounts = new ArrayList<>();
mounts.add(new DiskInfo("/dev/sda", "/mnt/disk1",
"5000000", "4000000", "10%", "size", "fstype"));
info.setMounts(mounts);
@@ -375,7 +375,7 @@ public class HostTest {
host.setIPv4("ipv4");
host.setIPv6("ipv6");
- Map<String, String> hostAttributes = new HashMap<String, String>();
+ Map<String, String> hostAttributes = new HashMap<>();
hostAttributes.put("os_family", "redhat");
hostAttributes.put("os_release_version", "6.3");
host.setHostAttributes(hostAttributes);
@@ -400,7 +400,6 @@ public class HostTest {
Map<String, DesiredConfig> map = host.getDesiredConfigs(c1.getClusterId());
Assert.assertTrue("Expect desired config to contain global", map.containsKey("global"));
- Assert.assertEquals("Expect global user to be '_test'", "_test", map.get("global").getUser());
config = configFactory.createNew(c1, "global", "v2",
new HashMap<String,String>() {{ put("c", "d"); }}, new HashMap<String, Map<String,String>>());
@@ -409,7 +408,6 @@ public class HostTest {
map = host.getDesiredConfigs(c1.getClusterId());
Assert.assertTrue("Expect desired config to contain global", map.containsKey("global"));
Assert.assertEquals("Expect version to be 'v2'", "v2", map.get("global").getTag());
- Assert.assertEquals("Expect user to be '_test1'", "_test1", map.get("global").getUser());
host.addDesiredConfig(c1.getClusterId(), false, "_test2", config);
map = host.getDesiredConfigs(c1.getClusterId());
@@ -430,7 +428,7 @@ public class HostTest {
host.setIPv4("ipv4");
host.setIPv6("ipv6");
- Map<String, String> hostAttributes = new HashMap<String, String>();
+ Map<String, String> hostAttributes = new HashMap<>();
hostAttributes.put("os_family", "redhat");
hostAttributes.put("os_release_version", "6.3");
host.setHostAttributes(hostAttributes);
[6/6] ambari git commit: Merge branch 'trunk' into
branch-feature-AMBARI-20053
Posted by jo...@apache.org.
Merge branch 'trunk' into branch-feature-AMBARI-20053
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6553ffae
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6553ffae
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6553ffae
Branch: refs/heads/trunk
Commit: 6553ffaee57a0c2a3ccc2389cfe4ecffef791338
Parents: 0c464b7 59daf8b
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Tue Feb 21 17:35:37 2017 -0500
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Tue Feb 21 17:35:37 2017 -0500
----------------------------------------------------------------------
.../timeline/AbstractTimelineMetricsSink.java | 22 +-
.../timeline/HadoopTimelineMetricsSink.java | 11 +-
.../kerberos/FinalizeKerberosServerAction.java | 14 +-
.../kerberos/KerberosServerAction.java | 2 +-
.../DRUID/0.9.2/package/scripts/params.py | 2 +-
.../DRUID/0.9.2/package/scripts/superset.py | 2 +-
.../common-services/YARN/2.1.0.2.0/metainfo.xml | 1 +
.../common-services/YARN/3.0.0.3.0/metainfo.xml | 1 +
.../FinalizeKerberosServerActionTest.java | 207 +++++++++++++++++++
9 files changed, 243 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
[5/6] ambari git commit: Merge branch 'trunk' into
branch-feature-AMBARI-20053
Posted by jo...@apache.org.
Merge branch 'trunk' into branch-feature-AMBARI-20053
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0c464b74
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0c464b74
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0c464b74
Branch: refs/heads/trunk
Commit: 0c464b742f206b0e6cf0c5d425d17023b47b4d9e
Parents: 9386eed 600d0a1
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Tue Feb 21 12:07:12 2017 -0500
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Tue Feb 21 12:07:12 2017 -0500
----------------------------------------------------------------------
.../src/main/python/ambari_agent/main.py | 23 +
ambari-server/docs/api/v1/schemas.md | 2 +-
.../server/state/cluster/ClusterImpl.java | 43 +-
.../ATLAS/0.1.0.2.3/kerberos.json | 3 +
.../DRUID/0.9.2/package/scripts/params.py | 2 +-
.../0.5.0.2.2/configuration/gateway-site.xml | 6 +
.../0.5.0.2.2/package/scripts/params_linux.py | 11 +
.../SPARK2/2.0.0/package/scripts/params.py | 2 +
.../2.0.0/package/scripts/service_check.py | 4 +-
.../before-ANY/scripts/shared_initialization.py | 4 +
.../stacks/HDP/2.2/services/stack_advisor.py | 7 +-
.../stacks/HDP/2.3/services/stack_advisor.py | 2 +-
.../stacks/HDP/2.3/upgrades/config-upgrade.xml | 5 +
.../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 6 +
.../stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 2 +
.../stacks/HDP/2.4/upgrades/config-upgrade.xml | 5 +
.../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 6 +
.../stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 2 +
.../HIVE/configuration/hive-interactive-env.xml | 2 +-
.../stacks/HDP/2.5/upgrades/config-upgrade.xml | 17 +-
.../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 20 +-
.../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 5 +-
.../stacks/HDP/2.6/services/ATLAS/kerberos.json | 3 +
.../services/KNOX/configuration/topology.xml | 10 +
.../stacks/HDP/2.6/services/stack_advisor.py | 4 +-
.../server/state/cluster/ClusterTest.java | 36 +-
.../2.0.6/hooks/before-ANY/test_before_any.py | 3 +
.../stacks/2.2/common/test_stack_advisor.py | 1 -
.../stacks/2.3/common/test_stack_advisor.py | 2 -
ambari-web/app/styles/application.less | 8 +-
ambari-web/app/styles/wizard.less | 8 +
.../common/assign_master_components.hbs | 5 +-
.../app/templates/common/form/dropdown.hbs | 29 +
ambari-web/app/views.js | 1 +
.../common/assign_master_components_view.js | 5 +-
.../views/common/configs/service_config_view.js | 1 +
ambari-web/app/views/common/form/dropdown.js | 84 +++
.../src/main/resources/ui/app/adapters/query.js | 6 +-
.../ui/app/components/query-result-table.js | 30 +-
.../resources/ui/app/components/upload-table.js | 2 +-
.../ui/app/components/visual-explain.js | 31 +-
.../resources/ui/app/configs/result-tabs.js | 48 ++
.../resources/ui/app/helpers/extract-value.js | 27 +
.../resources/ui/app/mixins/table-common.js | 86 ---
.../main/resources/ui/app/mixins/ui-logger.js | 9 +
.../main/resources/ui/app/models/worksheet.js | 8 +-
.../hive20/src/main/resources/ui/app/router.js | 6 +-
.../databases/database/tables/upload-table.js | 41 +-
.../resources/ui/app/routes/queries/query.js | 467 +++++++-------
.../ui/app/routes/queries/query/loading.js | 24 +
.../ui/app/routes/queries/query/log.js | 104 +++
.../ui/app/routes/queries/query/results.js | 59 ++
.../ui/app/routes/queries/query/tez-ui.js | 45 ++
.../app/routes/queries/query/visual-explain.js | 56 ++
.../main/resources/ui/app/routes/udfs/new.js | 71 +-
.../resources/ui/app/services/alert-messages.js | 7 +-
.../src/main/resources/ui/app/services/query.js | 4 +-
.../src/main/resources/ui/app/styles/app.scss | 251 +++-----
.../ui/app/templates/components/column-item.hbs | 4 +-
.../templates/components/query-result-table.hbs | 79 ++-
.../app/templates/components/upload-table.hbs | 4 +-
.../app/templates/components/visual-explain.hbs | 3 +-
.../ui/app/templates/queries/query.hbs | 66 +-
.../ui/app/templates/queries/query/loading.hbs | 21 +
.../ui/app/templates/queries/query/log.hbs | 29 +
.../ui/app/templates/queries/query/results.hbs | 49 ++
.../ui/app/templates/queries/query/tez-ui.hbs | 19 +
.../templates/queries/query/visual-explain.hbs | 33 +
.../resources/ui/app/utils/hive-explainer.js | 645 -------------------
.../ui/app/utils/hive-explainer/enhancer.js | 37 ++
.../ui/app/utils/hive-explainer/fallback.js | 34 +
.../ui/app/utils/hive-explainer/index.js | 31 +
.../ui/app/utils/hive-explainer/processor.js | 240 +++++++
.../app/utils/hive-explainer/renderer-force.js | 325 ++++++++++
.../ui/app/utils/hive-explainer/renderer.js | 327 ++++++++++
.../ui/app/utils/hive-explainer/transformer.js | 445 +++++++++++++
.../hive20/src/main/resources/ui/bower.json | 3 +-
.../src/main/resources/ui/config/environment.js | 2 +-
.../src/main/resources/ui/ember-cli-build.js | 1 +
.../hive20/src/main/resources/ui/package.json | 1 -
.../ambari/view/OozieProxyImpersonator.java | 192 +++---
.../apache/oozie/ambari/view/OozieUtils.java | 18 +
.../org/apache/oozie/ambari/view/Utils.java | 14 +-
.../oozie/ambari/view/WorkflowFilesService.java | 22 +-
.../workflowmanager/WorkflowManagerService.java | 6 +-
.../WorkflowsManagerResource.java | 7 +-
.../view/workflowmanager/WorkflowsRepo.java | 40 +-
.../ui/app/components/bundle-config.js | 18 +-
.../resources/ui/app/components/coord-config.js | 6 +-
.../ui/app/components/flow-designer.js | 70 +-
.../resources/ui/app/components/hdfs-browser.js | 9 +
.../main/resources/ui/app/components/job-row.js | 6 +
.../main/resources/ui/app/components/save-wf.js | 11 +-
.../ui/app/components/search-create-new-bar.js | 2 +-
.../resources/ui/app/components/search-table.js | 17 +-
.../ui/app/domain/cytoscape-flow-renderer.js | 34 +-
.../ui/app/domain/workflow-xml-generator.js | 4 -
.../main/resources/ui/app/domain/workflow.js | 8 +-
.../app/templates/components/bundle-config.hbs | 2 +-
.../app/templates/components/hdfs-browser.hbs | 5 +
.../ui/app/templates/components/job-config.hbs | 37 +-
.../app/templates/components/search-table.hbs | 11 +-
102 files changed, 3117 insertions(+), 1581 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/0c464b74/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/0c464b74/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java
----------------------------------------------------------------------
[4/6] ambari git commit: AMBARI-20055 - Add Upgrade Logic For Removal
of clusterconfigmapping (jonathanhurley)
Posted by jo...@apache.org.
AMBARI-20055 - Add Upgrade Logic For Removal of clusterconfigmapping (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9386eed4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9386eed4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9386eed4
Branch: refs/heads/trunk
Commit: 9386eed4073cb8b75800f516ddfe01c3f6528bb4
Parents: e8e2df2
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Mon Feb 20 13:59:55 2017 -0500
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Mon Feb 20 16:49:10 2017 -0500
----------------------------------------------------------------------
.../orm/helpers/dbms/GenericDbmsHelper.java | 2 +-
.../server/upgrade/UpgradeCatalog300.java | 92 ++++++++++-
.../server/upgrade/UpgradeCatalog300Test.java | 155 +++++++++++++++++--
3 files changed, 233 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9386eed4/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/GenericDbmsHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/GenericDbmsHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/GenericDbmsHelper.java
index 36fab83..f60c138 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/GenericDbmsHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/GenericDbmsHelper.java
@@ -426,7 +426,7 @@ public class GenericDbmsHelper implements DbmsHelper {
// org.eclipse.persistence.internal.databaseaccess.appendParameterInternal
Object dbValue = databasePlatform.convertToDatabaseType(value);
String valueString = value.toString();
- if (dbValue instanceof String) {
+ if (dbValue instanceof String || dbValue instanceof Enum) {
valueString = "'" + value.toString() + "'";
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/9386eed4/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog300.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog300.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog300.java
index 0267a5e..d9b9b57 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog300.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog300.java
@@ -18,7 +18,9 @@
package org.apache.ambari.server.upgrade;
+import java.sql.ResultSet;
import java.sql.SQLException;
+import java.sql.Statement;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -44,6 +46,7 @@ import org.apache.ambari.server.state.Config;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.jdbc.support.JdbcUtils;
import com.google.inject.Inject;
import com.google.inject.Injector;
@@ -55,11 +58,15 @@ public class UpgradeCatalog300 extends AbstractUpgradeCatalog {
*/
private static final Logger LOG = LoggerFactory.getLogger(UpgradeCatalog300.class);
- private static final String STAGE_TABLE = "stage";
- private static final String STAGE_STATUS_COLUMN = "status";
- private static final String STAGE_DISPLAY_STATUS_COLUMN = "display_status";
- private static final String REQUEST_TABLE = "request";
- private static final String REQUEST_DISPLAY_STATUS_COLUMN = "display_status";
+ protected static final String STAGE_TABLE = "stage";
+ protected static final String STAGE_STATUS_COLUMN = "status";
+ protected static final String STAGE_DISPLAY_STATUS_COLUMN = "display_status";
+ protected static final String REQUEST_TABLE = "request";
+ protected static final String REQUEST_DISPLAY_STATUS_COLUMN = "display_status";
+ protected static final String CLUSTER_CONFIG_TABLE = "clusterconfig";
+ protected static final String CLUSTER_CONFIG_SELECTED_COLUMN = "selected";
+ protected static final String CLUSTER_CONFIG_SELECTED_TIMESTAMP_COLUMN = "selected_timestamp";
+ protected static final String CLUSTER_CONFIG_MAPPING_TABLE = "clusterconfigmapping";
@Inject
DaoUtils daoUtils;
@@ -104,6 +111,7 @@ public class UpgradeCatalog300 extends AbstractUpgradeCatalog {
@Override
protected void executeDDLUpdates() throws AmbariException, SQLException {
updateStageTable();
+ updateClusterConfigurationTable();
}
protected void updateStageTable() throws SQLException {
@@ -120,6 +128,7 @@ public class UpgradeCatalog300 extends AbstractUpgradeCatalog {
*/
@Override
protected void executePreDMLUpdates() throws AmbariException, SQLException {
+ setSelectedConfigurationsAndRemoveMappingTable();
}
/**
@@ -189,7 +198,80 @@ public class UpgradeCatalog300 extends AbstractUpgradeCatalog {
}
}
});
+ }
+
+ /**
+ * Performs the following operations on {@code clusterconfig}:
+ * <ul>
+ * <li>Adds the {@link #CLUSTER_CONFIG_SELECTED_COLUMN} to
+ * {@link #CLUSTER_CONFIG_TABLE}.
+ * <li>Adds the {@link #CLUSTER_CONFIG_SELECTED_TIMESTAMP} to
+ * {@link #CLUSTER_CONFIG_TABLE}.
+ * </ul>
+ */
+ protected void updateClusterConfigurationTable() throws SQLException {
+ dbAccessor.addColumn(CLUSTER_CONFIG_TABLE,
+ new DBAccessor.DBColumnInfo(CLUSTER_CONFIG_SELECTED_COLUMN, Short.class, null, 0, false));
+ dbAccessor.addColumn(CLUSTER_CONFIG_TABLE,
+ new DBAccessor.DBColumnInfo(CLUSTER_CONFIG_SELECTED_TIMESTAMP_COLUMN, Long.class, null, 0,
+ false));
}
+ /**
+ * Performs the following operations on {@code clusterconfig} and
+ * {@code clusterconfigmapping}:
+ * <ul>
+ * <li>Sets both selected columns to the current config by querying
+ * {@link #CLUSTER_CONFIG_MAPPING_TABLE}.
+ * <li>Removes {@link #CLUSTER_CONFIG_MAPPING_TABLE}.
+ * </ul>
+ */
+ protected void setSelectedConfigurationsAndRemoveMappingTable() throws SQLException {
+ // update the new selected columns
+ executeInTransaction(new Runnable() {
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void run() {
+ String selectSQL = String.format(
+ "SELECT cluster_id, type_name, version_tag FROM %s WHERE selected = 1 ORDER BY cluster_id ASC, type_name ASC, version_tag ASC",
+ CLUSTER_CONFIG_MAPPING_TABLE);
+
+ Statement statement = null;
+ ResultSet resultSet = null;
+
+ long now = System.currentTimeMillis();
+
+ try {
+ statement = dbAccessor.getConnection().createStatement();
+ resultSet = statement.executeQuery(selectSQL);
+
+ while (resultSet.next()) {
+ final Long clusterId = resultSet.getLong("cluster_id");
+ final String typeName = resultSet.getString("type_name");
+ final String versionTag = resultSet.getString("version_tag");
+
+ // inefficient since this can be done with a single nested SELECT,
+ // but this way we can log what's happening which is more useful
+ String updateSQL = String.format(
+ "UPDATE %s SET selected = 1, selected_timestamp = %d WHERE cluster_id = %d AND type_name = '%s' AND version_tag = '%s'",
+ CLUSTER_CONFIG_TABLE, now, clusterId, typeName, versionTag);
+
+ dbAccessor.executeQuery(updateSQL);
+ }
+ } catch (SQLException sqlException) {
+ throw new RuntimeException(sqlException);
+ } finally {
+ JdbcUtils.closeResultSet(resultSet);
+ JdbcUtils.closeStatement(statement);
+ }
+ }
+ });
+
+ // if the above execution and committed the transaction, then we can remove
+ // the cluster configuration mapping table
+ dbAccessor.dropTable(CLUSTER_CONFIG_MAPPING_TABLE);
+ }
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/9386eed4/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog300Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog300Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog300Test.java
index ec001ec..a44c2b3 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog300Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog300Test.java
@@ -17,16 +17,84 @@
*/
package org.apache.ambari.server.upgrade;
+import static org.easymock.EasyMock.capture;
import static org.easymock.EasyMock.createMockBuilder;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.newCapture;
import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.reset;
import static org.easymock.EasyMock.verify;
import java.lang.reflect.Method;
-
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
+
+import javax.persistence.Cache;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.EntityTransaction;
+
+import org.apache.ambari.server.configuration.Configuration;
+import org.apache.ambari.server.controller.MaintenanceStateHelper;
+import org.apache.ambari.server.orm.DBAccessor;
+import org.apache.ambari.server.state.stack.OsFamily;
+import org.easymock.Capture;
+import org.easymock.EasyMock;
+import org.easymock.EasyMockRunner;
+import org.easymock.Mock;
+import org.easymock.MockType;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import com.google.gson.Gson;
+import com.google.inject.Binder;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Module;
+import com.google.inject.Provider;
+@RunWith(EasyMockRunner.class)
public class UpgradeCatalog300Test {
+ @Mock(type = MockType.STRICT)
+ private Provider<EntityManager> entityManagerProvider;
+
+ @Mock(type = MockType.NICE)
+ private Injector injector;
+
+ @Mock(type = MockType.NICE)
+ private EntityManager entityManager;
+
+ @Mock(type = MockType.NICE)
+ private DBAccessor dbAccessor;
+
+ @Mock(type = MockType.NICE)
+ private OsFamily osFamily;
+
+ @Mock(type = MockType.NICE)
+ private Configuration configuration;
+
+ @Before
+ public void init() {
+ reset(entityManagerProvider, injector);
+
+ expect(entityManagerProvider.get()).andReturn(entityManager).anyTimes();
+
+ expect(injector.getInstance(Gson.class)).andReturn(null).anyTimes();
+ expect(injector.getInstance(MaintenanceStateHelper.class)).andReturn(null).anyTimes();
+
+ replay(entityManagerProvider, injector);
+ }
+
+ @After
+ public void tearDown() {
+ }
+
@Test
public void testExecuteDMLUpdates() throws Exception {
Method addNewConfigurationsFromXml = AbstractUpgradeCatalog.class.getDeclaredMethod("addNewConfigurationsFromXml");
@@ -54,19 +122,86 @@ public class UpgradeCatalog300Test {
@Test
public void testExecuteDDLUpdates() throws Exception {
- Method updateStageTable = UpgradeCatalog300.class.getDeclaredMethod("updateStageTable");
- UpgradeCatalog300 upgradeCatalog300 = createMockBuilder(UpgradeCatalog300.class)
- .addMockedMethod(updateStageTable)
- .createMock();
-
- upgradeCatalog300.updateStageTable();
+ Module module = new Module() {
+ @Override
+ public void configure(Binder binder) {
+ binder.bind(DBAccessor.class).toInstance(dbAccessor);
+ binder.bind(OsFamily.class).toInstance(osFamily);
+ binder.bind(EntityManager.class).toInstance(entityManager);
+ binder.bind(Configuration.class).toInstance(configuration);
+ }
+ };
+
+ Capture<DBAccessor.DBColumnInfo> clusterConfigSelectedColumn = newCapture();
+ Capture<DBAccessor.DBColumnInfo> clusterConfigSelectedTimestampColumn = newCapture();
+ dbAccessor.addColumn(eq(UpgradeCatalog300.CLUSTER_CONFIG_TABLE), capture(clusterConfigSelectedColumn));
+ dbAccessor.addColumn(eq(UpgradeCatalog300.CLUSTER_CONFIG_TABLE), capture(clusterConfigSelectedTimestampColumn));
+
+ replay(dbAccessor, configuration);
+
+ Injector injector = Guice.createInjector(module);
+ UpgradeCatalog300 upgradeCatalog300 = injector.getInstance(UpgradeCatalog300.class);
+ upgradeCatalog300.executeDDLUpdates();
- replay(upgradeCatalog300);
+ DBAccessor.DBColumnInfo capturedSelectedColumn = clusterConfigSelectedColumn.getValue();
+ Assert.assertNotNull(capturedSelectedColumn);
+ Assert.assertEquals(UpgradeCatalog300.CLUSTER_CONFIG_SELECTED_COLUMN, capturedSelectedColumn.getName());
+ Assert.assertEquals(Short.class, capturedSelectedColumn.getType());
- upgradeCatalog300.executeDDLUpdates();
+ DBAccessor.DBColumnInfo capturedSelectedTimestampColumn = clusterConfigSelectedTimestampColumn.getValue();
+ Assert.assertNotNull(capturedSelectedTimestampColumn);
+ Assert.assertEquals(UpgradeCatalog300.CLUSTER_CONFIG_SELECTED_TIMESTAMP_COLUMN, capturedSelectedTimestampColumn.getName());
+ Assert.assertEquals(Long.class, capturedSelectedTimestampColumn.getType());
- verify(upgradeCatalog300);
+ verify(dbAccessor);
}
+ /**
+ * Tests pre-DML executions.
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testExecutePreDMLUpdates() throws Exception {
+ Module module = new Module() {
+ @Override
+ public void configure(Binder binder) {
+ binder.bind(DBAccessor.class).toInstance(dbAccessor);
+ binder.bind(OsFamily.class).toInstance(osFamily);
+ binder.bind(EntityManager.class).toInstance(entityManager);
+ binder.bind(Configuration.class).toInstance(configuration);
+ }
+ };
+
+ EntityManagerFactory emFactory = EasyMock.createNiceMock(EntityManagerFactory.class);
+ Cache emCache = EasyMock.createNiceMock(Cache.class);
+
+ expect(entityManager.getEntityManagerFactory()).andReturn(emFactory).atLeastOnce();
+ expect(emFactory.getCache()).andReturn(emCache).atLeastOnce();
+
+ EntityTransaction mockTransaction = EasyMock.createNiceMock(EntityTransaction.class);
+ Connection mockConnection = EasyMock.createNiceMock(Connection.class);
+ Statement mockStatement = EasyMock.createNiceMock(Statement.class);
+ expect(dbAccessor.getConnection()).andReturn(mockConnection).once();
+ expect(mockConnection.createStatement()).andReturn(mockStatement).once();
+
+ expect(mockStatement.executeQuery(EasyMock.anyString())).andReturn(
+ EasyMock.createNiceMock(ResultSet.class));
+
+ expect(entityManager.getTransaction()).andReturn(
+ mockTransaction).atLeastOnce();
+
+ dbAccessor.dropTable(UpgradeCatalog300.CLUSTER_CONFIG_MAPPING_TABLE);
+ EasyMock.expectLastCall().once();
+
+ replay(dbAccessor, entityManager, emFactory, emCache, mockConnection, mockTransaction,
+ mockStatement, configuration);
+
+ Injector injector = Guice.createInjector(module);
+ UpgradeCatalog300 upgradeCatalog300 = injector.getInstance(UpgradeCatalog300.class);
+ upgradeCatalog300.executePreDMLUpdates();
+
+ verify(dbAccessor, entityManager, emFactory, emCache);
+ }
}
[3/6] ambari git commit: Merge branch 'trunk' into
branch-feature-AMBARI-20053
Posted by jo...@apache.org.
Merge branch 'trunk' into branch-feature-AMBARI-20053
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e8e2df21
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e8e2df21
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e8e2df21
Branch: refs/heads/trunk
Commit: e8e2df21f7fe91fa8a028bb3043bed831093a090
Parents: f4638d2 a5dc2d2
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Fri Feb 17 16:29:16 2017 -0500
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Fri Feb 17 16:29:16 2017 -0500
----------------------------------------------------------------------
.../libraries/functions/constants.py | 2 +
.../functions/setup_ranger_plugin_xml.py | 23 +-
.../actionmanager/ActionDBAccessorImpl.java | 108 ++--
.../server/actionmanager/ActionScheduler.java | 31 +
.../ambari/server/actionmanager/Request.java | 8 +-
.../ambari/server/actionmanager/Stage.java | 25 +
.../checks/DatabaseConsistencyCheckHelper.java | 19 +
.../AmbariCustomCommandExecutionHelper.java | 8 +
.../controller/internal/CalculatedStatus.java | 390 +++++++++++-
.../ambari/server/events/TaskCreateEvent.java | 48 ++
.../apache/ambari/server/events/TaskEvent.java | 66 ++
.../ambari/server/events/TaskUpdateEvent.java | 35 ++
.../listeners/tasks/TaskStatusListener.java | 609 +++++++++++++++++++
.../events/publishers/TaskEventPublisher.java | 62 ++
.../server/orm/dao/HostRoleCommandDAO.java | 67 +-
.../ambari/server/orm/dao/RequestDAO.java | 8 +
.../apache/ambari/server/orm/dao/StageDAO.java | 32 +-
.../orm/entities/HostRoleCommandEntity.java | 4 +-
.../server/orm/entities/RequestEntity.java | 49 +-
.../ambari/server/orm/entities/StageEntity.java | 70 ++-
.../server/orm/entities/StageEntityPK.java | 12 +
.../ambari/server/state/ConfigHelper.java | 2 +
.../ambari/server/topology/HostRequest.java | 2 +-
.../server/upgrade/UpgradeCatalog300.java | 70 +++
.../main/resources/Ambari-DDL-Derby-CREATE.sql | 7 +-
.../main/resources/Ambari-DDL-MySQL-CREATE.sql | 7 +-
.../main/resources/Ambari-DDL-Oracle-CREATE.sql | 7 +-
.../resources/Ambari-DDL-Postgres-CREATE.sql | 7 +-
.../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 7 +-
.../resources/Ambari-DDL-SQLServer-CREATE.sql | 7 +-
.../RANGER/0.4.0/package/scripts/params.py | 18 +
.../0.4.0/package/scripts/setup_ranger_xml.py | 67 +-
.../0.5.0/configuration/ranger-admin-site.xml | 12 +
.../0.7.0/configuration/ranger-admin-site.xml | 31 +
.../0.5.0.2.3/configuration/kms-env.xml | 10 +
.../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py | 51 +-
.../0.5.0.2.3/package/scripts/params.py | 10 +
.../HDP/2.0.6/configuration/cluster-env.xml | 11 +
.../HDP/2.0.6/properties/stack_features.json | 10 +
.../stacks/HDP/2.3/upgrades/config-upgrade.xml | 7 +
.../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 4 +
.../stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 1 +
.../stacks/HDP/2.4/upgrades/config-upgrade.xml | 7 +
.../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 4 +
.../stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 1 +
.../stacks/HDP/2.5/upgrades/config-upgrade.xml | 7 +
.../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 13 +-
.../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 1 +
.../configuration/ranger-kms-site.xml | 68 +++
.../stacks/HDP/2.6/services/stack_advisor.py | 20 +-
.../actionmanager/TestActionDBAccessorImpl.java | 3 +-
.../actionmanager/TestActionScheduler.java | 71 ++-
.../alerts/AmbariPerformanceRunnableTest.java | 7 +-
.../internal/UpgradeResourceProviderTest.java | 1 -
.../UpgradeSummaryResourceProviderTest.java | 1 -
.../listeners/tasks/TaskStatusListenerTest.java | 164 +++++
.../ambari/server/state/ConfigHelperTest.java | 2 +
.../cluster/ClusterEffectiveVersionTest.java | 5 +-
.../services/RetryUpgradeActionServiceTest.java | 1 -
.../server/upgrade/UpgradeCatalog300Test.java | 20 +
.../stacks/2.3/ATLAS/test_metadata_server.py | 6 +-
.../stacks/2.5/RANGER/test_ranger_admin.py | 16 +-
.../stacks/2.5/RANGER/test_ranger_usersync.py | 8 +-
.../stacks/2.5/RANGER_KMS/test_kms_server.py | 70 ++-
.../stacks/2.6/RANGER/test_ranger_admin.py | 40 +-
.../stacks/2.6/RANGER/test_ranger_tagsync.py | 19 +-
.../stacks/2.6/common/test_stack_advisor.py | 69 +++
.../2.6/configs/ranger-admin-default.json | 6 +-
ambari-web/app/assets/test/tests.js | 1 +
.../controllers/main/service/info/configs.js | 35 +-
ambari-web/app/data/dashboard_widgets.js | 196 ++++++
ambari-web/app/messages.js | 2 +-
.../app/mixins/common/track_request_mixin.js | 11 +-
.../mixins/main/dashboard/widgets/editable.js | 91 +--
.../dashboard/widgets/editable_with_limit.js | 106 +---
.../widgets/single_numeric_threshold.js | 127 +---
.../common/configs/service_config_category.hbs | 4 +-
.../main/dashboard/edit_widget_popup.hbs | 20 +-
.../edit_widget_popup_single_threshold.hbs | 12 +-
ambari-web/app/views.js | 1 +
.../app/views/common/configs/controls_view.js | 2 +-
.../modal_popups/edit_dashboard_widget_popup.js | 436 +++++++++++++
ambari-web/app/views/main/dashboard/widget.js | 173 ++----
ambari-web/app/views/main/dashboard/widgets.js | 266 +-------
.../views/main/dashboard/widgets/text_widget.js | 23 +-
.../app/views/main/host/combo_search_box.js | 1 +
.../main/service/info/config_test.js | 45 ++
.../edit_dashboard_widget_popup_test.js | 214 +++++++
.../test/views/main/dashboard/widget_test.js | 112 +---
.../test/views/main/dashboard/widgets_test.js | 10 +-
.../views/main/host/combo_search_box_test.js | 6 +-
docs/pom.xml | 34 +-
92 files changed, 3577 insertions(+), 1005 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e8e2df21/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e8e2df21/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e8e2df21/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e8e2df21/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e8e2df21/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e8e2df21/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e8e2df21/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
----------------------------------------------------------------------
[2/6] ambari git commit: AMBARI-20054 - Remove Entities Associated
With clusterconfigmapping (jonathanhurley)
Posted by jo...@apache.org.
AMBARI-20054 - Remove Entities Associated With clusterconfigmapping (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f4638d24
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f4638d24
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f4638d24
Branch: refs/heads/trunk
Commit: f4638d24dd5f9d320392ef8b7b064c73c50f649c
Parents: 347ba2a
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Thu Feb 16 15:58:40 2017 -0500
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Fri Feb 17 08:07:19 2017 -0500
----------------------------------------------------------------------
.../checks/DatabaseConsistencyCheckHelper.java | 79 +----
.../controller/utilities/DatabaseChecker.java | 100 +++---
.../ambari/server/orm/dao/ClusterDAO.java | 136 ++------
.../orm/entities/ClusterConfigEntity.java | 125 ++++---
.../entities/ClusterConfigMappingEntity.java | 207 ------------
.../entities/ClusterConfigMappingEntityPK.java | 83 -----
.../server/orm/entities/ClusterEntity.java | 13 +-
.../orm/entities/ServiceConfigEntity.java | 2 +-
.../ambari/server/state/DesiredConfig.java | 20 --
.../apache/ambari/server/state/ServiceImpl.java | 33 +-
.../server/state/cluster/ClusterImpl.java | 238 ++++----------
.../ambari/server/state/host/HostImpl.java | 13 +-
.../main/resources/Ambari-DDL-Derby-CREATE.sql | 12 +-
.../main/resources/Ambari-DDL-MySQL-CREATE.sql | 12 +-
.../main/resources/Ambari-DDL-Oracle-CREATE.sql | 12 +-
.../resources/Ambari-DDL-Postgres-CREATE.sql | 12 +-
.../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 12 +-
.../resources/Ambari-DDL-SQLServer-CREATE.sql | 12 +-
.../DatabaseConsistencyCheckHelperTest.java | 56 +---
.../server/orm/dao/ServiceConfigDAOTest.java | 324 +++++++++----------
.../ambari/server/state/DesiredConfigTest.java | 2 -
.../server/state/cluster/ClusterTest.java | 323 ++++++++----------
.../server/state/cluster/ClustersTest.java | 7 +-
.../ambari/server/state/host/HostTest.java | 10 +-
24 files changed, 563 insertions(+), 1280 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4638d24/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
index 926ec65..79c5868 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
@@ -167,7 +167,6 @@ public class DatabaseConsistencyCheckHelper {
checkSchemaName();
checkMySQLEngine();
checkForConfigsNotMappedToService();
- checkForNotMappedConfigsToCluster();
checkForConfigsSelectedMoreThanOnce();
checkForHostsWithoutState();
checkHostComponentStates();
@@ -221,62 +220,21 @@ public class DatabaseConsistencyCheckHelper {
LOG.info("DB store version is compatible");
}
- static void checkForNotMappedConfigsToCluster() {
- LOG.info("Checking for configs not mapped to any cluster");
-
- String GET_NOT_MAPPED_CONFIGS_QUERY = "select type_name from clusterconfig where type_name not in (select type_name from clusterconfigmapping)";
- Set<String> nonSelectedConfigs = new HashSet<>();
- ResultSet rs = null;
- Statement statement = null;
-
- ensureConnection();
-
- try {
- statement = connection.createStatement(ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE);
- rs = statement.executeQuery(GET_NOT_MAPPED_CONFIGS_QUERY);
- if (rs != null) {
- while (rs.next()) {
- nonSelectedConfigs.add(rs.getString("type_name"));
- }
- }
- if (!nonSelectedConfigs.isEmpty()) {
- warning("You have config(s): {} that is(are) not mapped (in clusterconfigmapping table) to any cluster!",
- nonSelectedConfigs);
- }
- } catch (SQLException e) {
- LOG.error("Exception occurred during check for not mapped configs to cluster procedure: ", e);
- } finally {
- if (rs != null) {
- try {
- rs.close();
- } catch (SQLException e) {
- LOG.error("Exception occurred during result set closing procedure: ", e);
- }
- }
-
- if (statement != null) {
- try {
- statement.close();
- } catch (SQLException e) {
- LOG.error("Exception occurred during statement closing procedure: ", e);
- }
- }
- }
- }
-
/**
- * This method checks if any config type in clusterconfigmapping table, has
- * more than one versions selected. If config version is selected(in selected column = 1),
- * it means that this version of config is actual. So, if any config type has more
- * than one selected version it's a bug and we are showing error message for user.
- * */
+ * This method checks if any config type in clusterconfig table, has more than
+ * one versions selected. If config version is selected(in selected column =
+ * 1), it means that this version of config is actual. So, if any config type
+ * has more than one selected version it's a bug and we are showing error
+ * message for user.
+ */
static void checkForConfigsSelectedMoreThanOnce() {
- LOG.info("Checking for configs selected more than once");
+ LOG.info("Checking for more than 1 configuration of the same type being enabled.");
- String GET_CONFIGS_SELECTED_MORE_THAN_ONCE_QUERY = "select c.cluster_name, ccm.type_name from clusterconfigmapping ccm " +
- "join clusters c on ccm.cluster_id=c.cluster_id " +
- "group by c.cluster_name, ccm.type_name " +
+ String GET_CONFIGS_SELECTED_MORE_THAN_ONCE_QUERY = "select c.cluster_name, cc.type_name from clusterconfig cc "
+ + "join clusters c on cc.cluster_id=c.cluster_id "
+ + "group by c.cluster_name, cc.type_name " +
"having sum(selected) > 1";
+
Multimap<String, String> clusterConfigTypeMap = HashMultimap.create();
ResultSet rs = null;
Statement statement = null;
@@ -292,7 +250,7 @@ public class DatabaseConsistencyCheckHelper {
}
for (String clusterName : clusterConfigTypeMap.keySet()) {
- error("You have config(s), in cluster {}, that is(are) selected more than once in clusterconfigmapping table: {}",
+ error("You have config(s), in cluster {}, that is(are) selected more than once in clusterconfig table: {}",
clusterName ,StringUtils.join(clusterConfigTypeMap.get(clusterName), ","));
}
}
@@ -544,8 +502,6 @@ public class DatabaseConsistencyCheckHelper {
List<String> types = new ArrayList<>();
String type = clusterConfigEntity.getType();
types.add(type);
- LOG.error("Removing cluster config mapping of type {} that is not mapped to any service", type);
- clusterDAO.removeClusterConfigMappingEntityByTypes(clusterConfigEntity.getClusterId(),types);
LOG.error("Removing config that is not mapped to any service", clusterConfigEntity);
clusterDAO.removeConfig(clusterConfigEntity);
}
@@ -761,7 +717,7 @@ public class DatabaseConsistencyCheckHelper {
* 1) Check if we have services in cluster which doesn't have service config id(not available in serviceconfig table).
* 2) Check if service has no mapped configs to it's service config id.
* 3) Check if service has all required configs mapped to it.
- * 4) Check if service has config which is not selected(has no actual config version) in clusterconfigmapping table.
+ * 4) Check if service has config which is not selected(has no actual config version)
* If any issue was discovered, we are showing error message for user.
* */
static void checkServiceConfigs() {
@@ -786,11 +742,10 @@ public class DatabaseConsistencyCheckHelper {
"join serviceconfig sc on cs.service_name=sc.service_name and cs.cluster_id=sc.cluster_id " +
"join serviceconfigmapping scm on sc.service_config_id=scm.service_config_id " +
"join clusterconfig cc on scm.config_id=cc.config_id and cc.cluster_id=sc.cluster_id " +
- "join clusterconfigmapping ccm on cc.type_name=ccm.type_name and cc.version_tag=ccm.version_tag and cc.cluster_id=ccm.cluster_id " +
- "join clusters c on ccm.cluster_id=c.cluster_id " +
+ "join clusters c on cc.cluster_id=c.cluster_id " +
"where sc.group_id is null and sc.service_config_id = (select max(service_config_id) from serviceconfig sc2 where sc2.service_name=sc.service_name and sc2.cluster_id=sc.cluster_id) " +
"group by c.cluster_name, cs.service_name, cc.type_name " +
- "having sum(ccm.selected) < 1";
+ "having sum(cc.selected) < 1";
Multimap<String, String> clusterServiceMap = HashMultimap.create();
Map<String, Map<String, String>> clusterStackInfo = new HashMap<>();
Map<String, Multimap<String, String>> clusterServiceVersionMap = new HashMap<>();
@@ -945,8 +900,8 @@ public class DatabaseConsistencyCheckHelper {
}
}
- //getting services which has mapped configs which are not selected in clusterconfigmapping
- LOG.info("Getting services which has mapped configs which are not selected in clusterconfigmapping");
+ // getting services which has mapped configs which are not selected in clusterconfig
+ LOG.info("Getting services which has mapped configs which are not selected in clusterconfig");
rs = statement.executeQuery(GET_NOT_SELECTED_SERVICE_CONFIGS_QUERY);
if (rs != null) {
String serviceName = null, configType = null, clusterName = null;
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4638d24/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/DatabaseChecker.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/DatabaseChecker.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/DatabaseChecker.java
index d35fc1a..ab2fd14 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/DatabaseChecker.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/DatabaseChecker.java
@@ -32,7 +32,6 @@ import org.apache.ambari.server.configuration.Configuration;
import org.apache.ambari.server.orm.dao.ClusterDAO;
import org.apache.ambari.server.orm.dao.MetainfoDAO;
import org.apache.ambari.server.orm.entities.ClusterConfigEntity;
-import org.apache.ambari.server.orm.entities.ClusterConfigMappingEntity;
import org.apache.ambari.server.orm.entities.ClusterEntity;
import org.apache.ambari.server.orm.entities.ClusterServiceEntity;
import org.apache.ambari.server.orm.entities.ClusterStateEntity;
@@ -174,11 +173,14 @@ public class DatabaseChecker {
}
/**
- * Validates configuration consistency. Checks that every config type from stack is presented in
- * ClusterConfigMapping. Checks that for each config type exactly one is selected. Checks that ClusterConfig
- * contains type_names and tags from ClusterConfigMapping.
+ * Validates configuration consistency by ensuring that configuration types
+ * only have a single entry in {@link ClusterConfigEntity} which is enabled.
+ * Additionally will check to ensure that every installed service's
+ * configurations are present in the configuration table.
*
- * @throws AmbariException if check failed
+ * @throws AmbariException
+ * if check failed
+ * @see ClusterConfigEntity#isSelected()
*/
public static void checkDBConfigsConsistency() throws AmbariException {
LOG.info("Checking DB configs consistency");
@@ -193,57 +195,55 @@ public class DatabaseChecker {
List<ClusterEntity> clusters = clusterDAO.findAll();
if (clusters != null) {
for (ClusterEntity clusterEntity : clusters) {
- Collection<ClusterConfigMappingEntity> configMappingEntities = clusterEntity.getConfigMappingEntities();
Collection<ClusterConfigEntity> clusterConfigEntities = clusterEntity.getClusterConfigEntities();
+ if (null == clusterConfigEntities) {
+ return;
+ }
- if (configMappingEntities != null) {
- Map<String, Integer> selectedCountForType = new HashMap<>();
- for (ClusterConfigMappingEntity clusterConfigMappingEntity : configMappingEntities) {
- String typeName = clusterConfigMappingEntity.getType();
- if (clusterConfigMappingEntity.isSelected() > 0) {
- int selectedCount = selectedCountForType.get(typeName) != null ? selectedCountForType.get(typeName) : 0;
- selectedCountForType.put(typeName, selectedCount + 1);
-
- // Check that ClusterConfig contains type_name and tag from ClusterConfigMapping
- if (!clusterConfigsContainTypeAndTag(clusterConfigEntities, typeName, clusterConfigMappingEntity.getTag())) {
- checkPassed = false;
- LOG.error("ClusterConfig does not contain mapping for type_name=" + typeName + " tag="
- + clusterConfigMappingEntity.getTag());
- }
- } else {
- if (!selectedCountForType.containsKey(typeName)) {
- selectedCountForType.put(typeName, 0);
- }
+ Map<String, Integer> selectedCountForType = new HashMap<>();
+ for (ClusterConfigEntity configEntity : clusterConfigEntities) {
+ String typeName = configEntity.getType();
+ if (configEntity.isSelected()) {
+ int selectedCount = selectedCountForType.get(typeName) != null
+ ? selectedCountForType.get(typeName) : 0;
+ selectedCountForType.put(typeName, selectedCount + 1);
+ } else {
+ if (!selectedCountForType.containsKey(typeName)) {
+ selectedCountForType.put(typeName, 0);
}
}
+ }
- // Check that every config type from stack is presented in ClusterConfigMapping
- Collection<ClusterServiceEntity> clusterServiceEntities = clusterEntity.getClusterServiceEntities();
- ClusterStateEntity clusterStateEntity = clusterEntity.getClusterStateEntity();
- if (clusterStateEntity != null) {
- StackEntity currentStack = clusterStateEntity.getCurrentStack();
- StackInfo stack = ambariMetaInfo.getStack(currentStack.getStackName(), currentStack.getStackVersion());
-
- for (ClusterServiceEntity clusterServiceEntity : clusterServiceEntities) {
- if (!State.INIT.equals(clusterServiceEntity.getServiceDesiredStateEntity().getDesiredState())) {
- String serviceName = clusterServiceEntity.getServiceName();
- ServiceInfo serviceInfo = ambariMetaInfo.getService(stack.getName(), stack.getVersion(), serviceName);
- for (String configTypeName : serviceInfo.getConfigTypeAttributes().keySet()) {
- if (selectedCountForType.get(configTypeName) == null) {
+ // Check that every config type from stack is present
+ Collection<ClusterServiceEntity> clusterServiceEntities = clusterEntity.getClusterServiceEntities();
+ ClusterStateEntity clusterStateEntity = clusterEntity.getClusterStateEntity();
+ if (clusterStateEntity != null) {
+ StackEntity currentStack = clusterStateEntity.getCurrentStack();
+ StackInfo stack = ambariMetaInfo.getStack(currentStack.getStackName(),
+ currentStack.getStackVersion());
+
+ for (ClusterServiceEntity clusterServiceEntity : clusterServiceEntities) {
+ if (!State.INIT.equals(
+ clusterServiceEntity.getServiceDesiredStateEntity().getDesiredState())) {
+ String serviceName = clusterServiceEntity.getServiceName();
+ ServiceInfo serviceInfo = ambariMetaInfo.getService(stack.getName(),
+ stack.getVersion(), serviceName);
+
+ for (String configTypeName : serviceInfo.getConfigTypeAttributes().keySet()) {
+ if (selectedCountForType.get(configTypeName) == null) {
+ checkPassed = false;
+ LOG.error("Configuration {} is missing for service {}", configTypeName,
+ serviceName);
+ } else {
+ // Check that for each config type exactly one is selected
+ if (selectedCountForType.get(configTypeName) == 0) {
+ checkPassed = false;
+ LOG.error("Configuration {} has no enabled entries for service {}",
+ configTypeName, serviceName);
+ } else if (selectedCountForType.get(configTypeName) > 1) {
checkPassed = false;
- LOG.error("ClusterConfigMapping does not contain mapping for service=" + serviceName + " type_name="
- + configTypeName);
- } else {
- // Check that for each config type exactly one is selected
- if (selectedCountForType.get(configTypeName) == 0) {
- checkPassed = false;
- LOG.error("ClusterConfigMapping selected count is 0 for service=" + serviceName + " type_name="
- + configTypeName);
- } else if (selectedCountForType.get(configTypeName) > 1) {
- checkPassed = false;
- LOG.error("ClusterConfigMapping selected count is more than 1 for service=" + serviceName
- + " type_name=" + configTypeName);
- }
+ LOG.error("Configuration {} has more than 1 enabled entry for service {}",
+ configTypeName, serviceName);
}
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4638d24/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterDAO.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterDAO.java
index b727c72..3817570 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterDAO.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterDAO.java
@@ -30,7 +30,6 @@ import javax.persistence.criteria.Root;
import org.apache.ambari.server.orm.RequiresSession;
import org.apache.ambari.server.orm.entities.ClusterConfigEntity;
-import org.apache.ambari.server.orm.entities.ClusterConfigMappingEntity;
import org.apache.ambari.server.orm.entities.ClusterEntity;
import org.apache.ambari.server.orm.entities.StackEntity;
import org.apache.ambari.server.state.StackId;
@@ -116,9 +115,9 @@ public class ClusterDAO {
}
@RequiresSession
- public List<ClusterConfigEntity> getLatestClusterConfigsByTypes(Long clusterId, List<String> types) {
+ public List<ClusterConfigEntity> getEnabledConfigsByTypes(Long clusterId, Collection<String> types) {
TypedQuery<ClusterConfigEntity> query = entityManagerProvider.get().createNamedQuery(
- "ClusterConfigEntity.findLatestClusterConfigsByTypes",
+ "ClusterConfigEntity.findEnabledConfigsByTypes",
ClusterConfigEntity.class);
query.setParameter("clusterId", clusterId);
@@ -191,7 +190,9 @@ public class ClusterDAO {
/**
* Gets the latest configurations for a given stack for all of the
- * configurations of the specified cluster.
+ * configurations of the specified cluster. This method does not take into
+ * account the configuration being enabled, as the latest for a given stack
+ * may not be "selected".
*
* @param clusterId
* the cluster that the service is a part of.
@@ -226,14 +227,11 @@ public class ClusterDAO {
* @return the latest configurations for the specified cluster and stack.
*/
@RequiresSession
- public List<ClusterConfigMappingEntity> getClusterConfigMappingsByStack(long clusterId,
- StackId stackId) {
- StackEntity stackEntity = stackDAO.find(stackId.getStackName(),
- stackId.getStackVersion());
+ public List<ClusterConfigEntity> getEnabledConfigsByStack(long clusterId, StackId stackId) {
+ StackEntity stackEntity = stackDAO.find(stackId.getStackName(), stackId.getStackVersion());
- TypedQuery<ClusterConfigMappingEntity> query = entityManagerProvider.get().createNamedQuery(
- "ClusterConfigEntity.findClusterConfigMappingsByStack",
- ClusterConfigMappingEntity.class);
+ TypedQuery<ClusterConfigEntity> query = entityManagerProvider.get().createNamedQuery(
+ "ClusterConfigEntity.findEnabledConfigsByStack", ClusterConfigEntity.class);
query.setParameter("clusterId", clusterId);
query.setParameter("stack", stackEntity);
@@ -241,46 +239,26 @@ public class ClusterDAO {
return daoUtils.selectList(query);
}
- @RequiresSession
- public List<ClusterConfigMappingEntity> getClusterConfigMappingEntitiesByCluster(long clusterId) {
- TypedQuery<ClusterConfigMappingEntity> query = entityManagerProvider.get().createQuery(
- "SELECT mapping FROM ClusterConfigMappingEntity mapping " +
- "WHERE mapping.clusterId = :clusterId", ClusterConfigMappingEntity.class);
-
- query.setParameter("clusterId", clusterId);
-
- return daoUtils.selectList(query);
- }
-
- @RequiresSession
- public List<ClusterConfigMappingEntity> getLatestClusterConfigMappingsEntityByType(long clusterId, String configType) {
- TypedQuery<ClusterConfigMappingEntity> query = entityManagerProvider.get().createNamedQuery(
- "ClusterConfigMappingEntity.findLatestClusterConfigMappingsByType",
- ClusterConfigMappingEntity.class);
-
- query.setParameter("clusterId", clusterId);
- query.setParameter("typeName", configType);
-
- return daoUtils.selectList(query);
- }
-
/**
- * Gets selected mappings for provided config types
- * @param clusterId cluster id
- * @param types config types for mappings
- * @return
+ * Gets the latest config in the given cluster by type name. Only a config
+ * which is enabled can be returned.
+ *
+ * @param clusterId
+ * the ID of the cluster.
+ * @param type
+ * the config type (not {@code null}).
+ * @return a config, or {@code null} if there is none enabled.
*/
@RequiresSession
- public List<ClusterConfigMappingEntity> getSelectedConfigMappingByTypes(long clusterId, List<String> types) {
- TypedQuery<ClusterConfigMappingEntity> query = entityManagerProvider.get().createQuery(
- "SELECT mapping FROM ClusterConfigMappingEntity mapping " +
- "WHERE mapping.clusterId = :clusterId AND mapping.typeName IN :type " +
- "AND mapping.selectedInd > 0", ClusterConfigMappingEntity.class);
+ public ClusterConfigEntity findEnabledConfigByType(long clusterId, String type) {
+
+ TypedQuery<ClusterConfigEntity> query = entityManagerProvider.get().createNamedQuery(
+ "ClusterConfigEntity.findEnabledConfigByType", ClusterConfigEntity.class);
query.setParameter("clusterId", clusterId);
- query.setParameter("type", types);
+ query.setParameter("type", type);
- return daoUtils.selectList(query);
+ return daoUtils.selectOne(query);
}
/**
@@ -309,63 +287,6 @@ public class ClusterDAO {
}
/**
- * Bulk update config mappings in DB
- */
- @Transactional
- public void mergeConfigMappings(Collection<ClusterConfigMappingEntity> mappingEntities) {
- for (ClusterConfigMappingEntity mappingEntity : mappingEntities) {
- entityManagerProvider.get().merge(mappingEntity);
- }
- }
-
- /**
- * Update config mapping in DB
- */
- @Transactional
- public ClusterConfigMappingEntity mergeConfigMapping(ClusterConfigMappingEntity mappingEntity) {
- return entityManagerProvider.get().merge(mappingEntity);
- }
-
- /**
- * Create cluster config mapping in DB
- */
- @Transactional
- public void persistConfigMapping(ClusterConfigMappingEntity entity) {
- entityManagerProvider.get().persist(entity);
- }
-
- /**
- * Remove a cluster configuration mapping from the DB.
- */
- @Transactional
- public void removeConfigMapping(ClusterConfigMappingEntity entity) {
- entityManagerProvider.get().remove(entity);
- }
-
-
- /**
- * Sets selected = 0, for clusterConfigEntities which has type_name which is in the given types list
- *
- * @param clusterId
- * the cluster that the service is a part of.
- * @param types
- * the names of the configuration types.
- */
- @Transactional
- public void removeClusterConfigMappingEntityByTypes(Long clusterId, List<String> types) {
- if(types.isEmpty()) {
- return;
- }
-
- TypedQuery<Long> query = entityManagerProvider.get().createQuery
- ("DELETE FROM ClusterConfigMappingEntity configs WHERE configs" +
- ".clusterId=?1 AND configs.typeName IN ?2", Long.class);
-
- daoUtils.executeUpdate(query, clusterId, types);
- }
-
-
- /**
* Retrieve entity data from DB
*
* @param clusterEntity
@@ -413,6 +334,17 @@ public class ClusterDAO {
return clusterEntity;
}
+ /**
+ * Merge the specified entity into the current persistence context.
+ *
+ * @param clusterConfigEntity
+ * the entity to merge (not {@code null}).
+ * @return the managed entity which was merged (never {@code null}).
+ */
+ public ClusterConfigEntity merge(ClusterConfigEntity clusterConfigEntity) {
+ EntityManager entityManager = entityManagerProvider.get();
+ return entityManager.merge(clusterConfigEntity);
+ }
@Transactional
public void remove(ClusterEntity clusterEntity) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4638d24/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterConfigEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterConfigEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterConfigEntity.java
index d14e60e..876063d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterConfigEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterConfigEntity.java
@@ -19,6 +19,7 @@
package org.apache.ambari.server.orm.entities;
import java.util.Collection;
+import java.util.Objects;
import javax.persistence.Basic;
import javax.persistence.Column;
@@ -39,7 +40,7 @@ import javax.persistence.Table;
import javax.persistence.TableGenerator;
import javax.persistence.UniqueConstraint;
-import com.google.common.base.Objects;
+import org.apache.commons.lang.builder.EqualsBuilder;
@Entity
@Table(name = "clusterconfig",
@@ -51,20 +52,27 @@ import com.google.common.base.Objects;
, initialValue = 1
)
@NamedQueries({
- @NamedQuery(name = "ClusterConfigEntity.findNextConfigVersion", query = "SELECT COALESCE(MAX(clusterConfig.version),0) + 1 as nextVersion FROM ClusterConfigEntity clusterConfig WHERE clusterConfig.type=:configType AND clusterConfig.clusterId=:clusterId"),
- @NamedQuery(name = "ClusterConfigEntity.findAllConfigsByStack", query = "SELECT clusterConfig FROM ClusterConfigEntity clusterConfig WHERE clusterConfig.clusterId=:clusterId AND clusterConfig.stack=:stack"),
- @NamedQuery(name = "ClusterConfigEntity.findLatestConfigsByStack", query = "SELECT clusterConfig FROM ClusterConfigEntity clusterConfig WHERE clusterConfig.clusterId=:clusterId AND clusterConfig.timestamp = (SELECT MAX(clusterConfig2.timestamp) FROM ClusterConfigEntity clusterConfig2 WHERE clusterConfig2.clusterId=:clusterId AND clusterConfig2.stack=:stack AND clusterConfig2.type = clusterConfig.type)"),
- @NamedQuery(name = "ClusterConfigEntity.findNotMappedClusterConfigsToService", query = "SELECT clusterConfig FROM ClusterConfigEntity clusterConfig WHERE clusterConfig.serviceConfigEntities IS EMPTY AND clusterConfig.type != 'cluster-env'"),
- @NamedQuery(name = "ClusterConfigEntity.findClusterConfigMappingsByStack",
- query = "SELECT mapping FROM ClusterConfigMappingEntity mapping " +
- "JOIN ClusterConfigEntity config ON mapping.typeName = config.type AND mapping.tag = config.tag " +
- "WHERE mapping.clusterId = :clusterId AND config.stack = :stack"),
- @NamedQuery(name = "ClusterConfigEntity.findLatestClusterConfigsByTypes",
- query = "SELECT cc FROM ClusterConfigEntity cc " +
- "JOIN ClusterConfigMappingEntity ccm " +
- "ON cc.clusterId = ccm.clusterId AND cc.type = ccm.typeName AND cc.tag = ccm.tag " +
- "WHERE cc.clusterId = :clusterId AND ccm.selectedInd > 0 AND ccm.typeName IN :types")
-})
+ @NamedQuery(
+ name = "ClusterConfigEntity.findNextConfigVersion",
+ query = "SELECT COALESCE(MAX(clusterConfig.version),0) + 1 as nextVersion FROM ClusterConfigEntity clusterConfig WHERE clusterConfig.type=:configType AND clusterConfig.clusterId=:clusterId"),
+ @NamedQuery(
+ name = "ClusterConfigEntity.findAllConfigsByStack",
+ query = "SELECT clusterConfig FROM ClusterConfigEntity clusterConfig WHERE clusterConfig.clusterId=:clusterId AND clusterConfig.stack=:stack"),
+ @NamedQuery(
+ name = "ClusterConfigEntity.findLatestConfigsByStack",
+ query = "SELECT clusterConfig FROM ClusterConfigEntity clusterConfig WHERE clusterConfig.clusterId = :clusterId AND clusterConfig.stack = :stack AND clusterConfig.selectedTimestamp = (SELECT MAX(clusterConfig2.selectedTimestamp) FROM ClusterConfigEntity clusterConfig2 WHERE clusterConfig2.clusterId=:clusterId AND clusterConfig2.stack=:stack AND clusterConfig2.type = clusterConfig.type)"),
+ @NamedQuery(
+ name = "ClusterConfigEntity.findNotMappedClusterConfigsToService",
+ query = "SELECT clusterConfig FROM ClusterConfigEntity clusterConfig WHERE clusterConfig.serviceConfigEntities IS EMPTY AND clusterConfig.type != 'cluster-env'"),
+ @NamedQuery(
+ name = "ClusterConfigEntity.findEnabledConfigsByStack",
+ query = "SELECT config FROM ClusterConfigEntity config WHERE config.clusterId = :clusterId AND config.selected = 1 AND config.stack = :stack"),
+ @NamedQuery(
+ name = "ClusterConfigEntity.findEnabledConfigByType",
+ query = "SELECT config FROM ClusterConfigEntity config WHERE config.clusterId = :clusterId AND config.selected = 1 and config.type = :type"),
+ @NamedQuery(
+ name = "ClusterConfigEntity.findEnabledConfigsByTypes",
+ query = "SELECT config FROM ClusterConfigEntity config WHERE config.clusterId = :clusterId AND config.selected = 1 and config.type in :types") })
public class ClusterConfigEntity {
@@ -85,6 +93,9 @@ public class ClusterConfigEntity {
@Column(name = "version_tag")
private String tag;
+ @Column(name = "selected", insertable = true, updatable = true, nullable = false)
+ private int selected = 0;
+
@Basic(fetch = FetchType.LAZY)
@Column(name = "config_data", nullable = false, insertable = true)
@Lob
@@ -98,6 +109,16 @@ public class ClusterConfigEntity {
@Column(name = "create_timestamp", nullable = false, insertable = true, updatable = false)
private long timestamp;
+ /**
+ * The most recent time that this configuration was marked as
+ * {@link #selected}. This is useful when configruations are being reverted
+ * since a reversion does not create a new instance. Another configuration may
+ * technically be newer via its creation date ({@link #timestamp}), however
+ * that does not indicate it was the most recently enabled configuration.
+ */
+ @Column(name = "selected_timestamp", nullable = false, insertable = true, updatable = true)
+ private long selectedTimestamp = 0;
+
@ManyToOne
@JoinColumn(name = "cluster_id", referencedColumnName = "cluster_id", nullable = false)
private ClusterEntity clusterEntity;
@@ -171,6 +192,10 @@ public class ClusterConfigEntity {
timestamp = stamp;
}
+ public long getSelectedTimestamp() {
+ return selectedTimestamp;
+ }
+
public String getAttributes() {
return configAttributesJson;
}
@@ -198,51 +223,37 @@ public class ClusterConfigEntity {
this.stack = stack;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
- public boolean equals(Object o) {
- if (this == o) {
+ public boolean equals(Object object) {
+ if (this == object) {
return true;
}
- if (o == null || getClass() != o.getClass()) {
+ if (object == null || getClass() != object.getClass()) {
return false;
}
- ClusterConfigEntity that = (ClusterConfigEntity) o;
+ ClusterConfigEntity that = (ClusterConfigEntity) object;
+ EqualsBuilder equalsBuilder = new EqualsBuilder();
- if (configId != null ? !configId.equals(that.configId) : that.configId != null) {
- return false;
- }
-
- if (clusterId != null ? !clusterId.equals(that.clusterId) : that.clusterId != null) {
- return false;
- }
-
- if (type != null ? !type.equals(that.type) : that.type != null) {
- return false;
- }
-
- if (tag != null ? !tag.equals(that.tag) : that.tag != null) {
- return false;
- }
-
- if (stack != null ? !stack.equals(that.stack) : that.stack != null) {
- return false;
- }
-
- return true;
+ equalsBuilder.append(configId, that.configId);
+ equalsBuilder.append(clusterId, that.clusterId);
+ equalsBuilder.append(type, that.type);
+ equalsBuilder.append(tag, that.tag);
+ equalsBuilder.append(stack, that.stack);
+ return equalsBuilder.isEquals();
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public int hashCode() {
- int result = configId != null ? configId.hashCode() : 0;
- result = 31 * result + (clusterId != null ? clusterId.hashCode() : 0);
- result = 31 * result + (type != null ? type.hashCode() : 0);
- result = 31 * result + (tag != null ? tag.hashCode() : 0);
- result = 31 * result + (stack != null ? stack.hashCode() : 0);
-
- return result;
+ return Objects.hash(configId, clusterId, type, tag, stack);
}
public ClusterEntity getClusterEntity() {
@@ -275,12 +286,28 @@ public class ClusterConfigEntity {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return com.google.common.base.Objects.toStringHelper(this)
.add("clusterId", clusterId)
.add("type", type)
.add("version", version)
.add("tag", tag)
- .add("timestamp", timestamp)
+ .add("selected", selected == 1)
+ .add("selectedTimeStamp", selectedTimestamp)
+ .add("created", timestamp)
.toString();
}
+
+ public boolean isSelected() {
+ return selected == 1;
+ }
+
+ public void setSelected(boolean selected) {
+ this.selected = selected ? 1 : 0;
+
+ // if this config is being selected, then also update the selected timestamp
+ if (selected) {
+ selectedTimestamp = System.currentTimeMillis();
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4638d24/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterConfigMappingEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterConfigMappingEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterConfigMappingEntity.java
deleted file mode 100644
index 5748dc9..0000000
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterConfigMappingEntity.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * 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.orm.entities;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-
-import com.google.common.base.Objects;
-
-/**
- * Entity that maps to a cluster config mapping.
- */
-@Entity
-@Table(name = "clusterconfigmapping")
-@IdClass(ClusterConfigMappingEntityPK.class)
-@NamedQueries({ @NamedQuery(
- name = "ClusterConfigMappingEntity.findLatestClusterConfigMappingsByType",
- query = "SELECT mapping FROM ClusterConfigMappingEntity mapping WHERE mapping.clusterId = :clusterId AND mapping.selectedInd > 0 AND mapping.typeName = :typeName") })
-
-public class ClusterConfigMappingEntity {
-
- @Id
- @Column(name = "cluster_id", insertable = false, updatable = false, nullable = false)
- private Long clusterId;
-
- @Id
- @Column(name = "type_name", insertable = true, updatable = false, nullable = false)
- private String typeName;
-
- @Id
- @Column(name = "create_timestamp", insertable = true, updatable = false, nullable = false)
- private Long createTimestamp;
-
- @Column(name = "version_tag", insertable = true, updatable = false, nullable = false)
- private String tag;
-
- @Column(name = "selected", insertable = true, updatable = true, nullable = false)
- private int selectedInd = 0;
-
- @Column(name = "user_name", insertable = true, updatable = true, nullable = false)
- private String user;
-
- @ManyToOne
- @JoinColumn(name = "cluster_id", referencedColumnName = "cluster_id", nullable = false)
- private ClusterEntity clusterEntity;
-
- public Long getClusterId() {
- return clusterId;
- }
-
- public void setClusterId(Long id) {
- clusterId = id;
- }
-
- public String getType() {
- return typeName;
- }
-
- public void setType(String type) {
- typeName = type;
- }
-
- public Long getCreateTimestamp() {
- return createTimestamp;
- }
-
- public void setCreateTimestamp(Long timestamp) {
- createTimestamp = timestamp;
- }
-
- public String getTag() {
- return tag;
- }
-
- public void setTag(String version) {
- tag = version;
- }
-
- public int isSelected() {
- return selectedInd;
- }
-
- public void setSelected(int selected) {
- selectedInd = selected;
- }
-
- /**
- * @return the user
- */
- public String getUser() {
- return user;
- }
-
- /**
- * @param userName the user
- */
- public void setUser(String userName) {
- user = userName;
- }
-
- public ClusterEntity getClusterEntity() {
- return clusterEntity;
- }
-
- public void setClusterEntity(ClusterEntity entity) {
- clusterEntity = entity;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((clusterId == null) ? 0 : clusterId.hashCode());
- result = prime * result + ((createTimestamp == null) ? 0 : createTimestamp.hashCode());
- result = prime * result + ((tag == null) ? 0 : tag.hashCode());
- result = prime * result + ((typeName == null) ? 0 : typeName.hashCode());
- return result;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
-
- if (obj == null) {
- return false;
- }
-
- if (getClass() != obj.getClass()) {
- return false;
- }
-
- ClusterConfigMappingEntity other = (ClusterConfigMappingEntity) obj;
- if (clusterId == null) {
- if (other.clusterId != null) {
- return false;
- }
- } else if (!clusterId.equals(other.clusterId)) {
- return false;
- }
-
- if (createTimestamp == null) {
- if (other.createTimestamp != null) {
- return false;
- }
- } else if (!createTimestamp.equals(other.createTimestamp)) {
- return false;
- }
-
- if (tag == null) {
- if (other.tag != null) {
- return false;
- }
- } else if (!tag.equals(other.tag)) {
- return false;
- }
-
- if (typeName == null) {
- if (other.typeName != null) {
- return false;
- }
- } else if (!typeName.equals(other.typeName)) {
- return false;
- }
-
- return true;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String toString() {
- return Objects.toStringHelper(this).add("clusterId", clusterId).add("type", typeName).add("tag",
- tag).add("selected", selectedInd).add("created", createTimestamp).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4638d24/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterConfigMappingEntityPK.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterConfigMappingEntityPK.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterConfigMappingEntityPK.java
deleted file mode 100644
index e5ba5af..0000000
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterConfigMappingEntityPK.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * 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.orm.entities;
-
-import javax.persistence.Column;
-import javax.persistence.Id;
-
-/**
- * PK class for cluster config mappings.
- */
-public class ClusterConfigMappingEntityPK {
- private Long clusterId;
- private String typeName;
- private Long createTimestamp;
-
- @Id
- @Column(name = "cluster_id", nullable = false, insertable = true, updatable = true, length = 10)
- public Long getClusterId() {
- return clusterId;
- }
-
- public void setClusterId(Long clusterId) {
- this.clusterId = clusterId;
- }
-
- @Id
- @Column(name = "type_name", nullable = false, insertable = true, updatable = false)
- public String getType() {
- return typeName;
- }
-
- public void setType(String type) {
- typeName = type;
- }
-
- @Id
- @Column(name = "create_timestamp", nullable = false, insertable = true, updatable = false)
- public Long getCreateTimestamp() {
- return createTimestamp;
- }
-
- public void setCreateTimestamp(Long timestamp) {
- createTimestamp = timestamp;
- }
-
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- ClusterConfigMappingEntityPK that = (ClusterConfigMappingEntityPK) o;
-
- if (clusterId != null ? !clusterId.equals(that.clusterId) : that.clusterId != null) return false;
- if (typeName != null ? !typeName.equals(that.typeName) : that.typeName != null) return false;
- if (createTimestamp != null ? !createTimestamp.equals (that.createTimestamp) : that.createTimestamp != null) return false;
-
- return true;
- }
-
- @Override
- public int hashCode() {
- int result = clusterId !=null ? clusterId.intValue() : 0;
- result = 31 * result + (typeName != null ? typeName.hashCode() : 0);
- result = 31 * result + createTimestamp.intValue();
- return result;
- }
-}
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4638d24/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterEntity.java
index 2e0a15d..89b0646 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterEntity.java
@@ -115,9 +115,6 @@ public class ClusterEntity {
@OneToMany(mappedBy = "clusterEntity", cascade = CascadeType.ALL)
private Collection<ClusterConfigEntity> configEntities;
- @OneToMany(mappedBy = "clusterEntity", cascade = CascadeType.REMOVE)
- private Collection<ClusterConfigMappingEntity> configMappingEntities;
-
@OneToMany(mappedBy = "clusterEntity", cascade = CascadeType.ALL)
private Collection<ConfigGroupEntity> configGroupEntities;
@@ -292,14 +289,6 @@ public class ClusterEntity {
configEntities = entities;
}
- public Collection<ClusterConfigMappingEntity> getConfigMappingEntities() {
- return configMappingEntities;
- }
-
- public void setConfigMappingEntities(Collection<ClusterConfigMappingEntity> entities) {
- configMappingEntities = entities;
- }
-
public Collection<ConfigGroupEntity> getConfigGroupEntities() {
return configGroupEntities;
}
@@ -336,7 +325,7 @@ public class ClusterEntity {
public void addClusterVersionEntity(ClusterVersionEntity clusterVersionEntity) {
if (clusterVersionEntities == null) {
- clusterVersionEntities = new ArrayList<ClusterVersionEntity>();
+ clusterVersionEntities = new ArrayList<>();
}
clusterVersionEntities.add(clusterVersionEntity);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4638d24/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceConfigEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceConfigEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceConfigEntity.java
index dae7ef8..a7ee0f6 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceConfigEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceConfigEntity.java
@@ -96,12 +96,12 @@ public class ServiceConfigEntity {
* the contract of configs being associated with only the cluster and the
* same config can technically belong to multiple serviceConfig versions.
*/
+ @ManyToMany
@JoinTable(
name = "serviceconfigmapping",
joinColumns = {@JoinColumn(name = "service_config_id", referencedColumnName = "service_config_id")},
inverseJoinColumns = {@JoinColumn(name = "config_id", referencedColumnName = "config_id")}
)
- @ManyToMany
private List<ClusterConfigEntity> clusterConfigEntities;
@ManyToOne
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4638d24/ambari-server/src/main/java/org/apache/ambari/server/state/DesiredConfig.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/DesiredConfig.java b/ambari-server/src/main/java/org/apache/ambari/server/state/DesiredConfig.java
index 80d05f7..f133078 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/DesiredConfig.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/DesiredConfig.java
@@ -34,7 +34,6 @@ public class DesiredConfig {
private String tag;
private String serviceName;
- private String user;
private Long version;
private List<HostOverride> hostOverrides = new ArrayList<HostOverride>();
@@ -80,23 +79,6 @@ public class DesiredConfig {
public void setHostOverrides(List<HostOverride> overrides) {
hostOverrides = overrides;
}
-
- /**
- * Gets the user that set the desired config.
- */
- @JsonSerialize(include = Inclusion.NON_EMPTY)
- public String getUser() {
- return user;
- }
-
- /**
- * Sets the user that set the desired config.
- * @param userName the username
- */
- public void setUser(String userName) {
- user = userName;
- }
-
/**
* Gets the host overrides for the desired config. Cluster-based desired configs only.
@@ -208,7 +190,6 @@ public class DesiredConfig {
return new EqualsBuilder()
.append(tag, that.tag)
.append(serviceName, that.serviceName)
- .append(user, that.user)
.append(version, that.version)
.append(hostOverrides, that.hostOverrides)
.isEquals();
@@ -219,7 +200,6 @@ public class DesiredConfig {
return new HashCodeBuilder(17, 37)
.append(tag)
.append(serviceName)
- .append(user)
.append(version)
.append(hostOverrides)
.toHashCode();
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4638d24/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java
index 713c189..9ef32b5 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java
@@ -18,7 +18,6 @@
package org.apache.ambari.server.state;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -41,7 +40,6 @@ import org.apache.ambari.server.orm.dao.ServiceConfigDAO;
import org.apache.ambari.server.orm.dao.ServiceDesiredStateDAO;
import org.apache.ambari.server.orm.dao.StackDAO;
import org.apache.ambari.server.orm.entities.ClusterConfigEntity;
-import org.apache.ambari.server.orm.entities.ClusterConfigMappingEntity;
import org.apache.ambari.server.orm.entities.ClusterEntity;
import org.apache.ambari.server.orm.entities.ClusterServiceEntity;
import org.apache.ambari.server.orm.entities.ClusterServiceEntityPK;
@@ -192,7 +190,7 @@ public class ServiceImpl implements Service {
@Override
public Map<String, ServiceComponent> getServiceComponents() {
- return new HashMap<String, ServiceComponent>(components);
+ return new HashMap<>(components);
}
@Override
@@ -461,30 +459,19 @@ public class ServiceImpl implements Service {
@Transactional
void deleteAllServiceConfigs() throws AmbariException {
- ArrayList<String> serviceConfigTypes = new ArrayList<>();
- ServiceConfigEntity lastServiceConfigEntity = serviceConfigDAO.findMaxVersion(getClusterId(), getName());
- //ensure service config version exist
- if (lastServiceConfigEntity != null) {
- for (ClusterConfigEntity configEntity : lastServiceConfigEntity.getClusterConfigEntities()) {
- serviceConfigTypes.add(configEntity.getType());
- }
-
- LOG.info("Deselecting config mapping for cluster, clusterId={}, configTypes={} ",
- getClusterId(), serviceConfigTypes);
+ long clusterId = getClusterId();
+ ServiceConfigEntity lastServiceConfigEntity = serviceConfigDAO.findMaxVersion(clusterId, getName());
- List<ClusterConfigMappingEntity> configMappingEntities =
- clusterDAO.getSelectedConfigMappingByTypes(getClusterId(), serviceConfigTypes);
-
- for (ClusterConfigMappingEntity configMappingEntity : configMappingEntities) {
- configMappingEntity.setSelected(0);
+ // de-select every configuration from the service
+ if (lastServiceConfigEntity != null) {
+ for (ClusterConfigEntity serviceConfigEntity : lastServiceConfigEntity.getClusterConfigEntities()) {
+ LOG.info("Disabling configuration {}", serviceConfigEntity);
+ serviceConfigEntity.setSelected(false);
+ clusterDAO.merge(serviceConfigEntity);
}
-
- clusterDAO.mergeConfigMappings(configMappingEntities);
}
- LOG.info("Deleting all serviceconfigs for service"
- + ", clusterName=" + cluster.getClusterName()
- + ", serviceName=" + getName());
+ LOG.info("Deleting all configuration associations for {} on cluster {}", getName(), cluster.getClusterName());
List<ServiceConfigEntity> serviceConfigEntities =
serviceConfigDAO.findByService(cluster.getClusterId(), getName());
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4638d24/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
index db4aa21..90c44ff 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
@@ -89,7 +89,6 @@ import org.apache.ambari.server.orm.dao.StackDAO;
import org.apache.ambari.server.orm.dao.TopologyRequestDAO;
import org.apache.ambari.server.orm.dao.UpgradeDAO;
import org.apache.ambari.server.orm.entities.ClusterConfigEntity;
-import org.apache.ambari.server.orm.entities.ClusterConfigMappingEntity;
import org.apache.ambari.server.orm.entities.ClusterEntity;
import org.apache.ambari.server.orm.entities.ClusterServiceEntity;
import org.apache.ambari.server.orm.entities.ClusterStateEntity;
@@ -2187,40 +2186,39 @@ public class ClusterImpl implements Cluster {
try {
Map<String, Set<DesiredConfig>> map = new HashMap<>();
Collection<String> types = new HashSet<>();
- Collection<ClusterConfigMappingEntity> entities = getClusterEntity().getConfigMappingEntities();
-
- for (ClusterConfigMappingEntity e : entities) {
- if (allVersions || e.isSelected() > 0) {
- DesiredConfig c = new DesiredConfig();
- c.setServiceName(null);
- c.setTag(e.getTag());
- c.setUser(e.getUser());
- if(!allConfigs.containsKey(e.getType())) {
- LOG.error("Config inconsistency exists:" +
- " unknown configType=" + e.getType());
+ Collection<ClusterConfigEntity> entities = getClusterEntity().getClusterConfigEntities();
+
+ for (ClusterConfigEntity configEntity : entities) {
+ if (allVersions || configEntity.isSelected()) {
+ DesiredConfig desiredConfig = new DesiredConfig();
+ desiredConfig.setServiceName(null);
+ desiredConfig.setTag(configEntity.getTag());
+
+ if (!allConfigs.containsKey(configEntity.getType())) {
+ LOG.error("An inconsistency exists for configuration {}", configEntity.getType());
continue;
}
- Map<String, Config> configMap = allConfigs.get(e.getType());
- if(!configMap.containsKey(e.getTag())) {
- LOG.debug("Config inconsistency exists for typeName=" +
- e.getType() +
- ", unknown versionTag=" + e.getTag());
+ Map<String, Config> configMap = allConfigs.get(configEntity.getType());
+ if(!configMap.containsKey(configEntity.getTag())) {
+ LOG.error("An inconsistency exists for the configuration {} with tag {}",
+ configEntity.getType(), configEntity.getTag());
+
continue;
}
- Config config = configMap.get(e.getTag());
- c.setVersion(config.getVersion());
+ Config config = configMap.get(configEntity.getTag());
+ desiredConfig.setVersion(config.getVersion());
- Set<DesiredConfig> configs = map.get(e.getType());
+ Set<DesiredConfig> configs = map.get(configEntity.getType());
if (configs == null) {
configs = new HashSet<>();
}
- configs.add(c);
+ configs.add(desiredConfig);
- map.put(e.getType(), configs);
- types.add(e.getType());
+ map.put(configEntity.getType(), configs);
+ types.add(configEntity.getType());
}
}
@@ -2557,18 +2555,18 @@ public class ClusterImpl implements Cluster {
throw new ObjectNotFoundException("Service config version with serviceName={} and version={} not found");
}
- //disable all configs related to service
+ // disable all configs related to service
if (serviceConfigEntity.getGroupId() == null) {
Collection<String> configTypes = serviceConfigTypes.get(serviceName);
- List<ClusterConfigMappingEntity> mappingEntities =
- clusterDAO.getSelectedConfigMappingByTypes(getClusterId(), new ArrayList<>(configTypes));
- for (ClusterConfigMappingEntity entity : mappingEntities) {
- entity.setSelected(0);
- clusterDAO.mergeConfigMapping(entity);
+ List<ClusterConfigEntity> enabledConfigs = clusterDAO.getEnabledConfigsByTypes(clusterId, configTypes);
+ for (ClusterConfigEntity enabledConfig : enabledConfigs) {
+ enabledConfig.setSelected(false);
+ clusterDAO.merge(enabledConfig);
}
for (ClusterConfigEntity configEntity : serviceConfigEntity.getClusterConfigEntities()) {
- selectConfig(configEntity.getType(), configEntity.getTag(), user);
+ configEntity.setSelected(true);
+ clusterDAO.merge(configEntity);
}
} else {
Long configGroupId = serviceConfigEntity.getGroupId();
@@ -2621,32 +2619,6 @@ public class ClusterImpl implements Cluster {
}
@Transactional
- void selectConfig(String type, String tag, String user) {
- Collection<ClusterConfigMappingEntity> entities =
- clusterDAO.getLatestClusterConfigMappingsEntityByType(getClusterId(), type);
-
- //disable previous config
- for (ClusterConfigMappingEntity e : entities) {
- e.setSelected(0);
- clusterDAO.mergeConfigMapping(e);
- }
-
- ClusterEntity clusterEntity = getClusterEntity();
- ClusterConfigMappingEntity entity = new ClusterConfigMappingEntity();
- entity.setClusterEntity(clusterEntity);
- entity.setClusterId(clusterEntity.getClusterId());
- entity.setCreateTimestamp(System.currentTimeMillis());
- entity.setSelected(1);
- entity.setUser(user);
- entity.setType(type);
- entity.setTag(tag);
- clusterDAO.persistConfigMapping(entity);
-
- clusterEntity.getConfigMappingEntities().add(entity);
- clusterDAO.merge(clusterEntity);
- }
-
- @Transactional
ServiceConfigVersionResponse applyConfigs(Set<Config> configs, String user, String serviceConfigVersionNote) {
String serviceName = null;
@@ -2670,10 +2642,25 @@ public class ClusterImpl implements Cluster {
}
}
+ // update the selected flag for every config type
+ ClusterEntity clusterEntity = getClusterEntity();
+ Collection<ClusterConfigEntity> clusterConfigs = clusterEntity.getClusterConfigEntities();
for (Config config: configs) {
- selectConfig(config.getType(), config.getTag(), user);
+ for (ClusterConfigEntity clusterConfigEntity : clusterConfigs) {
+ // unset for this config type
+ if (StringUtils.equals(clusterConfigEntity.getType(), config.getType())) {
+ clusterConfigEntity.setSelected(false);
+
+ // unless both the tag and type match, then enable it
+ if (StringUtils.equals(clusterConfigEntity.getTag(), config.getTag())) {
+ clusterConfigEntity.setSelected(true);
+ }
+ }
+ }
}
+ clusterEntity = clusterDAO.merge(clusterEntity);
+
if (serviceName == null) {
ArrayList<String> configTypes = new ArrayList<>();
for (Config config: configs) {
@@ -2695,29 +2682,23 @@ public class ClusterImpl implements Cluster {
private List<ClusterConfigEntity> getClusterConfigEntitiesByService(String serviceName) {
Collection<String> configTypes = serviceConfigTypes.get(serviceName);
- return clusterDAO.getLatestClusterConfigsByTypes(getClusterId(), new ArrayList<>(configTypes));
+ return clusterDAO.getEnabledConfigsByTypes(getClusterId(), new ArrayList<>(configTypes));
}
@Override
public Config getDesiredConfigByType(String configType) {
- List<ClusterConfigMappingEntity> entities = clusterDAO.getLatestClusterConfigMappingsEntityByType(getClusterId(), configType);
- if (!entities.isEmpty()) {
- return getConfig(configType, entities.get(0).getTag());
+ ClusterConfigEntity config = clusterDAO.findEnabledConfigByType(getClusterId(), configType);
+ if (null == config) {
+ return null;
}
- return null;
+ return getConfig(configType, config.getTag());
}
@Override
public boolean isConfigTypeExists(String configType) {
- for (ClusterConfigMappingEntity e : clusterDAO.getClusterConfigMappingEntitiesByCluster(
- getClusterId())) {
- if (e.getType().equals(configType)) {
- return true;
- }
- }
-
- return false;
+ ClusterConfigEntity config = clusterDAO.findEnabledConfigByType(getClusterId(), configType);
+ return null != config;
}
@Override
@@ -2740,7 +2721,6 @@ public class ClusterImpl implements Cluster {
DesiredConfig desiredConfig = new DesiredConfig();
desiredConfig.setTag(mappingEntity.getVersion());
desiredConfig.setServiceName(mappingEntity.getServiceName());
- desiredConfig.setUser(mappingEntity.getUser());
desiredConfigsByHost.get(mappingEntity.getHostId()).put(mappingEntity.getType(), desiredConfig);
}
@@ -3102,38 +3082,37 @@ public class ClusterImpl implements Cluster {
try {
ClusterEntity clusterEntity = getClusterEntity();
- Collection<ClusterConfigMappingEntity> configMappingEntities = clusterEntity.getConfigMappingEntities();
+ Collection<ClusterConfigEntity> configEntities = clusterEntity.getClusterConfigEntities();
- // hash them for easier retrieval later - these are the same entity
- // instances which exist on the cluster entity, so modification of the CCM
- // entity here will affect the cluster CCM entities as well
- ImmutableMap<Object, ClusterConfigMappingEntity> ccmMap = Maps.uniqueIndex(configMappingEntities, Functions.identity());
+ // hash them for easier retrieval later
+ ImmutableMap<Object, ClusterConfigEntity> clusterConfigEntityMap = Maps.uniqueIndex(
+ configEntities, Functions.identity());
// disable all configs
- for (ClusterConfigMappingEntity e : configMappingEntities) {
- LOG.debug("{} with tag {} is unselected", e.getType(), e.getTag());
- e.setSelected(0);
+ for (ClusterConfigEntity e : configEntities) {
+ LOG.debug("Disabling configuration {} with tag {}", e.getType(), e.getTag());
+ e.setSelected(false);
}
// work through the in-memory list, finding only the most recent mapping per type
- Collection<ClusterConfigMappingEntity> latestConfigMappingByStack = getLatestConfigMappingsForStack(
- clusterEntity.getClusterId(), stackId);
+ Collection<ClusterConfigEntity> latestConfigsByStack = clusterDAO.getLatestConfigurations(
+ clusterId, stackId);
- for( ClusterConfigMappingEntity latestConfigMapping : latestConfigMappingByStack ){
- ClusterConfigMappingEntity mapping = ccmMap.get(latestConfigMapping);
- mapping.setSelected(1);
+ // pull the correct latest mapping for the stack out of the cached map
+ // from the cluster entity
+ for (ClusterConfigEntity latestConfigByStack : latestConfigsByStack) {
+ ClusterConfigEntity entity = clusterConfigEntityMap.get(latestConfigByStack);
+ entity.setSelected(true);
- LOG.info("Settting {} with version tag {} created on {} to selected for stack {}",
- mapping.getType(), mapping.getTag(), new Date(mapping.getCreateTimestamp()),
+ LOG.info("Setting {} with version tag {} created on {} to selected for stack {}",
+ entity.getType(), entity.getTag(), new Date(entity.getTimestamp()),
stackId.toString());
}
// since the entities which were modified came from the cluster entity's
// list to begin with, we can just save them right back - no need for a
- // new collection since the CCM entity instances were modified directly
- clusterEntity.setConfigMappingEntities(configMappingEntities);
+ // new collection since the entity instances were modified directly
clusterEntity = clusterDAO.merge(clusterEntity);
- clusterDAO.mergeConfigMappings(configMappingEntities);
cacheConfigurations();
} finally {
@@ -3153,62 +3132,6 @@ public class ClusterImpl implements Cluster {
}
/**
- * Retrieves all of the configuration mappings (selected and unselected) for
- * the specified stack and then iterates through them, returning the most
- * recent mapping for every type/tag combination.
- * <p/>
- * Because of how configuration revert works, mappings can be created for the
- * same type/tag combinations. The only difference being that the timestamp
- * reflects when each mapping was created.
- * <p/>
- * JPQL cannot be used directly here easily because some databases cannot
- * support the necessary grouping and IN clause. For example: <br/>
- *
- * <pre>
- * SELECT mapping FROM clusterconfigmappingentity mapping
- * WHERE (mapping.typename, mapping.createtimestamp) IN
- * (SELECT latest.typename, MAX(latest.createtimestamp)
- * FROM clusterconfigmappingentity latest
- * GROUP BY latest.typename)
- * </pre>
- *
- * @param clusterId
- * the cluster ID
- * @param stackId
- * the stack to retrieve the mappings for (not {@code null}).
- * @return the most recent mapping (selected or unselected) for the specified
- * stack for every type.
- */
- public Collection<ClusterConfigMappingEntity> getLatestConfigMappingsForStack(long clusterId,
- StackId stackId) {
-
- // get all mappings for the specified stack (which could include
- // duplicates since a config revert creates a duplicate mapping with a
- // different timestamp)
- List<ClusterConfigMappingEntity> clusterConfigMappingsForStack = clusterDAO.getClusterConfigMappingsByStack(
- clusterId, stackId);
-
- Map<String, ClusterConfigMappingEntity> latestMappingsByType = new HashMap<>();
- for (ClusterConfigMappingEntity mapping : clusterConfigMappingsForStack) {
- String type = mapping.getType();
-
- if (!latestMappingsByType.containsKey(type)) {
- latestMappingsByType.put(type, mapping);
- continue;
- }
-
- ClusterConfigMappingEntity entityStored = latestMappingsByType.get(type);
- Long timestampStored = entityStored.getCreateTimestamp();
- Long timestamp = mapping.getCreateTimestamp();
- if (timestamp > timestampStored) {
- latestMappingsByType.put(type, mapping);
- }
- }
-
- return latestMappingsByType.values();
- }
-
- /**
* {@inheritDoc}
*/
@Override
@@ -3275,31 +3198,6 @@ public class ClusterImpl implements Cluster {
clusterEntity.setClusterConfigEntities(clusterConfigEntities);
clusterEntity = clusterDAO.merge(clusterEntity);
-
- // remove config mappings
- Collection<ClusterConfigMappingEntity> configMappingEntities =
- clusterDAO.getClusterConfigMappingEntitiesByCluster(getClusterId());
-
- for (ClusterConfigEntity removedClusterConfig : removedClusterConfigs) {
- String removedClusterConfigType = removedClusterConfig.getType();
- String removedClusterConfigTag = removedClusterConfig.getTag();
-
- Iterator<ClusterConfigMappingEntity> clusterConfigMappingIterator = configMappingEntities.iterator();
- while (clusterConfigMappingIterator.hasNext()) {
- ClusterConfigMappingEntity clusterConfigMapping = clusterConfigMappingIterator.next();
- String mappingType = clusterConfigMapping.getType();
- String mappingTag = clusterConfigMapping.getTag();
-
- if (removedClusterConfigTag.equals(mappingTag)
- && removedClusterConfigType.equals(mappingType)) {
- clusterConfigMappingIterator.remove();
- clusterDAO.removeConfigMapping(clusterConfigMapping);
- }
- }
- }
-
- clusterEntity.setConfigMappingEntities(configMappingEntities);
- clusterEntity = clusterDAO.merge(clusterEntity);
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4638d24/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
index 328fe22..db228b1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
@@ -148,7 +148,7 @@ public class HostImpl implements Host {
private long lastHeartbeatTime = 0L;
private AgentEnv lastAgentEnv = null;
- private List<DiskInfo> disksInfo = new CopyOnWriteArrayList<DiskInfo>();
+ private List<DiskInfo> disksInfo = new CopyOnWriteArrayList<>();
private RecoveryReport recoveryReport = new RecoveryReport();
private Integer currentPingPort = null;
@@ -481,7 +481,7 @@ public class HostImpl implements Host {
// FIXME add all other information into host attributes
setAgentVersion(new AgentVersion(hostInfo.getAgentUserId()));
- Map<String, String> attrs = new HashMap<String, String>();
+ Map<String, String> attrs = new HashMap<>();
if (hostInfo.getHardwareIsa() != null) {
attrs.put(HARDWAREISA, hostInfo.getHardwareIsa());
}
@@ -828,7 +828,7 @@ public class HostImpl implements Host {
Map<String, String> hostAttrs = gson.fromJson(hostEntity.getHostAttributes(), hostAttributesType);
if (hostAttrs == null) {
- hostAttrs = new ConcurrentHashMap<String, String>();
+ hostAttrs = new ConcurrentHashMap<>();
}
hostAttrs.putAll(hostAttributes);
@@ -1024,7 +1024,7 @@ public class HostImpl implements Host {
@Override
public Map<String, DesiredConfig> getDesiredConfigs(long clusterId) {
- Map<String, DesiredConfig> map = new HashMap<String, DesiredConfig>();
+ Map<String, DesiredConfig> map = new HashMap<>();
for (HostConfigMapping e : hostConfigMappingDAO.findSelected(
clusterId, getHostId())) {
@@ -1032,7 +1032,6 @@ public class HostImpl implements Host {
DesiredConfig dc = new DesiredConfig();
dc.setTag(e.getVersion());
dc.setServiceName(e.getServiceName());
- dc.setUser(e.getUser());
map.put(e.getType(), dc);
}
@@ -1045,10 +1044,10 @@ public class HostImpl implements Host {
@Override
public Map<String, HostConfig> getDesiredHostConfigs(Cluster cluster,
Map<String, DesiredConfig> clusterDesiredConfigs) throws AmbariException {
- Map<String, HostConfig> hostConfigMap = new HashMap<String, HostConfig>();
+ Map<String, HostConfig> hostConfigMap = new HashMap<>();
if( null == cluster ){
- clusterDesiredConfigs = new HashMap<String, DesiredConfig>();
+ clusterDesiredConfigs = new HashMap<>();
}
// per method contract, fetch if not supplied
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4638d24/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
index f007b53..840433f 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
@@ -72,25 +72,17 @@ CREATE TABLE clusterconfig (
type_name VARCHAR(255) NOT NULL,
cluster_id BIGINT NOT NULL,
stack_id BIGINT NOT NULL,
+ selected SMALLINT NOT NULL DEFAULT 0,
config_data VARCHAR(3000) NOT NULL,
config_attributes VARCHAR(3000),
create_timestamp BIGINT NOT NULL,
+ selected_timestamp BIGINT NOT NULL DEFAULT 0,
CONSTRAINT PK_clusterconfig PRIMARY KEY (config_id),
CONSTRAINT FK_clusterconfig_cluster_id FOREIGN KEY (cluster_id) REFERENCES clusters (cluster_id),
CONSTRAINT FK_clusterconfig_stack_id FOREIGN KEY (stack_id) REFERENCES stack(stack_id),
CONSTRAINT UQ_config_type_tag UNIQUE (version_tag, type_name, cluster_id),
CONSTRAINT UQ_config_type_version UNIQUE (cluster_id, type_name, version));
-CREATE TABLE clusterconfigmapping (
- cluster_id BIGINT NOT NULL,
- type_name VARCHAR(255) NOT NULL,
- version_tag VARCHAR(255) NOT NULL,
- create_timestamp BIGINT NOT NULL,
- selected INTEGER NOT NULL DEFAULT 0,
- user_name VARCHAR(255) NOT NULL DEFAULT '_db',
- CONSTRAINT PK_clusterconfigmapping PRIMARY KEY (cluster_id, type_name, create_timestamp),
- CONSTRAINT clusterconfigmappingcluster_id FOREIGN KEY (cluster_id) REFERENCES clusters (cluster_id));
-
CREATE TABLE serviceconfig (
service_config_id BIGINT NOT NULL,
cluster_id BIGINT NOT NULL,
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4638d24/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 f6cb896..fb4921f 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
@@ -92,9 +92,11 @@ CREATE TABLE clusterconfig (
type_name VARCHAR(100) NOT NULL,
cluster_id BIGINT NOT NULL,
stack_id BIGINT NOT NULL,
+ selected SMALLINT NOT NULL DEFAULT 0,
config_data LONGTEXT NOT NULL,
config_attributes LONGTEXT,
create_timestamp BIGINT NOT NULL,
+ selected_timestamp BIGINT NOT NULL DEFAULT 0,
CONSTRAINT PK_clusterconfig PRIMARY KEY (config_id),
CONSTRAINT FK_clusterconfig_cluster_id FOREIGN KEY (cluster_id) REFERENCES clusters (cluster_id),
CONSTRAINT FK_clusterconfig_stack_id FOREIGN KEY (stack_id) REFERENCES stack(stack_id),
@@ -441,16 +443,6 @@ CREATE TABLE key_value_store (`key` VARCHAR(255),
`value` LONGTEXT,
CONSTRAINT PK_key_value_store PRIMARY KEY (`key`));
-CREATE TABLE clusterconfigmapping (
- type_name VARCHAR(255) NOT NULL,
- create_timestamp BIGINT NOT NULL,
- cluster_id BIGINT NOT NULL,
- selected INTEGER NOT NULL DEFAULT 0,
- version_tag VARCHAR(255) NOT NULL,
- user_name VARCHAR(255) NOT NULL DEFAULT '_db',
- CONSTRAINT PK_clusterconfigmapping PRIMARY KEY (type_name, create_timestamp, cluster_id),
- CONSTRAINT clusterconfigmappingcluster_id FOREIGN KEY (cluster_id) REFERENCES clusters (cluster_id));
-
CREATE TABLE hostconfigmapping (
create_timestamp BIGINT NOT NULL,
host_id BIGINT NOT NULL,
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4638d24/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 19253e8..b482ee1 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
@@ -72,9 +72,11 @@ CREATE TABLE clusterconfig (
type_name VARCHAR2(255) NOT NULL,
cluster_id NUMBER(19) NOT NULL,
stack_id NUMBER(19) NOT NULL,
+ selected NUMBER(1) DEFAULT 0 NOT NULL,
config_data CLOB NOT NULL,
config_attributes CLOB,
create_timestamp NUMBER(19) NOT NULL,
+ selected_timestamp NUMBER(19) DEFAULT 0 NOT NULL,
CONSTRAINT PK_clusterconfig PRIMARY KEY (config_id),
CONSTRAINT FK_clusterconfig_cluster_id FOREIGN KEY (cluster_id) REFERENCES clusters (cluster_id),
CONSTRAINT FK_clusterconfig_stack_id FOREIGN KEY (stack_id) REFERENCES stack(stack_id),
@@ -422,16 +424,6 @@ CREATE TABLE key_value_store (
"value" CLOB NULL,
CONSTRAINT PK_key_value_store PRIMARY KEY ("key"));
-CREATE TABLE clusterconfigmapping (
- type_name VARCHAR2(255) NOT NULL,
- create_timestamp NUMBER(19) NOT NULL,
- cluster_id NUMBER(19) NOT NULL,
- selected NUMBER(10) NOT NULL,
- version_tag VARCHAR2(255) NOT NULL,
- user_name VARCHAR(255) DEFAULT '_db',
- CONSTRAINT PK_clusterconfigmapping PRIMARY KEY (type_name, create_timestamp, cluster_id),
- CONSTRAINT clusterconfigmappingcluster_id FOREIGN KEY (cluster_id) REFERENCES clusters (cluster_id));
-
CREATE TABLE hostconfigmapping (
create_timestamp NUMBER(19) NOT NULL,
host_id NUMBER(19) NOT NULL,
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4638d24/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 b13a9e3..e5851cc 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
@@ -72,25 +72,17 @@ CREATE TABLE clusterconfig (
type_name VARCHAR(255) NOT NULL,
cluster_id BIGINT NOT NULL,
stack_id BIGINT NOT NULL,
+ selected SMALLINT NOT NULL DEFAULT 0,
config_data TEXT NOT NULL,
config_attributes TEXT,
create_timestamp BIGINT NOT NULL,
+ selected_timestamp BIGINT NOT NULL DEFAULT 0,
CONSTRAINT PK_clusterconfig PRIMARY KEY (config_id),
CONSTRAINT FK_clusterconfig_cluster_id FOREIGN KEY (cluster_id) REFERENCES clusters (cluster_id),
CONSTRAINT FK_clusterconfig_stack_id FOREIGN KEY (stack_id) REFERENCES stack(stack_id),
CONSTRAINT UQ_config_type_tag UNIQUE (cluster_id, type_name, version_tag),
CONSTRAINT UQ_config_type_version UNIQUE (cluster_id, type_name, version));
-CREATE TABLE clusterconfigmapping (
- cluster_id BIGINT NOT NULL,
- type_name VARCHAR(255) NOT NULL,
- version_tag VARCHAR(255) NOT NULL,
- create_timestamp BIGINT NOT NULL,
- selected INTEGER NOT NULL DEFAULT 0,
- user_name VARCHAR(255) NOT NULL DEFAULT '_db',
- CONSTRAINT PK_clusterconfigmapping PRIMARY KEY (cluster_id, type_name, create_timestamp),
- CONSTRAINT clusterconfigmappingcluster_id FOREIGN KEY (cluster_id) REFERENCES clusters (cluster_id));
-
CREATE TABLE serviceconfig (
service_config_id BIGINT NOT NULL,
cluster_id BIGINT NOT NULL,
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4638d24/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql
index cf2954a..dc06f2e 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql
@@ -71,9 +71,11 @@ CREATE TABLE clusterconfig (
type_name VARCHAR(255) NOT NULL,
cluster_id NUMERIC(19) NOT NULL,
stack_id NUMERIC(19) NOT NULL,
+ selected SMALLINT NOT NULL DEFAULT 0,
config_data TEXT NOT NULL,
config_attributes TEXT,
create_timestamp NUMERIC(19) NOT NULL,
+ selected_timestamp NUMERIC(19) NOT NULL DEFAULT 0,
CONSTRAINT PK_clusterconfig PRIMARY KEY (config_id),
CONSTRAINT FK_clusterconfig_cluster_id FOREIGN KEY (cluster_id) REFERENCES clusters (cluster_id),
CONSTRAINT FK_clusterconfig_stack_id FOREIGN KEY (stack_id) REFERENCES stack(stack_id),
@@ -419,16 +421,6 @@ CREATE TABLE key_value_store ("key" VARCHAR(255),
"value" TEXT,
CONSTRAINT PK_key_value_store PRIMARY KEY ("key"));
-CREATE TABLE clusterconfigmapping (
- type_name VARCHAR(255) NOT NULL,
- create_timestamp NUMERIC(19) NOT NULL,
- cluster_id NUMERIC(19) NOT NULL,
- selected INTEGER NOT NULL DEFAULT 0,
- version_tag VARCHAR(255) NOT NULL,
- user_name VARCHAR(255) NOT NULL DEFAULT '_db',
- CONSTRAINT PK_clusterconfigmapping PRIMARY KEY (type_name, create_timestamp, cluster_id),
- CONSTRAINT clusterconfigmappingcluster_id FOREIGN KEY (cluster_id) REFERENCES clusters (cluster_id));
-
CREATE TABLE hostconfigmapping (
create_timestamp NUMERIC(19) NOT NULL,
host_id NUMERIC(19) NOT NULL,
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4638d24/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 16c269a..5ec5e0d 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
@@ -85,9 +85,11 @@ CREATE TABLE clusterconfig (
type_name VARCHAR(255) NOT NULL,
cluster_id BIGINT NOT NULL,
stack_id BIGINT NOT NULL,
+ selected SMALLINT NOT NULL DEFAULT 0,
config_data VARCHAR(MAX) NOT NULL,
config_attributes VARCHAR(MAX),
create_timestamp BIGINT NOT NULL,
+ selected_timestamp BIGINT NOT NULL DEFAULT 0,
CONSTRAINT PK_clusterconfig PRIMARY KEY CLUSTERED (config_id),
CONSTRAINT FK_clusterconfig_cluster_id FOREIGN KEY (cluster_id) REFERENCES clusters (cluster_id),
CONSTRAINT FK_clusterconfig_stack_id FOREIGN KEY (stack_id) REFERENCES stack(stack_id),
@@ -142,16 +144,6 @@ CREATE TABLE serviceconfigmapping (
CONSTRAINT FK_scvm_config FOREIGN KEY (config_id) REFERENCES clusterconfig(config_id),
CONSTRAINT FK_scvm_scv FOREIGN KEY (service_config_id) REFERENCES serviceconfig(service_config_id));
-CREATE TABLE clusterconfigmapping (
- cluster_id BIGINT NOT NULL,
- type_name VARCHAR(255) NOT NULL,
- version_tag VARCHAR(255) NOT NULL,
- create_timestamp BIGINT NOT NULL,
- selected INT NOT NULL DEFAULT 0,
- user_name VARCHAR(255) NOT NULL DEFAULT '_db',
- CONSTRAINT PK_clusterconfigmapping PRIMARY KEY CLUSTERED (cluster_id, type_name, create_timestamp ),
- CONSTRAINT clusterconfigmappingcluster_id FOREIGN KEY (cluster_id) REFERENCES clusters (cluster_id));
-
CREATE TABLE clusterservices (
service_name VARCHAR(255) NOT NULL,
cluster_id BIGINT NOT NULL,
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4638d24/ambari-server/src/test/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelperTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelperTest.java
index fddbb6a..7d8ba50 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelperTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelperTest.java
@@ -58,46 +58,6 @@ import com.google.inject.Injector;
public class DatabaseConsistencyCheckHelperTest {
@Test
- public void testCheckForNotMappedConfigs() throws Exception {
- EasyMockSupport easyMockSupport = new EasyMockSupport();
-
- final DBAccessor mockDBDbAccessor = easyMockSupport.createNiceMock(DBAccessor.class);
- final Connection mockConnection = easyMockSupport.createNiceMock(Connection.class);
- final ResultSet mockResultSet = easyMockSupport.createNiceMock(ResultSet.class);
- final Statement mockStatement = easyMockSupport.createNiceMock(Statement.class);
-
- final StackManagerFactory mockStackManagerFactory = easyMockSupport.createNiceMock(StackManagerFactory.class);
- final EntityManager mockEntityManager = easyMockSupport.createNiceMock(EntityManager.class);
- final Clusters mockClusters = easyMockSupport.createNiceMock(Clusters.class);
- final OsFamily mockOSFamily = easyMockSupport.createNiceMock(OsFamily.class);
- final Injector mockInjector = Guice.createInjector(new AbstractModule() {
- @Override
- protected void configure() {
-
- bind(StackManagerFactory.class).toInstance(mockStackManagerFactory);
- bind(EntityManager.class).toInstance(mockEntityManager);
- bind(DBAccessor.class).toInstance(mockDBDbAccessor);
- bind(Clusters.class).toInstance(mockClusters);
- bind(OsFamily.class).toInstance(mockOSFamily);
- }
- });
-
-
-
- expect(mockConnection.createStatement(ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE)).andReturn(mockStatement);
- expect(mockStatement.executeQuery("select type_name from clusterconfig where type_name not in (select type_name from clusterconfigmapping)")).andReturn(mockResultSet);
-
- DatabaseConsistencyCheckHelper.setInjector(mockInjector);
- DatabaseConsistencyCheckHelper.setConnection(mockConnection);
-
- easyMockSupport.replayAll();
-
- DatabaseConsistencyCheckHelper.checkForNotMappedConfigsToCluster();
-
- easyMockSupport.verifyAll();
- }
-
- @Test
public void testCheckForConfigsSelectedMoreThanOnce() throws Exception {
EasyMockSupport easyMockSupport = new EasyMockSupport();
@@ -123,9 +83,9 @@ public class DatabaseConsistencyCheckHelperTest {
});
expect(mockConnection.createStatement(ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE)).andReturn(mockStatement);
- expect(mockStatement.executeQuery("select c.cluster_name, ccm.type_name from clusterconfigmapping ccm " +
- "join clusters c on ccm.cluster_id=c.cluster_id " +
- "group by c.cluster_name, ccm.type_name " +
+ expect(mockStatement.executeQuery("select c.cluster_name, cc.type_name from clusterconfig cc "
+ + "join clusters c on cc.cluster_id=c.cluster_id "
+ + "group by c.cluster_name, cc.type_name " +
"having sum(selected) > 1")).andReturn(mockResultSet);
@@ -349,11 +309,10 @@ public class DatabaseConsistencyCheckHelperTest {
"join serviceconfig sc on cs.service_name=sc.service_name and cs.cluster_id=sc.cluster_id " +
"join serviceconfigmapping scm on sc.service_config_id=scm.service_config_id " +
"join clusterconfig cc on scm.config_id=cc.config_id and cc.cluster_id=sc.cluster_id " +
- "join clusterconfigmapping ccm on cc.type_name=ccm.type_name and cc.version_tag=ccm.version_tag and cc.cluster_id=ccm.cluster_id " +
- "join clusters c on ccm.cluster_id=c.cluster_id " +
+ "join clusters c on cc.cluster_id=c.cluster_id " +
"where sc.group_id is null and sc.service_config_id = (select max(service_config_id) from serviceconfig sc2 where sc2.service_name=sc.service_name and sc2.cluster_id=sc.cluster_id) " +
"group by c.cluster_name, cs.service_name, cc.type_name " +
- "having sum(ccm.selected) < 1")).andReturn(mockResultSet);
+ "having sum(cc.selected) < 1")).andReturn(mockResultSet);
DatabaseConsistencyCheckHelper.setInjector(mockInjector);
DatabaseConsistencyCheckHelper.setConnection(mockConnection);
@@ -550,11 +509,10 @@ public class DatabaseConsistencyCheckHelperTest {
"join serviceconfig sc on cs.service_name=sc.service_name and cs.cluster_id=sc.cluster_id " +
"join serviceconfigmapping scm on sc.service_config_id=scm.service_config_id " +
"join clusterconfig cc on scm.config_id=cc.config_id and cc.cluster_id=sc.cluster_id " +
- "join clusterconfigmapping ccm on cc.type_name=ccm.type_name and cc.version_tag=ccm.version_tag and cc.cluster_id=ccm.cluster_id " +
- "join clusters c on ccm.cluster_id=c.cluster_id " +
+ "join clusters c on cc.cluster_id=c.cluster_id " +
"where sc.group_id is null and sc.service_config_id = (select max(service_config_id) from serviceconfig sc2 where sc2.service_name=sc.service_name and sc2.cluster_id=sc.cluster_id) " +
"group by c.cluster_name, cs.service_name, cc.type_name " +
- "having sum(ccm.selected) < 1")).andReturn(mockResultSet);
+ "having sum(cc.selected) < 1")).andReturn(mockResultSet);
DatabaseConsistencyCheckHelper.setInjector(mockInjector);
DatabaseConsistencyCheckHelper.setConnection(mockConnection);