This is an automated email from the ASF dual-hosted git repository. jonathanhurley pushed a commit to branch branch-feature-AMBARI-14714 in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by this push: new 31f79b0 AMBARI-23519 - Removal of Repository Version State (#942) 31f79b0 is described below commit 31f79b016133c70f5840e50609a58354c293cff9 Author: Jonathan Hurley <jonathanhur...@apache.org> AuthorDate: Mon Apr 9 16:54:03 2018 -0400 AMBARI-23519 - Removal of Repository Version State (#942) --- .../apache/ambari/server/StateRecoveryManager.java | 10 +- .../controller/ServiceComponentResponse.java | 13 +- .../ClusterStackVersionResourceProvider.java | 1 - .../internal/ComponentResourceProvider.java | 14 -- .../ServiceComponentDesiredStateEntity.java | 28 --- .../server/state/RepositoryVersionState.java | 145 ---------------- .../ambari/server/state/ServiceComponent.java | 7 - .../ambari/server/state/ServiceComponentImpl.java | 29 +--- .../src/main/resources/Ambari-DDL-Derby-CREATE.sql | 1 - .../src/main/resources/Ambari-DDL-MySQL-CREATE.sql | 1 - .../main/resources/Ambari-DDL-Oracle-CREATE.sql | 1 - .../main/resources/Ambari-DDL-Postgres-CREATE.sql | 1 - .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 1 - .../main/resources/Ambari-DDL-SQLServer-CREATE.sql | 1 - .../internal/ComponentResourceProviderTest.java | 32 +--- .../ambari/server/state/cluster/ClusterTest.java | 191 +-------------------- 16 files changed, 23 insertions(+), 453 deletions(-) diff --git a/ambari-server/src/main/java/org/apache/ambari/server/StateRecoveryManager.java b/ambari-server/src/main/java/org/apache/ambari/server/StateRecoveryManager.java index 9e06d6c..1ab66dc 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/StateRecoveryManager.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/StateRecoveryManager.java @@ -25,7 +25,6 @@ import org.apache.ambari.server.orm.dao.MpackHostStateDAO; import org.apache.ambari.server.orm.entities.MpackHostStateEntity; import org.apache.ambari.server.state.Mpack; import org.apache.ambari.server.state.MpackInstallState; -import org.apache.ambari.server.state.RepositoryVersionState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,8 +53,8 @@ public class StateRecoveryManager { /** * Resets any management pack installation states from - * {@link RepositoryVersionState#INSTALLING} to - * {@link RepositoryVersionState#INSTALL_FAILED}. + * {@link MpackInstallState#INSTALLING} to + * {@link MpackInstallState#INSTALL_FAILED}. */ void updateManagementPackInstallationState() { List<MpackHostStateEntity> mpackHostStates = mpackHostStateDAO.findAll(); @@ -67,8 +66,9 @@ public class StateRecoveryManager { String msg = String.format( "The installation state of management pack %s on host %s was set from %s to %s", - mpack.getName(), mpackHostState.getHostName(), RepositoryVersionState.INSTALLING, - RepositoryVersionState.INSTALL_FAILED); + mpack.getName(), mpackHostState.getHostName(), MpackInstallState.INSTALLING, + MpackInstallState.INSTALL_FAILED); + LOG.warn(msg); mpackHostStateDAO.merge(mpackHostState); diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentResponse.java index 85dc55f..b163fb9 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentResponse.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentResponse.java @@ -21,7 +21,6 @@ package org.apache.ambari.server.controller; import java.util.Map; -import org.apache.ambari.server.state.RepositoryVersionState; import org.apache.ambari.server.state.StackId; public class ServiceComponentResponse { @@ -43,13 +42,12 @@ public class ServiceComponentResponse { private Map<String, Integer> serviceComponentStateCount; private boolean recoveryEnabled; private String desiredVersion; - private RepositoryVersionState repoState; public ServiceComponentResponse(Long clusterId, String clusterName, Long serviceGroupId, String serviceGroupName, Long serviceId, String serviceName, String serviceType, Long componentId, String componentName, String componentType, StackId desiredStackId, String desiredState, Map<String, Integer> serviceComponentStateCount, boolean recoveryEnabled, - String displayName, String desiredVersion, RepositoryVersionState repoState) { + String displayName, String desiredVersion) { this.clusterId = clusterId; this.clusterName = clusterName; this.serviceGroupId = serviceGroupId; @@ -66,7 +64,6 @@ public class ServiceComponentResponse { this.serviceComponentStateCount = serviceComponentStateCount; this.recoveryEnabled = recoveryEnabled; this.desiredVersion = desiredVersion; - this.repoState = repoState; } /** @@ -272,14 +269,6 @@ public class ServiceComponentResponse { return desiredVersion; } - /** - * @return the state of the repository against the desired version - */ - public RepositoryVersionState getRepositoryState() { - return repoState; - } - - @Override public boolean equals(Object o) { if (this == o) { diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java index 99be7e5..8dd5651 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java @@ -76,7 +76,6 @@ import org.apache.ambari.server.state.ConfigHelper; import org.apache.ambari.server.state.Host; import org.apache.ambari.server.state.MpackInstallState; import org.apache.ambari.server.state.RepositoryType; -import org.apache.ambari.server.state.RepositoryVersionState; import org.apache.ambari.server.state.ServiceComponentHost; import org.apache.ambari.server.state.ServiceGroup; import org.apache.ambari.server.state.StackId; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java index d968480..e55903a 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java @@ -32,7 +32,6 @@ import org.apache.ambari.server.ClusterNotFoundException; import org.apache.ambari.server.DuplicateResourceException; import org.apache.ambari.server.ObjectNotFoundException; import org.apache.ambari.server.ParentObjectNotFoundException; -import org.apache.ambari.server.ServiceGroupNotFoundException; import org.apache.ambari.server.ServiceNotFoundException; import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.controller.AmbariManagementController; @@ -61,7 +60,6 @@ import org.apache.ambari.server.state.Service; import org.apache.ambari.server.state.ServiceComponent; import org.apache.ambari.server.state.ServiceComponentFactory; import org.apache.ambari.server.state.ServiceComponentHost; -import org.apache.ambari.server.state.ServiceGroup; import org.apache.ambari.server.state.StackId; import org.apache.ambari.server.state.State; import org.apache.ambari.server.topology.TopologyDeleteFormer; @@ -113,7 +111,6 @@ public class ComponentResourceProvider extends AbstractControllerResourceProvide public static final String COMPONENT_RECOVERY_ENABLED_ID = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "recovery_enabled"; protected static final String COMPONENT_DESIRED_STACK = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "desired_stack"; protected static final String COMPONENT_DESIRED_VERSION = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "desired_version"; - protected static final String COMPONENT_REPOSITORY_STATE = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "repository_state"; private static final String TRUE = "true"; @@ -164,7 +161,6 @@ public class ComponentResourceProvider extends AbstractControllerResourceProvide PROPERTY_IDS.add(COMPONENT_RECOVERY_ENABLED_ID); PROPERTY_IDS.add(COMPONENT_DESIRED_STACK); PROPERTY_IDS.add(COMPONENT_DESIRED_VERSION); - PROPERTY_IDS.add(COMPONENT_REPOSITORY_STATE); PROPERTY_IDS.add(QUERY_PARAMETERS_RUN_SMOKE_TEST_ID); @@ -244,7 +240,6 @@ public class ComponentResourceProvider extends AbstractControllerResourceProvide resource.setProperty(COMPONENT_RECOVERY_ENABLED_ID, response.isRecoveryEnabled()); resource.setProperty(COMPONENT_DESIRED_STACK, response.getDesiredStackId()); resource.setProperty(COMPONENT_DESIRED_VERSION, response.getDesiredVersion()); - resource.setProperty(COMPONENT_DESIRED_VERSION, response.getRepositoryState()); associatedResources.add(resource); } @@ -299,7 +294,6 @@ public class ComponentResourceProvider extends AbstractControllerResourceProvide setResourceProperty(resource, COMPONENT_RECOVERY_ENABLED_ID, String.valueOf(response.isRecoveryEnabled()), requestedIds); setResourceProperty(resource, COMPONENT_DESIRED_STACK, response.getDesiredStackId(), requestedIds); setResourceProperty(resource, COMPONENT_DESIRED_VERSION, response.getDesiredVersion(), requestedIds); - setResourceProperty(resource, COMPONENT_REPOSITORY_STATE, response.getRepositoryState(), requestedIds); resources.add(resource); } @@ -549,13 +543,6 @@ public class ComponentResourceProvider extends AbstractControllerResourceProvide ServiceComponentResponse serviceComponentResponse = sc.convertToResponse(); StackId stackId = sc.getStackId(); - ServiceGroup sg = null; - try { - sg = cluster.getServiceGroup(sc.getServiceGroupId()); - } catch (ServiceGroupNotFoundException e) { - sg = null; - } - try { ComponentInfo componentInfo = ambariMetaInfo.getComponent(stackId.getStackName(), stackId.getStackVersion(), s.getServiceType(), request.getComponentName()); @@ -948,7 +935,6 @@ public class ComponentResourceProvider extends AbstractControllerResourceProvide final AmbariMetaInfo ambariMetaInfo) throws AmbariException { if (StringUtils.isEmpty(request.getServiceName())) { - String componentName = request.getComponentName(); String componentType = request.getComponentType(); String serviceName = getManagementController().findServiceName(cluster, componentType); diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceComponentDesiredStateEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceComponentDesiredStateEntity.java index d61ac7c..ebf4633 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceComponentDesiredStateEntity.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceComponentDesiredStateEntity.java @@ -37,9 +37,6 @@ import javax.persistence.Table; import javax.persistence.TableGenerator; import javax.persistence.UniqueConstraint; -import org.apache.ambari.annotations.Experimental; -import org.apache.ambari.annotations.ExperimentalFeature; -import org.apache.ambari.server.state.RepositoryVersionState; import org.apache.ambari.server.state.State; @Entity @@ -99,12 +96,6 @@ public class ServiceComponentDesiredStateEntity { @Column(name = "recovery_enabled", nullable = false, insertable = true, updatable = true) private Integer recoveryEnabled = 0; - @Deprecated - @Experimental(feature = ExperimentalFeature.REPO_VERSION_REMOVAL) - @Column(name = "repo_state", nullable = false, insertable = true, updatable = true) - @Enumerated(EnumType.STRING) - private RepositoryVersionState repoState = RepositoryVersionState.NOT_REQUIRED; - @ManyToOne @JoinColumns( { @@ -247,23 +238,4 @@ public class ServiceComponentDesiredStateEntity { public void setHostComponentDesiredStateEntities(Collection<HostComponentDesiredStateEntity> hostComponentDesiredStateEntities) { this.hostComponentDesiredStateEntities = hostComponentDesiredStateEntities; } - - /** - * @param state the repository state for {@link #getDesiredVersion()} - */ - @Deprecated - @Experimental(feature = ExperimentalFeature.REPO_VERSION_REMOVAL) - public void setRepositoryState(RepositoryVersionState state) { - repoState = state; - } - - /** - * @return the state of the repository for {@link #getDesiredVersion()} - */ - @Deprecated - @Experimental(feature = ExperimentalFeature.REPO_VERSION_REMOVAL) - public RepositoryVersionState getRepositoryState() { - return repoState; - } - } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/RepositoryVersionState.java b/ambari-server/src/main/java/org/apache/ambari/server/state/RepositoryVersionState.java deleted file mode 100644 index f1cd7bd..0000000 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/RepositoryVersionState.java +++ /dev/null @@ -1,145 +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.state; - -import java.util.List; - -import org.apache.ambari.annotations.Experimental; -import org.apache.ambari.annotations.ExperimentalFeature; - -/** - * The {@link RepositoryVersionState} represents the state of a repository on a - * particular host. Because hosts can contain a mixture of components from - * different repositories, there can be any combination of - * {@link RepositoryVersionState#CURRENT}} entries for a single host. A host may - * not have multiple entries for the same repository. - * <p/> - * - * - * <pre> - * Step 1: Initial Configuration - * Version 1 is CURRENT - * - * Step 2: Add another repository and trigger distributing repositories/installing packages - * Version 1: CURRENT - * Version 2: INSTALLING - * - * Step 3: distributing repositories/installing packages action finishes successfully or fails - * Version 1: CURRENT - * Version 2: INSTALLED - * - * or - * - * Version 1: CURRENT - * Version 2: INSTALL_FAILED (a retry can set this back to INSTALLING) - * - * Step 4: Perform an upgrade of every component on the host from version 1 to version 2 - * Version 1: INSTALLED - * Version 2: CURRENT - * - * Step 4a: Perform an upgrade of a single component, leaving other components on the prior version - * Version 1: CURRENT - * Version 2: CURRENT - * - * Step 4b: May revert to the original version via a downgrade, which is technically still an upgrade to a version - * and eventually becomes - * - * Version 1: CURRENT - * Version 2: INSTALLED - * - * ********************************************* - * Start states: NOT_REQUIRED, INSTALLING, CURRENT - * Allowed Transitions: - * INSTALLED -> CURRENT - * INSTALLING -> INSTALLED | INSTALL_FAILED | OUT_OF_SYNC - * INSTALLED -> INSTALLED | INSTALLING | OUT_OF_SYNC - * OUT_OF_SYNC -> INSTALLING - * INSTALL_FAILED -> INSTALLING - * CURRENT -> INSTALLED - * </pre> - */ -@Deprecated -@Experimental(feature = ExperimentalFeature.REPO_VERSION_REMOVAL) -public enum RepositoryVersionState { - /** - * Repository version is not required - */ - NOT_REQUIRED(0), - - /** - * Repository version that is in the process of being installed. - */ - INSTALLING(3), - - /** - * Repository version that is installed and supported but not the active version. - */ - INSTALLED(2), - - /** - * Repository version that during the install process failed to install some components. - */ - INSTALL_FAILED(5), - - /** - * Repository version that is installed for some components but not for all. - */ - OUT_OF_SYNC(4), - - /** - * Repository version that is installed and supported and is the active version. - */ - CURRENT(1); - - private final int weight; - - /** - * Constructor. - * - * @param weight - * the weight of the state. - */ - private RepositoryVersionState(int weight) { - this.weight = weight; - } - - /** - * Gets a single representation of the repository state based on the supplied - * states. - * - * @param states - * the states to calculate the aggregate for. - * @return the "heaviest" state. - */ - public static RepositoryVersionState getAggregateState(List<RepositoryVersionState> states) { - if (null == states || states.isEmpty()) { - return NOT_REQUIRED; - } - - RepositoryVersionState heaviestState = states.get(0); - for (RepositoryVersionState state : states) { - if (state.weight > heaviestState.weight) { - heaviestState = state; - } - } - - return heaviestState; - } - -} diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponent.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponent.java index b8ef926..e3d47ff 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponent.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponent.java @@ -118,11 +118,4 @@ public interface ServiceComponent { String hostName) throws AmbariException; void delete(DeleteHostComponentStatusMetaData deleteMetaData); - - /** - * @return the repository state for the desired version - */ - @Deprecated - @Experimental(feature = ExperimentalFeature.REPO_VERSION_REMOVAL) - RepositoryVersionState getRepositoryState(); } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java index dfe697e..56ecb8d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java @@ -42,8 +42,6 @@ import org.apache.ambari.server.events.ServiceComponentRecoveryChangedEvent; import org.apache.ambari.server.events.publishers.AmbariEventPublisher; import org.apache.ambari.server.orm.dao.ClusterServiceDAO; import org.apache.ambari.server.orm.dao.HostComponentDesiredStateDAO; -import org.apache.ambari.server.orm.dao.HostComponentStateDAO; -import org.apache.ambari.server.orm.dao.RepositoryVersionDAO; import org.apache.ambari.server.orm.dao.ServiceComponentDesiredStateDAO; import org.apache.ambari.server.orm.entities.ClusterServiceEntity; import org.apache.ambari.server.orm.entities.ClusterServiceEntityPK; @@ -92,12 +90,6 @@ public class ServiceComponentImpl implements ServiceComponent { private final long desiredStateEntityId; @Inject - private RepositoryVersionDAO repoVersionDAO; - - @Inject - private HostComponentStateDAO hostComponentDAO; - - @Inject private MaintenanceStateHelper maintenanceStateHelper; @AssistedInject @@ -448,8 +440,7 @@ public class ServiceComponentImpl implements ServiceComponent { ServiceComponentResponse r = new ServiceComponentResponse(getClusterId(), cluster.getClusterName(), sg.getServiceGroupId(), sg.getServiceGroupName(), service.getServiceId(), serviceName, service.getServiceType(), getId(), getName(), getType(), sg.getStackId(), getDesiredState().toString(), - getServiceComponentStateCount(), isRecoveryEnabled(), displayName, moduleComponent.getVersion(), - getRepositoryState()); + getServiceComponentStateCount(), isRecoveryEnabled(), displayName, moduleComponent.getVersion()); return r; } @@ -602,24 +593,6 @@ public class ServiceComponentImpl implements ServiceComponent { } } - @Override - @Deprecated - @Experimental(feature = ExperimentalFeature.REPO_VERSION_REMOVAL) - public RepositoryVersionState getRepositoryState() { - ServiceComponentDesiredStateEntity component = serviceComponentDesiredStateDAO.findById( - desiredStateEntityId); - - if (null != component) { - return component.getRepositoryState(); - } else { - LOG.warn("Cannot retrieve repository state on component that may have been deleted: service {}, component {}", - service != null ? service.getName() : null, componentName); - - return null; - } - } - - private int getSCHCountByState(State state) { int count = 0; for (ServiceComponentHost sch : hostComponents.values()) { 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 0429d32..c0d0bed 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql @@ -291,7 +291,6 @@ CREATE TABLE servicecomponentdesiredstate ( service_id BIGINT NOT NULL, desired_state VARCHAR(255) NOT NULL, recovery_enabled SMALLINT NOT NULL DEFAULT 0, - repo_state VARCHAR(255) NOT NULL DEFAULT 'NOT_REQUIRED', CONSTRAINT pk_sc_desiredstate PRIMARY KEY (id), CONSTRAINT UQ_scdesiredstate_name UNIQUE(component_name, service_id, service_group_id, cluster_id), CONSTRAINT srvccmponentdesiredstatesrvcnm FOREIGN KEY (service_id, service_group_id, cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id)); 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 24d0a73..388cd4f 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql @@ -310,7 +310,6 @@ CREATE TABLE servicecomponentdesiredstate ( service_id BIGINT NOT NULL, desired_state VARCHAR(255) NOT NULL, recovery_enabled SMALLINT NOT NULL DEFAULT 0, - repo_state VARCHAR(255) NOT NULL DEFAULT 'NOT_REQUIRED', CONSTRAINT pk_sc_desiredstate PRIMARY KEY (id), CONSTRAINT UQ_scdesiredstate_name UNIQUE(component_name, service_id, service_group_id, cluster_id), CONSTRAINT srvccmponentdesiredstatesrvcnm FOREIGN KEY (service_id, service_group_id, cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id)); 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 e2acdfc..1f78626 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql @@ -290,7 +290,6 @@ CREATE TABLE servicecomponentdesiredstate ( service_id NUMBER(19) NOT NULL, desired_state VARCHAR2(255) NOT NULL, recovery_enabled SMALLINT DEFAULT 0 NOT NULL, - repo_state VARCHAR2(255) DEFAULT 'NOT_REQUIRED' NOT NULL, CONSTRAINT pk_sc_desiredstate PRIMARY KEY (id), CONSTRAINT UQ_scdesiredstate_name UNIQUE(component_name, service_id, service_group_id, cluster_id), CONSTRAINT srvccmponentdesiredstatesrvcnm FOREIGN KEY (service_id, service_group_id, cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id)); 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 d1b0bf0..0d99904 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql @@ -292,7 +292,6 @@ CREATE TABLE servicecomponentdesiredstate ( service_id BIGINT NOT NULL, desired_state VARCHAR(255) NOT NULL, recovery_enabled SMALLINT NOT NULL DEFAULT 0, - repo_state VARCHAR(255) NOT NULL DEFAULT 'NOT_REQUIRED', CONSTRAINT pk_sc_desiredstate PRIMARY KEY (id), CONSTRAINT UQ_scdesiredstate_name UNIQUE(component_name, service_id, service_group_id, cluster_id), CONSTRAINT srvccmponentdesiredstatesrvcnm FOREIGN KEY (service_id, service_group_id, cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id)); 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 5c0d7ea..2bd0b74 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql @@ -289,7 +289,6 @@ CREATE TABLE servicecomponentdesiredstate ( service_id NUMERIC(19) NOT NULL, desired_state VARCHAR(255) NOT NULL, recovery_enabled SMALLINT NOT NULL DEFAULT 0, - repo_state VARCHAR(255) NOT NULL DEFAULT 'NOT_REQUIRED', CONSTRAINT pk_sc_desiredstate PRIMARY KEY (id), CONSTRAINT UQ_scdesiredstate_name UNIQUE(component_name, service_id, service_group_id, cluster_id), CONSTRAINT srvccmponentdesiredstatesrvcnm FOREIGN KEY (service_id, service_group_id, cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id)); 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 def6392..25cc21c 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql @@ -304,7 +304,6 @@ CREATE TABLE servicecomponentdesiredstate ( service_id BIGINT NOT NULL, desired_state VARCHAR(255) NOT NULL, recovery_enabled SMALLINT NOT NULL DEFAULT 0, - repo_state VARCHAR(255) NOT NULL DEFAULT 'NOT_REQUIRED', CONSTRAINT pk_sc_desiredstate PRIMARY KEY (id), CONSTRAINT UQ_scdesiredstate_name UNIQUE(component_name, service_id, service_group_id, cluster_id), CONSTRAINT srvccmponentdesiredstatesrvcnm FOREIGN KEY (service_id, service_group_id, cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id)); diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java index 3e08926..4ec5d45 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java @@ -74,7 +74,6 @@ import org.apache.ambari.server.state.Cluster; import org.apache.ambari.server.state.Clusters; import org.apache.ambari.server.state.ComponentInfo; import org.apache.ambari.server.state.MaintenanceState; -import org.apache.ambari.server.state.RepositoryVersionState; import org.apache.ambari.server.state.Service; import org.apache.ambari.server.state.ServiceComponent; import org.apache.ambari.server.state.ServiceComponentFactory; @@ -124,8 +123,6 @@ public class ComponentResourceProviderTest { } private void testCreateResources(Authentication authentication) throws Exception { - Resource.Type type = Resource.Type.Component; - MaintenanceStateHelper maintenanceStateHelper = createNiceMock(MaintenanceStateHelper.class); AmbariManagementController managementController = createMock(AmbariManagementController.class); Clusters clusters = createNiceMock(Clusters.class); @@ -214,8 +211,6 @@ public class ComponentResourceProviderTest { } private void testGetResources(Authentication authentication) throws Exception { - Resource.Type type = Resource.Type.Component; - MaintenanceStateHelper maintenanceStateHelper = createNiceMock(MaintenanceStateHelper.class); AmbariManagementController managementController = createMock(AmbariManagementController.class); Clusters clusters = createNiceMock(Clusters.class); @@ -259,13 +254,13 @@ public class ComponentResourceProviderTest { expect(serviceComponent1.convertToResponse()).andReturn( new ServiceComponentResponse(100L, "Cluster100", 1L, "CORE", 1L, "Service100", "Service100", 1L, "Component100", "Component100", stackId, "", serviceComponentStateCountMap, - true /* recovery enabled */, "Component100 Client", null, null)); + true /* recovery enabled */, "Component100 Client", null)); expect(serviceComponent2.convertToResponse()).andReturn( new ServiceComponentResponse(100L, "Cluster100", 1L, "CORE", 1L, "Service100", "Service100", 2L, "Component101", "Component101", stackId, "", serviceComponentStateCountMap, - false /* recovery not enabled */, "Component101 Client", null, null)); + false /* recovery not enabled */, "Component101 Client", null)); expect(serviceComponent3.convertToResponse()).andReturn( new ServiceComponentResponse(100L, "Cluster100", 1L, "CORE", 1L, "Service100", "Service100", 3L, "Component102", "Component102", stackId, "", serviceComponentStateCountMap, - true /* recovery enabled */, "Component102 Client", "1.1", RepositoryVersionState.CURRENT)); + true /* recovery enabled */, "Component102 Client", "1.1")); expect(ambariMetaInfo.getComponent("FOO", "1.0", null, "Component100")).andReturn( componentInfo1); @@ -301,7 +296,6 @@ public class ComponentResourceProviderTest { propertyIds.add(ComponentResourceProvider.COMPONENT_UNKNOWN_COUNT_PROPERTY_ID); propertyIds.add(ComponentResourceProvider.COMPONENT_RECOVERY_ENABLED_ID); propertyIds.add(ComponentResourceProvider.COMPONENT_DESIRED_VERSION); - propertyIds.add(ComponentResourceProvider.COMPONENT_REPOSITORY_STATE); Predicate predicate = new PredicateBuilder() .property(ComponentResourceProvider.COMPONENT_CLUSTER_NAME_PROPERTY_ID) @@ -339,12 +333,9 @@ public class ComponentResourceProviderTest { if (resource.getPropertyValue( ComponentResourceProvider.COMPONENT_COMPONENT_NAME_PROPERTY_ID).equals("Component102")) { - Assert.assertNotNull(resource.getPropertyValue(ComponentResourceProvider.COMPONENT_REPOSITORY_STATE)); Assert.assertNotNull(resource.getPropertyValue(ComponentResourceProvider.COMPONENT_DESIRED_VERSION)); - Assert.assertEquals(RepositoryVersionState.CURRENT, resource.getPropertyValue(ComponentResourceProvider.COMPONENT_REPOSITORY_STATE)); Assert.assertEquals("1.1", resource.getPropertyValue(ComponentResourceProvider.COMPONENT_DESIRED_VERSION)); } else { - Assert.assertNull(resource.getPropertyValue(ComponentResourceProvider.COMPONENT_REPOSITORY_STATE)); Assert.assertNull(resource.getPropertyValue(ComponentResourceProvider.COMPONENT_DESIRED_VERSION)); } } @@ -370,8 +361,6 @@ public class ComponentResourceProviderTest { } private void testUpdateResources(Authentication authentication) throws Exception { - Resource.Type type = Resource.Type.Component; - MaintenanceStateHelper maintenanceStateHelper = createNiceMock(MaintenanceStateHelper.class); AmbariManagementController managementController = createMock(AmbariManagementController.class); Clusters clusters = createNiceMock(Clusters.class); @@ -439,13 +428,13 @@ public class ComponentResourceProviderTest { expect(serviceComponent1.convertToResponse()).andReturn( new ServiceComponentResponse(100L, "Cluster100", 1L, "", 1L, "Service100", "", 1L, "Component101", "Component101", stackId, "", serviceComponentStateCountMap, - false /* recovery not enabled */, "Component101 Client", null, null)); + false /* recovery not enabled */, "Component101 Client", null)); expect(serviceComponent2.convertToResponse()).andReturn( new ServiceComponentResponse(100L, "Cluster100", 1L, "", 1L, "Service100", "", 2L, "Component102", "Component102",stackId, "", serviceComponentStateCountMap, - false /* recovery not enabled */, "Component102 Client", null, null)); + false /* recovery not enabled */, "Component102 Client", null)); expect(serviceComponent3.convertToResponse()).andReturn( new ServiceComponentResponse(100L, "Cluster100", 1L, "", 1L, "Service100", "", 3L, "Component103", "Component103", stackId, "", serviceComponentStateCountMap, - false /* recovery not enabled */, "Component103 Client", null, null)); + false /* recovery not enabled */, "Component103 Client", null)); expect(serviceComponent1.getDesiredState()).andReturn(State.INSTALLED).anyTimes(); expect(serviceComponent2.getDesiredState()).andReturn(State.INSTALLED).anyTimes(); expect(serviceComponent3.getDesiredState()).andReturn(State.INSTALLED).anyTimes(); @@ -527,8 +516,6 @@ public class ComponentResourceProviderTest { } private void testSuccessDeleteResources(Authentication authentication, State hostComponentState) throws Exception { - Resource.Type type = Resource.Type.Component; - AmbariManagementController managementController = createMock(AmbariManagementController.class); MaintenanceStateHelper maintenanceStateHelper = createNiceMock(MaintenanceStateHelper.class); @@ -631,8 +618,6 @@ public class ComponentResourceProviderTest { } private void testDeleteResourcesWithEmptyClusterComponentNames(Authentication authentication) throws Exception { - Resource.Type type = Resource.Type.Component; - AmbariManagementController managementController = createMock(AmbariManagementController.class); MaintenanceStateHelper maintenanceStateHelper = createNiceMock(MaintenanceStateHelper.class); @@ -714,8 +699,6 @@ public class ComponentResourceProviderTest { * @throws Exception */ private void testUpdateAutoStart(Authentication authentication) throws Exception { - Resource.Type type = Resource.Type.Component; - MaintenanceStateHelper maintenanceStateHelper = createMock(MaintenanceStateHelper.class); AmbariManagementController managementController = createMock(AmbariManagementController.class); Clusters clusters = createMock(Clusters.class); @@ -772,7 +755,7 @@ public class ComponentResourceProviderTest { expect(serviceComponent1.convertToResponse()).andReturn( new ServiceComponentResponse(100L, "Cluster100", 1L, "", 1L, "Service100", "", 1L, "Component101", "Component101", stackId, "", serviceComponentStateCountMap, - false /* recovery not enabled */, "Component101 Client", null, null)); + false /* recovery not enabled */, "Component101 Client", null)); expect(serviceComponent1.getDesiredState()).andReturn(State.INSTALLED).anyTimes(); expect(serviceComponentHost.getState()).andReturn(State.INSTALLED).anyTimes(); @@ -956,7 +939,6 @@ public class ComponentResourceProviderTest { public static ComponentResourceProvider getComponentResourceProvider(AmbariManagementController managementController) throws AmbariException { - Resource.Type type = Resource.Type.Component; MaintenanceStateHelper maintenanceStateHelper = createNiceMock(MaintenanceStateHelper.class); expect(maintenanceStateHelper.isOperationAllowed(anyObject(Resource.Type.class), anyObject(Service.class))).andReturn(true).anyTimes(); 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 7c08bc5..78218b3 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 @@ -34,7 +34,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.ConcurrentModificationException; -import java.util.EnumSet; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -50,7 +49,6 @@ import org.apache.ambari.server.agent.AgentEnv; import org.apache.ambari.server.agent.AgentEnv.Directory; import org.apache.ambari.server.agent.DiskInfo; import org.apache.ambari.server.agent.HostInfo; -import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.controller.ClusterResponse; import org.apache.ambari.server.controller.ConfigurationResponse; import org.apache.ambari.server.controller.ServiceConfigVersionResponse; @@ -61,9 +59,7 @@ import org.apache.ambari.server.orm.GuiceJpaInitializer; import org.apache.ambari.server.orm.InMemoryDefaultTestModule; import org.apache.ambari.server.orm.OrmTestHelper; import org.apache.ambari.server.orm.dao.ClusterDAO; -import org.apache.ambari.server.orm.dao.HostComponentStateDAO; import org.apache.ambari.server.orm.dao.HostDAO; -import org.apache.ambari.server.orm.dao.RepositoryVersionDAO; import org.apache.ambari.server.orm.dao.ServiceGroupDAO; import org.apache.ambari.server.orm.dao.StackDAO; import org.apache.ambari.server.orm.entities.ClusterConfigEntity; @@ -78,7 +74,6 @@ import org.apache.ambari.server.orm.entities.StackEntity; import org.apache.ambari.server.state.AgentVersion; import org.apache.ambari.server.state.Cluster; import org.apache.ambari.server.state.Clusters; -import org.apache.ambari.server.state.ComponentInfo; import org.apache.ambari.server.state.Config; import org.apache.ambari.server.state.ConfigFactory; import org.apache.ambari.server.state.ConfigHelper; @@ -86,7 +81,6 @@ import org.apache.ambari.server.state.DesiredConfig; import org.apache.ambari.server.state.Host; import org.apache.ambari.server.state.HostHealthStatus; import org.apache.ambari.server.state.HostState; -import org.apache.ambari.server.state.RepositoryVersionState; import org.apache.ambari.server.state.Service; import org.apache.ambari.server.state.ServiceComponent; import org.apache.ambari.server.state.ServiceComponentFactory; @@ -121,9 +115,6 @@ import junit.framework.Assert; public class ClusterTest { - private static final EnumSet<RepositoryVersionState> TERMINAL_VERSION_STATES = - EnumSet.of(RepositoryVersionState.CURRENT, RepositoryVersionState.INSTALLED); - private Clusters clusters; private Cluster c1; private ServiceGroup serviceGroup; @@ -131,7 +122,6 @@ public class ClusterTest { private ServiceFactory serviceFactory; private ServiceComponentFactory serviceComponentFactory; private ServiceComponentHostFactory serviceComponentHostFactory; - private AmbariMetaInfo metaInfo; private ConfigFactory configFactory; private ConfigGroupFactory configGroupFactory; private OrmTestHelper helper; @@ -140,8 +130,6 @@ public class ClusterTest { private ServiceGroupDAO serviceGroupDAO; private HostDAO hostDAO; - private HostComponentStateDAO hostComponentStateDAO; - private RepositoryVersionDAO repositoryVersionDAO; private Gson gson; private static class MockModule extends AbstractModule { @@ -164,14 +152,11 @@ public class ClusterTest { serviceComponentHostFactory = injector.getInstance( ServiceComponentHostFactory.class); configFactory = injector.getInstance(ConfigFactory.class); - metaInfo = injector.getInstance(AmbariMetaInfo.class); helper = injector.getInstance(OrmTestHelper.class); stackDAO = injector.getInstance(StackDAO.class); clusterDAO = injector.getInstance(ClusterDAO.class); serviceGroupDAO = injector.getInstance(ServiceGroupDAO.class); hostDAO = injector.getInstance(HostDAO.class); - hostComponentStateDAO = injector.getInstance(HostComponentStateDAO.class); - repositoryVersionDAO = injector.getInstance(RepositoryVersionDAO.class); gson = injector.getInstance(Gson.class); injector.getInstance(UnitOfWork.class).begin(); } @@ -204,7 +189,7 @@ public class ClusterTest { hostAttributes.put("os_family", "redhat"); hostAttributes.put("os_release_version", "5.9"); - RepositoryVersionEntity repositoryVersion = helper.getOrCreateRepositoryVersion(stackId, stackId.getStackVersion()); + helper.getOrCreateRepositoryVersion(stackId, stackId.getStackVersion()); for (String hostName : hostNames) { clusters.addHost(hostName); @@ -278,164 +263,6 @@ public class ClusterTest { return clusterEntity; } - /** - * For Rolling Upgrades, create a cluster with the following components HDFS: - * NameNode, DataNode, HDFS Client ZK: Zookeeper Server, Zookeeper Monitor - * Ganglia: Ganglia Server, Ganglia Monitor - * - * Further, 3 hosts will be added. Finally, verify that only the Ganglia - * components do not need to advertise a version. - * - * @param clusterName - * Cluster Name - * @param repositoryVersion - * the repository to use for new services being installed in the - * cluster - * @param hostAttributes - * Host attributes to use for 3 hosts (h-1, h-2, h-3) - * @return Cluster that was created - */ - private Cluster createClusterForRU(String clusterName, StackId stackId, - Map<String, String> hostAttributes) throws Exception { - clusters.addCluster(clusterName, stackId); - Cluster cluster = clusters.getCluster(clusterName); - Assert.assertEquals(clusterName, cluster.getClusterName()); - //Assert.assertEquals(1, cluster.getClusterId()); - - // Add Hosts - List<String> hostNames = new ArrayList<String>() {{ add("h-1"); add("h-2"); add("h-3"); }}; - for(String hostName : hostNames) { - addHost(hostName, hostAttributes); - } - - // Add stack and map Hosts to cluster - cluster.setDesiredStackVersion(stackId); - cluster.setCurrentStackVersion(stackId); - for(String hostName : hostNames) { - clusters.mapHostToCluster(hostName, clusterName); - } - - // Transition all hosts to HEALTHY state - for (Host host : cluster.getHosts()) { - host.setState(HostState.HEALTHY); - } - - // Add Services - ServiceGroup serviceGroup = cluster.addServiceGroup("CORE", stackId.getStackId()); - Service s1 = serviceFactory.createNew(cluster, serviceGroup, Collections.emptyList(), "HDFS", "HDFS"); - Service s2 = serviceFactory.createNew(cluster, serviceGroup, Collections.emptyList(), "ZOOKEEPER", "ZOOKEEPER"); - Service s3 = serviceFactory.createNew(cluster, serviceGroup, Collections.emptyList(), "GANGLIA", "GANGLIA"); - cluster.addService(s1); - cluster.addService(s2); - cluster.addService(s3); - - // Add HDFS components - ServiceComponent sc1CompA = serviceComponentFactory.createNew(s1, "NAMENODE", "NAMENODE"); - ServiceComponent sc1CompB = serviceComponentFactory.createNew(s1, "DATANODE", "DATANODE"); - ServiceComponent sc1CompC = serviceComponentFactory.createNew(s1, "HDFS_CLIENT", "HDFS_CLIENT"); - s1.addServiceComponent(sc1CompA); - s1.addServiceComponent(sc1CompB); - s1.addServiceComponent(sc1CompC); - - // Add ZK - ServiceComponent sc2CompA = serviceComponentFactory.createNew(s2, "ZOOKEEPER_SERVER", "ZOOKEEPER_SERVER"); - ServiceComponent sc2CompB = serviceComponentFactory.createNew(s2, "ZOOKEEPER_CLIENT", "ZOOKEEPER_CLIENT"); - s2.addServiceComponent(sc2CompA); - s2.addServiceComponent(sc2CompB); - - // Add Ganglia - ServiceComponent sc3CompA = serviceComponentFactory.createNew(s3, "GANGLIA_SERVER", "GANGLIA_SERVER"); - ServiceComponent sc3CompB = serviceComponentFactory.createNew(s3, "GANGLIA_MONITOR", "GANGLIA_MONITOR"); - s3.addServiceComponent(sc3CompA); - s3.addServiceComponent(sc3CompB); - - // Host 1 will have all components - ServiceComponentHost schHost1Serv1CompA = serviceComponentHostFactory.createNew(sc1CompA, "h-1"); - ServiceComponentHost schHost1Serv1CompB = serviceComponentHostFactory.createNew(sc1CompB, "h-1"); - ServiceComponentHost schHost1Serv1CompC = serviceComponentHostFactory.createNew(sc1CompC, "h-1"); - ServiceComponentHost schHost1Serv2CompA = serviceComponentHostFactory.createNew(sc2CompA, "h-1"); - ServiceComponentHost schHost1Serv2CompB = serviceComponentHostFactory.createNew(sc2CompB, "h-1"); - ServiceComponentHost schHost1Serv3CompA = serviceComponentHostFactory.createNew(sc3CompA, "h-1"); - ServiceComponentHost schHost1Serv3CompB = serviceComponentHostFactory.createNew(sc3CompB, "h-1"); - sc1CompA.addServiceComponentHost(schHost1Serv1CompA); - sc1CompB.addServiceComponentHost(schHost1Serv1CompB); - sc1CompC.addServiceComponentHost(schHost1Serv1CompC); - sc2CompA.addServiceComponentHost(schHost1Serv2CompA); - sc2CompB.addServiceComponentHost(schHost1Serv2CompB); - sc3CompA.addServiceComponentHost(schHost1Serv3CompA); - sc3CompB.addServiceComponentHost(schHost1Serv3CompB); - - // Host 2 will have ZK_CLIENT and GANGLIA_MONITOR - ServiceComponentHost schHost2Serv2CompB = serviceComponentHostFactory.createNew(sc2CompB, "h-2"); - ServiceComponentHost schHost2Serv3CompB = serviceComponentHostFactory.createNew(sc3CompB, "h-2"); - sc2CompB.addServiceComponentHost(schHost2Serv2CompB); - sc3CompB.addServiceComponentHost(schHost2Serv3CompB); - - // Host 3 will have GANGLIA_MONITOR - ServiceComponentHost schHost3Serv3CompB = serviceComponentHostFactory.createNew(sc3CompB, "h-3"); - sc3CompB.addServiceComponentHost(schHost3Serv3CompB); - - // Verify count of components - List<ServiceComponentHost> scHost1 = cluster.getServiceComponentHosts("h-1"); - Assert.assertEquals(7, scHost1.size()); - - List<ServiceComponentHost> scHost2 = cluster.getServiceComponentHosts("h-2"); - Assert.assertEquals(2, scHost2.size()); - - List<ServiceComponentHost> scHost3 = cluster.getServiceComponentHosts("h-3"); - Assert.assertEquals(1, scHost3.size()); - - //<editor-fold desc="Validate Version Advertised"> - /* - 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<>(); - 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"); }}; - Set<String> gangliaComponents = new HashSet<String>() {{ add("GANGLIA_SERVER"); add("GANGLIA_MONITOR"); }}; - - componentsThatAdvertiseVersion.put("HDFS", hdfsComponents); - componentsThatAdvertiseVersion.put("ZOOKEEPER", zkComponents); - componentsThatDontAdvertiseVersion.put("GANGLIA", gangliaComponents); - - for(String service : componentsThatAdvertiseVersion.keySet()) { - Set<String> components = componentsThatAdvertiseVersion.get(service); - for(String componentName : components) { - ComponentInfo component = metaInfo.getComponent(stackId.getStackName(), stackId.getStackVersion(), service, componentName); - Assert.assertTrue(component.isVersionAdvertised()); - } - } - - for(String service : componentsThatDontAdvertiseVersion.keySet()) { - Set<String> components = componentsThatDontAdvertiseVersion.get(service); - for(String componentName : components) { - ComponentInfo component = metaInfo.getComponent(stackId.getStackName(), stackId.getStackVersion(), service, componentName); - Assert.assertFalse(component.isVersionAdvertised()); - } - } - //</editor-fold> - - return cluster; - } - - /** - * Add a host to the system with the provided attributes. - * @param hostName Host Name - * @param hostAttributes Host Attributes - */ - private Host addHost(String hostName, Map<String, String> hostAttributes) throws Exception { - clusters.addHost(hostName); - Host host = clusters.getHost(hostName); - host.setIPv4("ipv4"); - host.setIPv6("ipv6"); - host.setHostAttributes(hostAttributes); - - return host; - } - @Test public void testAddHost() throws Exception { createDefaultCluster(); @@ -881,7 +708,7 @@ public class ClusterTest { Config config2 = configFactory.createNew(c1, "global", "version2", new HashMap<String, String>() {{ put("x", "y"); }}, c2PropAttributes); - Config config3 = configFactory.createNew(c1, "core-site", "version2", + configFactory.createNew(c1, "core-site", "version2", new HashMap<String, String>() {{ put("x", "y"); }}, new HashMap<>()); c1.addDesiredConfig("_test", Collections.singleton(config1)); @@ -1011,7 +838,7 @@ public class ClusterTest { c1.addService(serviceGroup, "MAPREDUCE", "MAPREDUCE"); Service hdfs = c1.addService(serviceGroup, "HDFS", "HDFS"); - ServiceComponent nameNode = hdfs.addServiceComponent("NAMENODE", "NAMENODE"); + hdfs.addServiceComponent("NAMENODE", "NAMENODE"); assertEquals(2, c1.getServices().size()); assertEquals(2, injector.getProvider(EntityManager.class).get(). @@ -1510,7 +1337,7 @@ public class ClusterTest { // add a service String serviceName = "ZOOKEEPER"; ServiceGroup serviceGroup = cluster.getServiceGroup("CORE"); - Service service = cluster.addService(serviceGroup, serviceName, serviceName); + cluster.addService(serviceGroup, serviceName, serviceName); String configType = "zoo.cfg"; ClusterConfigEntity clusterConfig1 = new ClusterConfigEntity(); @@ -1606,9 +1433,9 @@ public class ClusterTest { // add a service String serviceName = "ZOOKEEPER"; - RepositoryVersionEntity repositoryVersion = helper.getOrCreateRepositoryVersion(c1); + helper.getOrCreateRepositoryVersion(c1); ServiceGroup serviceGroup = cluster.getServiceGroup("CORE"); - Service service = cluster.addService(serviceGroup, serviceName, serviceName); + cluster.addService(serviceGroup, serviceName, serviceName); String configType = "zoo.cfg"; // create 5 configurations in the current stack @@ -1708,7 +1535,7 @@ public class ClusterTest { String serviceName = "ZOOKEEPER"; RepositoryVersionEntity repositoryVersion = helper.getOrCreateRepositoryVersion(c1); ServiceGroup serviceGroup = cluster.getServiceGroup("CORE"); - Service service = cluster.addService(serviceGroup, serviceName, serviceName); + cluster.addService(serviceGroup, serviceName, serviceName); String configType = "zoo.cfg"; Map<String, String> properties = new HashMap<>(); @@ -1792,9 +1619,9 @@ public class ClusterTest { // add a service String serviceName = "ZOOKEEPER"; - RepositoryVersionEntity repositoryVersion = helper.getOrCreateRepositoryVersion(c1); + helper.getOrCreateRepositoryVersion(c1); ServiceGroup serviceGroup = cluster.getServiceGroup("CORE"); - Service service = cluster.addService(serviceGroup, serviceName, serviceName); + cluster.addService(serviceGroup, serviceName, serviceName); String configType = "zoo.cfg"; ClusterConfigEntity clusterConfig = new ClusterConfigEntity(); -- To stop receiving notification emails like this one, please contact jonathanhur...@apache.org.