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/05/31 20:12:33 UTC
[02/50] [abbrv] ambari git commit: AMBARI-20940 - Propagate Component
versions and states to Service (jonathanhurley)
http://git-wip-us.apache.org/repos/asf/ambari/blob/f65692a3/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestImplTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestImplTest.java
index 2e712d1..a378aba 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestImplTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestImplTest.java
@@ -23,11 +23,18 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import org.apache.ambari.server.controller.ResourceProviderFactory;
import org.apache.ambari.server.controller.spi.Request;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
+import org.apache.ambari.server.orm.GuiceJpaInitializer;
+import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
+import org.junit.Before;
import org.junit.Test;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
import junit.framework.Assert;
/**
@@ -44,6 +51,23 @@ public class RequestImplTest {
propertyIds.add(PropertyHelper.getPropertyId("c3", "p4"));
}
+ @Before
+ public void setup() throws Exception {
+ Injector injector = Guice.createInjector(new InMemoryDefaultTestModule());
+ injector.getInstance(GuiceJpaInitializer.class);
+ ResourceProviderFactory resourceProviderFactory = injector.getInstance(ResourceProviderFactory.class);
+ AbstractControllerResourceProvider.init(resourceProviderFactory);
+
+ DefaultProviderModule defaultProviderModule = injector.getInstance(DefaultProviderModule.class);
+ for( Resource.Type type : Resource.Type.values() ){
+ try {
+ defaultProviderModule.getResourceProvider(type);
+ } catch (Exception exception) {
+ // ignore
+ }
+ }
+ }
+
@Test
public void testGetPropertyIds() {
Request request = PropertyHelper.getReadRequest(propertyIds);
@@ -89,9 +113,6 @@ public class RequestImplTest {
Assert.assertTrue(validPropertyIds.contains("ServiceInfo/service_name"));
Assert.assertTrue(validPropertyIds.contains("ServiceInfo/cluster_name"));
Assert.assertTrue(validPropertyIds.contains("ServiceInfo/state"));
- Assert.assertTrue(validPropertyIds.contains("Services/description"));
- Assert.assertTrue(validPropertyIds.contains("Services/display_name"));
- Assert.assertTrue(validPropertyIds.contains("Services/attributes"));
Assert.assertTrue(validPropertyIds.contains("params/run_smoke_test"));
Assert.assertTrue(validPropertyIds.contains("params/reconfigure_client"));
@@ -130,7 +151,6 @@ public class RequestImplTest {
Assert.assertTrue(validPropertyIds.contains("ServiceComponentInfo/cluster_name"));
Assert.assertTrue(validPropertyIds.contains("ServiceComponentInfo/state"));
Assert.assertTrue(validPropertyIds.contains("ServiceComponentInfo/display_name"));
- Assert.assertTrue(validPropertyIds.contains("ServiceComponentInfo/description"));
Assert.assertTrue(validPropertyIds.contains("params/run_smoke_test"));
request = PropertyHelper.getReadRequest(PropertyHelper.getPropertyIds(Resource.Type.Action));
http://git-wip-us.apache.org/repos/asf/ambari/blob/f65692a3/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java
index 04b7933..91b00ab 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java
@@ -639,7 +639,7 @@ public class ServiceResourceProviderTest {
expect(stackId.getStackId()).andReturn("HDP-2.5").anyTimes();
expect(stackId.getStackName()).andReturn("HDP").anyTimes();
expect(stackId.getStackVersion()).andReturn("2.5").anyTimes();
- expect(service0.getDesiredStackVersion()).andReturn(stackId).anyTimes();
+ expect(service0.getDesiredStackId()).andReturn(stackId).anyTimes();
expect(service0.getName()).andReturn("Service102").anyTimes();
expect(serviceInfo.isCredentialStoreSupported()).andReturn(true).anyTimes();
expect(serviceInfo.isCredentialStoreEnabled()).andReturn(false).anyTimes();
@@ -755,7 +755,7 @@ public class ServiceResourceProviderTest {
expect(stackId.getStackId()).andReturn("HDP-2.5").anyTimes();
expect(stackId.getStackName()).andReturn("HDP").anyTimes();
expect(stackId.getStackVersion()).andReturn("2.5").anyTimes();
- expect(service0.getDesiredStackVersion()).andReturn(stackId).anyTimes();
+ expect(service0.getDesiredStackId()).andReturn(stackId).anyTimes();
expect(service0.getName()).andReturn("Service102").anyTimes();
expect(serviceInfo.isCredentialStoreSupported()).andReturn(true).anyTimes();
expect(serviceInfo.isCredentialStoreEnabled()).andReturn(false).anyTimes();
@@ -1127,48 +1127,34 @@ public class ServiceResourceProviderTest {
@Test
public void testCheckPropertyIds() throws Exception {
- Set<String> propertyIds = new HashSet<>();
- propertyIds.add("foo");
- propertyIds.add("cat1/foo");
- propertyIds.add("cat2/bar");
- propertyIds.add("cat2/baz");
- propertyIds.add("cat3/sub1/bam");
- propertyIds.add("cat4/sub2/sub3/bat");
- propertyIds.add("cat5/subcat5/map");
-
- Map<Resource.Type, String> keyPropertyIds = new HashMap<>();
-
AmbariManagementController managementController = createMock(AmbariManagementController.class);
MaintenanceStateHelper maintenanceStateHelperMock = createNiceMock(MaintenanceStateHelper.class);
RepositoryVersionDAO repositoryVersionDAO = createNiceMock(RepositoryVersionDAO.class);
replay(maintenanceStateHelperMock, repositoryVersionDAO);
- AbstractResourceProvider provider = new ServiceResourceProvider(propertyIds, keyPropertyIds,
- managementController, maintenanceStateHelperMock, repositoryVersionDAO);
+ AbstractResourceProvider provider = new ServiceResourceProvider(managementController,
+ maintenanceStateHelperMock, repositoryVersionDAO);
+
+ Set<String> unsupported = provider.checkPropertyIds(
+ Collections.singleton(ServiceResourceProvider.SERVICE_CLUSTER_NAME_PROPERTY_ID));
- Set<String> unsupported = provider.checkPropertyIds(Collections.singleton("foo"));
Assert.assertTrue(unsupported.isEmpty());
// note that key is not in the set of known property ids. We allow it if its parent is a known property.
// this allows for Map type properties where we want to treat the entries as individual properties
- Assert.assertTrue(provider.checkPropertyIds(Collections.singleton("cat5/subcat5/map/key")).isEmpty());
+ String subKey = PropertyHelper.getPropertyId(ServiceResourceProvider.SERVICE_CLUSTER_NAME_PROPERTY_ID, "key");
+ unsupported = provider.checkPropertyIds(Collections.singleton(subKey));
+ Assert.assertTrue(unsupported.isEmpty());
unsupported = provider.checkPropertyIds(Collections.singleton("bar"));
Assert.assertEquals(1, unsupported.size());
Assert.assertTrue(unsupported.contains("bar"));
- unsupported = provider.checkPropertyIds(Collections.singleton("cat1/foo"));
- Assert.assertTrue(unsupported.isEmpty());
-
- unsupported = provider.checkPropertyIds(Collections.singleton("cat1"));
- Assert.assertTrue(unsupported.isEmpty());
-
- unsupported = provider.checkPropertyIds(Collections.singleton("config"));
- Assert.assertTrue(unsupported.isEmpty());
-
- unsupported = provider.checkPropertyIds(Collections.singleton("config/unknown_property"));
- Assert.assertTrue(unsupported.isEmpty());
+ for (String propertyId : provider.getPKPropertyIds()) {
+ unsupported = provider.checkPropertyIds(Collections.singleton(propertyId));
+ Assert.assertTrue(unsupported.isEmpty());
+ }
}
/**
@@ -1191,9 +1177,7 @@ public class ServiceResourceProviderTest {
AmbariManagementController managementController,
MaintenanceStateHelper maintenanceStateHelper, RepositoryVersionDAO repositoryVersionDAO) {
Resource.Type type = Resource.Type.Service;
- return new ServiceResourceProvider(PropertyHelper.getPropertyIds(type),
- PropertyHelper.getKeyPropertyIds(type),
- managementController, maintenanceStateHelper, repositoryVersionDAO);
+ return new ServiceResourceProvider(managementController, maintenanceStateHelper, repositoryVersionDAO);
}
public static void createServices(AmbariManagementController controller,
http://git-wip-us.apache.org/repos/asf/ambari/blob/f65692a3/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java
index 3039267..30e5c4c 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java
@@ -210,10 +210,10 @@ public class UpgradeResourceProviderHDP22Test {
StackId oldStack = cluster.getDesiredStackVersion();
for (Service s : cluster.getServices().values()) {
- assertEquals(oldStack, s.getDesiredStackVersion());
+ assertEquals(oldStack, s.getDesiredStackId());
for (ServiceComponent sc : s.getServiceComponents().values()) {
- assertEquals(oldStack, sc.getDesiredStackVersion());
+ assertEquals(oldStack, sc.getDesiredStackId());
for (ServiceComponentHost sch : sc.getServiceComponentHosts().values()) {
assertEquals("2.2.0.0", sch.getVersion());
@@ -257,10 +257,10 @@ public class UpgradeResourceProviderHDP22Test {
assertTrue(oldStack.equals(newStack));
for (Service s : cluster.getServices().values()) {
- assertEquals(newStack, s.getDesiredStackVersion());
+ assertEquals(newStack, s.getDesiredStackId());
for (ServiceComponent sc : s.getServiceComponents().values()) {
- assertEquals(newStack, sc.getDesiredStackVersion());
+ assertEquals(newStack, sc.getDesiredStackId());
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/f65692a3/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java
index a814ba8..d30d9e0 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java
@@ -1057,10 +1057,10 @@ public class UpgradeResourceProviderTest {
StackId oldStack = cluster.getDesiredStackVersion();
for (Service s : cluster.getServices().values()) {
- assertEquals(oldStack, s.getDesiredStackVersion());
+ assertEquals(oldStack, s.getDesiredStackId());
for (ServiceComponent sc : s.getServiceComponents().values()) {
- assertEquals(oldStack, sc.getDesiredStackVersion());
+ assertEquals(oldStack, sc.getDesiredStackId());
for (ServiceComponentHost sch : sc.getServiceComponentHosts().values()) {
assertEquals(oldStack.getStackVersion(), sch.getVersion());
@@ -1103,10 +1103,10 @@ public class UpgradeResourceProviderTest {
assertFalse(oldStack.equals(newStack));
for (Service s : cluster.getServices().values()) {
- assertEquals(newStack, s.getDesiredStackVersion());
+ assertEquals(newStack, s.getDesiredStackId());
for (ServiceComponent sc : s.getServiceComponents().values()) {
- assertEquals(newStack, sc.getDesiredStackVersion());
+ assertEquals(newStack, sc.getDesiredStackId());
for (ServiceComponentHost sch : sc.getServiceComponentHosts().values()) {
assertEquals(newStack.getStackVersion(), sch.getVersion());
http://git-wip-us.apache.org/repos/asf/ambari/blob/f65692a3/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceComponentTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceComponentTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceComponentTest.java
index d72f018..8f2020d 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceComponentTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceComponentTest.java
@@ -137,7 +137,7 @@ public class ServiceComponentTest {
sc.getClusterName());
Assert.assertEquals(State.INIT, sc.getDesiredState());
Assert.assertFalse(
- sc.getDesiredStackVersion().getStackId().isEmpty());
+ sc.getDesiredStackId().getStackId().isEmpty());
}
@@ -160,7 +160,7 @@ public class ServiceComponentTest {
newStackId.getStackVersion());
sc.setDesiredRepositoryVersion(repositoryVersion);
- Assert.assertEquals(newStackId.toString(), sc.getDesiredStackVersion().getStackId());
+ Assert.assertEquals(newStackId.toString(), sc.getDesiredStackId().getStackId());
ServiceComponentDesiredStateDAO serviceComponentDesiredStateDAO =
injector.getInstance(ServiceComponentDesiredStateDAO.class);
@@ -173,7 +173,7 @@ public class ServiceComponentTest {
Assert.assertNotNull(sc1);
Assert.assertEquals(State.INSTALLED, sc1.getDesiredState());
Assert.assertEquals("HDP-1.2.0",
- sc1.getDesiredStackVersion().getStackId());
+ sc1.getDesiredStackId().getStackId());
}
@@ -302,10 +302,9 @@ public class ServiceComponentTest {
Assert.assertEquals(sc.getClusterId(), r.getClusterId().longValue());
Assert.assertEquals(sc.getName(), r.getComponentName());
Assert.assertEquals(sc.getServiceName(), r.getServiceName());
- Assert.assertEquals(sc.getDesiredStackVersion().getStackId(),
- r.getDesiredStackVersion());
- Assert.assertEquals(sc.getDesiredState().toString(),
- r.getDesiredState());
+ Assert.assertEquals(sc.getDesiredStackId().getStackId(), r.getDesiredStackId());
+ Assert.assertEquals(sc.getDesiredState().toString(), r.getDesiredState());
+
int totalCount = r.getServiceComponentStateCount().get("totalCount");
int startedCount = r.getServiceComponentStateCount().get("startedCount");
int installedCount = r.getServiceComponentStateCount().get("installedCount");
@@ -368,10 +367,10 @@ public class ServiceComponentTest {
sc.setDesiredRepositoryVersion(repositoryVersion);
- StackId stackId = sc.getDesiredStackVersion();
+ StackId stackId = sc.getDesiredStackId();
Assert.assertEquals(new StackId("HDP", "2.2.0"), stackId);
- Assert.assertEquals("HDP-2.2.0", sc.getDesiredStackVersion().getStackId());
+ Assert.assertEquals("HDP-2.2.0", sc.getDesiredStackId().getStackId());
ServiceComponentDesiredStateEntity serviceComponentDesiredStateEntity = serviceComponentDesiredStateDAO.findByName(
cluster.getClusterId(), serviceName, componentName);
@@ -490,10 +489,10 @@ public class ServiceComponentTest {
sc.setDesiredRepositoryVersion(repositoryVersion);
- StackId stackId = sc.getDesiredStackVersion();
+ StackId stackId = sc.getDesiredStackId();
Assert.assertEquals(new StackId("HDP", "2.2.0"), stackId);
- Assert.assertEquals("HDP-2.2.0", sc.getDesiredStackVersion().getStackId());
+ Assert.assertEquals("HDP-2.2.0", sc.getDesiredStackId().getStackId());
ServiceComponentDesiredStateEntity serviceComponentDesiredStateEntity = serviceComponentDesiredStateDAO.findByName(
cluster.getClusterId(), serviceName, componentName);
@@ -571,9 +570,9 @@ public class ServiceComponentTest {
Assert.assertEquals(rve, sc.getDesiredRepositoryVersion());
- Assert.assertEquals(new StackId("HDP", "2.2.0"), sc.getDesiredStackVersion());
+ Assert.assertEquals(new StackId("HDP", "2.2.0"), sc.getDesiredStackId());
- Assert.assertEquals("HDP-2.2.0", sc.getDesiredStackVersion().getStackId());
+ Assert.assertEquals("HDP-2.2.0", sc.getDesiredStackId().getStackId());
Assert.assertNotNull(serviceComponentDesiredStateEntity);
@@ -624,10 +623,10 @@ public class ServiceComponentTest {
sc.setDesiredRepositoryVersion(rve);
- StackId stackId = sc.getDesiredStackVersion();
+ StackId stackId = sc.getDesiredStackId();
Assert.assertEquals(new StackId("HDP", "2.2.0"), stackId);
- Assert.assertEquals("HDP-2.2.0", sc.getDesiredStackVersion().getStackId());
+ Assert.assertEquals("HDP-2.2.0", sc.getDesiredStackId().getStackId());
Assert.assertNotNull(serviceComponentDesiredStateEntity);
@@ -684,10 +683,10 @@ public class ServiceComponentTest {
ServiceComponentDesiredStateEntity entity = serviceComponentDesiredStateDAO.findByName(cluster.getClusterId(), serviceName, componentName);
RepositoryVersionEntity repoVersion2201 = helper.getOrCreateRepositoryVersion(
- component.getDesiredStackVersion(), "2.2.0.1");
+ component.getDesiredStackId(), "2.2.0.1");
RepositoryVersionEntity repoVersion2202 = helper.getOrCreateRepositoryVersion(
- component.getDesiredStackVersion(), "2.2.0.2");
+ component.getDesiredStackId(), "2.2.0.2");
addHostToCluster("h1", clusterName);
addHostToCluster("h2", clusterName);
http://git-wip-us.apache.org/repos/asf/ambari/blob/f65692a3/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceTest.java
index dfe8f59..a1299a8 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceTest.java
@@ -139,7 +139,7 @@ public class ServiceTest {
desiredStackId, desiredVersion);
service.setDesiredRepositoryVersion(desiredRepositoryVersion);
- Assert.assertEquals(desiredStackId, service.getDesiredStackVersion());
+ Assert.assertEquals(desiredStackId, service.getDesiredStackId());
service.setDesiredState(State.INSTALLING);
Assert.assertEquals(State.INSTALLING, service.getDesiredState());
@@ -166,7 +166,7 @@ public class ServiceTest {
Assert.assertEquals(State.INIT, service.getDesiredState());
Assert.assertEquals(SecurityState.UNSECURED, service.getSecurityState());
Assert.assertFalse(
- service.getDesiredStackVersion().getStackId().isEmpty());
+ service.getDesiredStackId().getStackId().isEmpty());
Assert.assertTrue(s.getServiceComponents().isEmpty());
@@ -243,7 +243,7 @@ public class ServiceTest {
ServiceResponse r = s.convertToResponse();
Assert.assertEquals(s.getName(), r.getServiceName());
Assert.assertEquals(s.getCluster().getClusterName(), r.getClusterName());
- Assert.assertEquals(s.getDesiredStackVersion().getStackId(), r.getDesiredStackVersion());
+ Assert.assertEquals(s.getDesiredStackId().getStackId(), r.getDesiredStackId());
Assert.assertEquals(s.getDesiredState().toString(), r.getDesiredState());
StackId desiredStackId = new StackId("HDP-1.2.0");
@@ -257,7 +257,7 @@ public class ServiceTest {
r = s.convertToResponse();
Assert.assertEquals(s.getName(), r.getServiceName());
Assert.assertEquals(s.getCluster().getClusterName(), r.getClusterName());
- Assert.assertEquals(s.getDesiredStackVersion().getStackId(), r.getDesiredStackVersion());
+ Assert.assertEquals(s.getDesiredStackId().getStackId(), r.getDesiredStackId());
Assert.assertEquals(s.getDesiredState().toString(), r.getDesiredState());
// FIXME add checks for configs
http://git-wip-us.apache.org/repos/asf/ambari/blob/f65692a3/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java
index 3a80ca7..ed92db7 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java
@@ -232,7 +232,7 @@ public class ServiceComponentHostTest {
case HOST_SVCCOMP_INSTALL:
return new ServiceComponentHostInstallEvent(
impl.getServiceComponentName(), impl.getHostName(), timestamp,
- impl.getServiceComponent().getDesiredStackVersion().toString());
+ impl.getServiceComponent().getDesiredStackId().toString());
case HOST_SVCCOMP_START:
return new ServiceComponentHostStartEvent(
impl.getServiceComponentName(), impl.getHostName(), timestamp);
@@ -292,7 +292,7 @@ public class ServiceComponentHostTest {
Assert.assertEquals(inProgressState,
impl.getState());
if (checkStack) {
- Assert.assertNotNull(impl.getServiceComponent().getDesiredStackVersion());
+ Assert.assertNotNull(impl.getServiceComponent().getDesiredStackId());
}
ServiceComponentHostEvent installEvent2 = createEvent(impl, ++timestamp,