This is an automated email from the ASF dual-hosted git repository.
mpapirkovskyy pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new d50333d AMBARI-23405. Add ability to use latest configs for execution
commands. (mpapirkovskyy)
d50333d is described below
commit d50333d021a3118b7cc86c708cd817448e8add2f
Author: Myroslav Papirkovskyi <mpapirkovs...@apache.org>
AuthorDate: Thu Mar 29 17:03:05 2018 +0300
AMBARI-23405. Add ability to use latest configs for execution commands.
(mpapirkovskyy)
---
.../MessageDestinationIsNotDefinedException.java | 4 +-
.../server/actionmanager/ActionDBAccessorImpl.java | 6 +--
.../ambari/server/agent/ExecutionCommand.java | 12 ++++++
.../ambari/server/agent/HeartBeatHandler.java | 6 +--
.../server/agent/stomp/AgentClusterDataHolder.java | 10 ++---
.../server/agent/stomp/AgentHostDataHolder.java | 16 ++++----
.../ambari/server/agent/stomp/TopologyHolder.java | 2 +-
.../configuration/spring/ApiStompConfig.java | 6 +--
.../configuration/spring/RootStompConfig.java | 6 +--
.../AmbariCustomCommandExecutionHelper.java | 7 +++-
.../controller/AmbariManagementController.java | 2 +-
.../controller/AmbariManagementControllerImpl.java | 21 ++++++-----
.../internal/AlertGroupResourceProvider.java | 6 +--
.../internal/HostComponentResourceProvider.java | 16 ++++----
.../internal/ServiceResourceProvider.java | 2 +-
.../internal/UpgradeResourceProvider.java | 10 ++---
.../ambari/server/events/AgentActionEvent.java | 2 +-
.../server/events/AgentConfigsUpdateEvent.java | 2 +-
.../events/AlertDefinitionsAgentUpdateEvent.java | 2 +-
.../events/AlertDefinitionsUIUpdateEvent.java | 2 +-
.../server/events/AlertGroupsUpdateEvent.java | 2 +-
.../ambari/server/events/AlertUpdateEvent.java | 2 +-
.../ambari/server/events/ConfigsUpdateEvent.java | 2 +-
.../server/events/DefaultMessageEmitter.java | 44 +++++++++++-----------
.../server/events/ExecutionCommandEvent.java | 2 +-
.../server/events/HostComponentsUpdateEvent.java | 2 +-
.../server/events/HostLevelParamsUpdateEvent.java | 2 +-
.../ambari/server/events/HostUpdateEvent.java | 2 +-
.../ambari/server/events/MessageEmitter.java | 6 +--
.../ambari/server/events/MetadataUpdateEvent.java | 2 +-
.../ambari/server/events/RequestUpdateEvent.java | 2 +-
.../{AmbariUpdateEvent.java => STOMPEvent.java} | 4 +-
...ariHostUpdateEvent.java => STOMPHostEvent.java} | 4 +-
.../ambari/server/events/ServiceUpdateEvent.java | 2 +-
.../ambari/server/events/TopologyUpdateEvent.java | 2 +-
.../ambari/server/events/UpgradeUpdateEvent.java | 2 +-
.../alerts/AlertDefinitionsUIUpdateListener.java | 10 ++---
.../alerts/AlertGroupsUpdateListener.java | 6 +--
.../listeners/alerts/AlertReceivedListener.java | 6 +--
.../HostComponentsUpdateListener.java | 14 +++----
.../events/listeners/hosts/HostUpdateListener.java | 16 ++++----
...pdateListener.java => STOMPUpdateListener.java} | 16 ++++----
.../listeners/services/ServiceUpdateListener.java | 14 +++----
.../events/listeners/tasks/TaskStatusListener.java | 10 ++---
.../listeners/upgrade/UpgradeUpdateListener.java | 12 +++---
.../events/publishers/AgentCommandsPublisher.java | 4 +-
...entPublisher.java => STOMPUpdatePublisher.java} | 14 +++----
.../metrics/system/impl/MetricsServiceImpl.java | 6 +--
.../system/impl/StompEventsMetricsSource.java | 12 +++---
.../ambari/server/orm/dao/AlertDefinitionDAO.java | 6 +--
.../ambari/server/orm/dao/AlertDispatchDAO.java | 16 ++++----
.../apache/ambari/server/state/ConfigHelper.java | 6 +--
.../ambari/server/state/cluster/ClusterImpl.java | 10 ++---
.../svccomphost/ServiceComponentHostImpl.java | 8 ++--
.../ambari/server/agent/TestHeartbeatHandler.java | 2 +-
.../HostComponentResourceProviderTest.java | 4 +-
.../internal/ServiceResourceProviderTest.java | 6 +--
.../listeners/tasks/TaskStatusListenerTest.java | 4 +-
.../ambari/server/state/ConfigHelperTest.java | 4 +-
.../server/upgrade/UpgradeCatalog260Test.java | 4 +-
60 files changed, 226 insertions(+), 206 deletions(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/MessageDestinationIsNotDefinedException.java
b/ambari-server/src/main/java/org/apache/ambari/server/MessageDestinationIsNotDefinedException.java
index 7369bbc..1df1f21 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/MessageDestinationIsNotDefinedException.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/MessageDestinationIsNotDefinedException.java
@@ -18,12 +18,12 @@
package org.apache.ambari.server;
-import org.apache.ambari.server.events.AmbariUpdateEvent;
+import org.apache.ambari.server.events.STOMPEvent;
@SuppressWarnings("serial")
public class MessageDestinationIsNotDefinedException extends
ObjectNotFoundException {
- public MessageDestinationIsNotDefinedException(AmbariUpdateEvent.Type
eventType) {
+ public MessageDestinationIsNotDefinedException(STOMPEvent.Type eventType) {
super(String.format("No destination defined for message with {} type",
eventType));
}
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
index 6c8935f..96a02be 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
@@ -48,7 +48,7 @@ import org.apache.ambari.server.events.RequestFinishedEvent;
import org.apache.ambari.server.events.RequestUpdateEvent;
import org.apache.ambari.server.events.TaskCreateEvent;
import org.apache.ambari.server.events.publishers.AmbariEventPublisher;
-import org.apache.ambari.server.events.publishers.StateUpdateEventPublisher;
+import org.apache.ambari.server.events.publishers.STOMPUpdatePublisher;
import org.apache.ambari.server.events.publishers.TaskEventPublisher;
import org.apache.ambari.server.orm.dao.ClusterDAO;
import org.apache.ambari.server.orm.dao.ExecutionCommandDAO;
@@ -138,7 +138,7 @@ public class ActionDBAccessorImpl implements
ActionDBAccessor {
AuditLogger auditLogger;
@Inject
- StateUpdateEventPublisher stateUpdateEventPublisher;
+ STOMPUpdatePublisher STOMPUpdatePublisher;
@Inject
TopologyManager topologyManager;
@@ -435,7 +435,7 @@ public class ActionDBAccessorImpl implements
ActionDBAccessor {
TaskCreateEvent taskCreateEvent = new TaskCreateEvent(hostRoleCommands);
taskEventPublisher.publish(taskCreateEvent);
List<HostRoleCommandEntity> hostRoleCommandEntities =
hostRoleCommandDAO.findByRequest(requestEntity.getRequestId());
- stateUpdateEventPublisher.publish(new RequestUpdateEvent(requestEntity,
+ STOMPUpdatePublisher.publish(new RequestUpdateEvent(requestEntity,
hostRoleCommandDAO, topologyManager, clusterName,
hostRoleCommandEntities));
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
b/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
index b016b7c..4b94207 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
@@ -195,6 +195,9 @@ public class ExecutionCommand extends AgentCommand {
@SerializedName("roleParameters")
private Map<String, Object> roleParameters;
+ @SerializedName("useLatestConfigs")
+ private Boolean useLatestConfigs = null;
+
public void setConfigurationCredentials(Map<String, Map<String, String>>
configurationCredentials) {
this.configurationCredentials = configurationCredentials;
}
@@ -476,6 +479,15 @@ public class ExecutionCommand extends AgentCommand {
roleParameters = params;
}
+
+ public Boolean getUseLatestConfigs() {
+ return useLatestConfigs;
+ }
+
+ public void setUseLatestConfigs(Boolean useLatestConfigs) {
+ this.useLatestConfigs = useLatestConfigs;
+ }
+
/**
* Contains key name strings. These strings are used inside maps
* incapsulated inside command.
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
index 35ab8f0..918a8fa 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
@@ -30,7 +30,7 @@ import
org.apache.ambari.server.agent.stomp.dto.HostStatusReport;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.configuration.Configuration;
import org.apache.ambari.server.events.AgentActionEvent;
-import org.apache.ambari.server.events.publishers.StateUpdateEventPublisher;
+import org.apache.ambari.server.events.publishers.STOMPUpdatePublisher;
import org.apache.ambari.server.state.AgentVersion;
import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.Clusters;
@@ -90,7 +90,7 @@ public class HeartBeatHandler {
private RecoveryConfigHelper recoveryConfigHelper;
@Inject
- private StateUpdateEventPublisher stateUpdateEventPublisher;
+ private STOMPUpdatePublisher STOMPUpdatePublisher;
@Inject
private AgentSessionManager agentSessionManager;
@@ -184,7 +184,7 @@ public class HeartBeatHandler {
if (hostObject.getState().equals(HostState.HEARTBEAT_LOST)) {
// After loosing heartbeat agent should reregister
LOG.warn("Host {} is in HEARTBEAT_LOST state - sending register
command", hostname);
- stateUpdateEventPublisher.publish(new
AgentActionEvent(AgentActionEvent.AgentAction.RESTART_AGENT,
+ STOMPUpdatePublisher.publish(new
AgentActionEvent(AgentActionEvent.AgentAction.RESTART_AGENT,
hostObject.getHostId()));
return createRegisterCommand();
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentClusterDataHolder.java
b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentClusterDataHolder.java
index 0b90b6d..d4d3e6b 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentClusterDataHolder.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentClusterDataHolder.java
@@ -26,17 +26,17 @@ import javax.inject.Inject;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.agent.stomp.dto.Hashable;
-import org.apache.ambari.server.events.AmbariUpdateEvent;
-import org.apache.ambari.server.events.publishers.StateUpdateEventPublisher;
+import org.apache.ambari.server.events.STOMPEvent;
+import org.apache.ambari.server.events.publishers.STOMPUpdatePublisher;
/**
* Is used to saving and updating last version of event in cluster scope
* @param <T> event with hash to control version
*/
-public abstract class AgentClusterDataHolder<T extends AmbariUpdateEvent &
Hashable> extends AgentDataHolder<T> {
+public abstract class AgentClusterDataHolder<T extends STOMPEvent & Hashable>
extends AgentDataHolder<T> {
@Inject
- protected StateUpdateEventPublisher stateUpdateEventPublisher;
+ protected STOMPUpdatePublisher STOMPUpdatePublisher;
private T data;
@@ -75,7 +75,7 @@ public abstract class AgentClusterDataHolder<T extends
AmbariUpdateEvent & Hasha
if (changed) {
regenerateHash();
update.setHash(getData().getHash());
- stateUpdateEventPublisher.publish(update);
+ STOMPUpdatePublisher.publish(update);
}
return changed;
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentHostDataHolder.java
b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentHostDataHolder.java
index 20c9877..4396be3 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentHostDataHolder.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentHostDataHolder.java
@@ -26,9 +26,9 @@ import javax.inject.Inject;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.agent.stomp.dto.Hashable;
-import org.apache.ambari.server.events.AmbariHostUpdateEvent;
-import org.apache.ambari.server.events.AmbariUpdateEvent;
-import org.apache.ambari.server.events.publishers.StateUpdateEventPublisher;
+import org.apache.ambari.server.events.STOMPEvent;
+import org.apache.ambari.server.events.STOMPHostEvent;
+import org.apache.ambari.server.events.publishers.STOMPUpdatePublisher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,11 +36,11 @@ import org.slf4j.LoggerFactory;
* Is used to saving and updating last version of event in host scope
* @param <T> event with hash to control version
*/
-public abstract class AgentHostDataHolder<T extends AmbariHostUpdateEvent &
Hashable> extends AgentDataHolder<T> {
+public abstract class AgentHostDataHolder<T extends STOMPHostEvent & Hashable>
extends AgentDataHolder<T> {
public static final Logger LOG =
LoggerFactory.getLogger(AgentHostDataHolder.class);
@Inject
- private StateUpdateEventPublisher stateUpdateEventPublisher;
+ private STOMPUpdatePublisher STOMPUpdatePublisher;
private final Map<Long, T> data = new ConcurrentHashMap<>();
@@ -74,10 +74,10 @@ public abstract class AgentHostDataHolder<T extends
AmbariHostUpdateEvent & Hash
T hostData = getData(update.getHostId());
regenerateDataIdentifiers(hostData);
setIdentifiersToEventUpdate(update, hostData);
- if (update.getType().equals(AmbariUpdateEvent.Type.AGENT_CONFIGS)) {
+ if (update.getType().equals(STOMPEvent.Type.AGENT_CONFIGS)) {
LOG.info("Configs update with hash {} will be sent to host {}",
update.getHash(), hostData.getHostId());
}
- stateUpdateEventPublisher.publish(update);
+ STOMPUpdatePublisher.publish(update);
} else {
// in case update does not have changes empty identifiers should be
populated anyway
T hostData = getData(update.getHostId());
@@ -97,7 +97,7 @@ public abstract class AgentHostDataHolder<T extends
AmbariHostUpdateEvent & Hash
public final void resetData(Long hostId) throws AmbariException {
T newData = getCurrentData(hostId);
data.replace(hostId, newData);
- stateUpdateEventPublisher.publish(newData);
+ STOMPUpdatePublisher.publish(newData);
}
/**
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/TopologyHolder.java
b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/TopologyHolder.java
index 0fcf3ec..4856440 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/TopologyHolder.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/TopologyHolder.java
@@ -131,7 +131,7 @@ public class TopologyHolder extends
AgentClusterDataHolder<TopologyUpdateEvent>
copiedUpdate.getEventType()
);
prepareAgentTopology(topologyAgentUpdateEvent);
- stateUpdateEventPublisher.publish(topologyAgentUpdateEvent);
+ STOMPUpdatePublisher.publish(topologyAgentUpdateEvent);
}
return changed;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/ApiStompConfig.java
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/ApiStompConfig.java
index 38a3673..3c699ad 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/ApiStompConfig.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/ApiStompConfig.java
@@ -18,7 +18,7 @@
package org.apache.ambari.server.configuration.spring;
import org.apache.ambari.server.api.stomp.TestController;
-import org.apache.ambari.server.events.listeners.requests.StateUpdateListener;
+import org.apache.ambari.server.events.listeners.requests.STOMPUpdateListener;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@@ -45,8 +45,8 @@ public class ApiStompConfig extends
AbstractWebSocketMessageBrokerConfigurer {
}
@Bean
- public StateUpdateListener requestStatusListener(Injector injector) {
- return new StateUpdateListener(injector);
+ public STOMPUpdateListener requestSTOMPListener(Injector injector) {
+ return new STOMPUpdateListener(injector);
}
@Override
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/RootStompConfig.java
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/RootStompConfig.java
index db074ff..1a3de67 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/RootStompConfig.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/RootStompConfig.java
@@ -26,7 +26,7 @@ import org.apache.ambari.server.agent.AgentSessionManager;
import org.apache.ambari.server.agent.stomp.AmbariSubscriptionRegistry;
import org.apache.ambari.server.api.AmbariSendToMethodReturnValueHandler;
import org.apache.ambari.server.events.DefaultMessageEmitter;
-import org.apache.ambari.server.events.listeners.requests.StateUpdateListener;
+import org.apache.ambari.server.events.listeners.requests.STOMPUpdateListener;
import org.eclipse.jetty.websocket.server.WebSocketServerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -63,8 +63,8 @@ public class RootStompConfig {
}
@Bean
- public StateUpdateListener requestStatusListener(Injector injector) {
- return new StateUpdateListener(injector);
+ public STOMPUpdateListener requestSTOMPListener(Injector injector) {
+ return new STOMPUpdateListener(injector);
}
@Bean
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
index eb47a33..61b14c4 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
@@ -667,7 +667,7 @@ public class AmbariCustomCommandExecutionHelper {
Map<String, String> actionParameters =
actionExecutionContext.getParameters();
addServiceCheckAction(stage, preferredHostName, smokeTestRole,
nowTimestamp, serviceName, componentName,
actionParameters, actionExecutionContext.isRetryAllowed(),
- actionExecutionContext.isFailureAutoSkipped());
+ actionExecutionContext.isFailureAutoSkipped(),false);
}
/**
@@ -717,7 +717,7 @@ public class AmbariCustomCommandExecutionHelper {
*/
public void addServiceCheckAction(Stage stage, String hostname, String
smokeTestRole,
long nowTimestamp, String serviceName, String componentName,
- Map<String, String> actionParameters, boolean retryAllowed, boolean
autoSkipFailure)
+ Map<String, String> actionParameters, boolean retryAllowed, boolean
autoSkipFailure, boolean useLatestConfigs)
throws AmbariException {
String clusterName = stage.getClusterName();
@@ -826,6 +826,9 @@ public class AmbariCustomCommandExecutionHelper {
if (actionParameters != null) { // If defined
execCmd.setRoleParams(actionParameters);
}
+ if (useLatestConfigs) {
+ execCmd.setUseLatestConfigs(useLatestConfigs);
+ }
}
private Set<String> getHostList(Map<String, String> cmdParameters, String
key) {
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementController.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementController.java
index 42d0cf4..8cff3f2 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementController.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementController.java
@@ -609,7 +609,7 @@ public interface AmbariManagementController {
Map<State, List<ServiceComponent>>
changedComponents,
Map<String, Map<State,
List<ServiceComponentHost>>> changedHosts,
Collection<ServiceComponentHost> ignoredHosts,
- boolean runSmokeTest, boolean reconfigureClients)
throws AmbariException;
+ boolean runSmokeTest, boolean reconfigureClients,
boolean useGeneratedConfigs) throws AmbariException;
/**
* Getter for the url of JDK, stored at server resources folder
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index 006c4ff..0bd6ae0 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -2371,8 +2371,8 @@ public class AmbariManagementControllerImpl implements
AmbariManagementControlle
RepositoryVersionEntity repoVersion,
boolean isUpgradeSuspended,
DatabaseType databaseType,
- Map<String, DesiredConfig>
clusterDesiredConfigs
- )
+ Map<String, DesiredConfig>
clusterDesiredConfigs,
+ boolean useLatestConfigs)
throws AmbariException {
String serviceName = scHost.getServiceName();
@@ -2616,6 +2616,9 @@ public class AmbariManagementControllerImpl implements
AmbariManagementControlle
LOG.debug("AmbariManagementControllerImpl.createHostAction: created
ExecutionCommand for host {}, role {}, roleCommand {}, and command ID {}, with
cluster-env tags {}",
execCmd.getHostname(), execCmd.getRole(), execCmd.getRoleCommand(),
execCmd.getCommandId(),
execCmd.getConfigurationTags().get("cluster-env").get("tag"));
}
+ if (useLatestConfigs) {
+ execCmd.setUseLatestConfigs(useLatestConfigs);
+ }
}
/**
@@ -2722,7 +2725,7 @@ public class AmbariManagementControllerImpl implements
AmbariManagementControlle
Map<String, Map<State, List<ServiceComponentHost>>> changedScHosts,
Map<String, String> requestParameters,
Map<String, String> requestProperties,
- boolean runSmokeTest, boolean reconfigureClients)
+ boolean runSmokeTest, boolean reconfigureClients, boolean
useLatestConfigs)
throws AmbariException {
@@ -3109,7 +3112,7 @@ public class AmbariManagementControllerImpl implements
AmbariManagementControlle
createHostAction(cluster, stage, scHost, configurations,
configurationAttributes, configTags,
roleCommand, requestParameters, event, skipFailure,
repoVersion, isUpgradeSuspended,
- databaseType, clusterDesiredConfigs);
+ databaseType, clusterDesiredConfigs, useLatestConfigs);
}
}
@@ -3141,7 +3144,7 @@ public class AmbariManagementControllerImpl implements
AmbariManagementControlle
}
customCommandExecutionHelper.addServiceCheckAction(stage, clientHost,
smokeTestRole,
- nowTimestamp, serviceName, componentName, null, false, false);
+ nowTimestamp, serviceName, componentName, null, false, false,
useLatestConfigs);
}
RoleCommandOrder rco = getRoleCommandOrder(cluster);
@@ -3266,7 +3269,7 @@ public class AmbariManagementControllerImpl implements
AmbariManagementControlle
Map<String, DesiredConfig> clusterDesiredConfigs =
cluster.getDesiredConfigs();
createHostAction(cluster, stage, scHost, configurations,
configurationAttributes, configTags,
roleCommand, null, null, false, repoVersion,
isUpgradeSuspended, databaseType,
- clusterDesiredConfigs);
+ clusterDesiredConfigs, false);
ExecutionCommand ec =
stage.getExecutionCommands().get(scHost.getHostName()).get(0).getExecutionCommand();
// createHostAction does not take a hostLevelParams but creates one
@@ -3461,7 +3464,7 @@ public class AmbariManagementControllerImpl implements
AmbariManagementControlle
boolean runSmokeTest,
boolean reconfigureClients) throws AmbariException {
RequestStageContainer request = addStages(null, cluster,
requestProperties, requestParameters, changedServices,
- changedComponents, changedHosts, ignoredHosts, runSmokeTest,
reconfigureClients);
+ changedComponents, changedHosts, ignoredHosts, runSmokeTest,
reconfigureClients, false);
request.persist();
return request.getRequestStatusResponse();
@@ -3473,7 +3476,7 @@ public class AmbariManagementControllerImpl implements
AmbariManagementControlle
Map<State, List<ServiceComponent>>
changedComponents,
Map<String, Map<State,
List<ServiceComponentHost>>> changedHosts,
Collection<ServiceComponentHost>
ignoredHosts, boolean runSmokeTest,
- boolean reconfigureClients) throws
AmbariException {
+ boolean reconfigureClients, boolean
useGeneratedConfigs) throws AmbariException {
if (requestStages == null) {
requestStages = new
RequestStageContainer(actionManager.getNextRequestId(), null, requestFactory,
actionManager);
@@ -3481,7 +3484,7 @@ public class AmbariManagementControllerImpl implements
AmbariManagementControlle
requestStages = doStageCreation(requestStages, cluster, changedServices,
changedComponents,
changedHosts, requestParameters, requestProperties,
- runSmokeTest, reconfigureClients);
+ runSmokeTest, reconfigureClients, useGeneratedConfigs);
updateServiceStates(cluster, changedServices, changedComponents,
changedHosts, ignoredHosts);
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertGroupResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertGroupResourceProvider.java
index 84da0ed..06b23a5 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertGroupResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertGroupResourceProvider.java
@@ -45,7 +45,7 @@ import
org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
import org.apache.ambari.server.events.AlertGroupsUpdateEvent;
import org.apache.ambari.server.events.UpdateEventType;
-import org.apache.ambari.server.events.publishers.StateUpdateEventPublisher;
+import org.apache.ambari.server.events.publishers.STOMPUpdatePublisher;
import org.apache.ambari.server.orm.dao.AlertDefinitionDAO;
import org.apache.ambari.server.orm.dao.AlertDispatchDAO;
import org.apache.ambari.server.orm.entities.AlertDefinitionEntity;
@@ -127,7 +127,7 @@ public class AlertGroupResourceProvider extends
private static AlertDefinitionDAO s_definitionDao;
@Inject
- private static StateUpdateEventPublisher stateUpdateEventPublisher;
+ private static STOMPUpdatePublisher STOMPUpdatePublisher;
/**
* Constructor.
@@ -415,7 +415,7 @@ public class AlertGroupResourceProvider extends
AlertGroupsUpdateEvent alertGroupsUpdateEvent = new
AlertGroupsUpdateEvent(Collections.singletonList(
new AlertGroupUpdate(entity)),
UpdateEventType.UPDATE);
- stateUpdateEventPublisher.publish(alertGroupsUpdateEvent);
+ STOMPUpdatePublisher.publish(alertGroupsUpdateEvent);
}
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
index dffde24..ac63043 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
@@ -317,7 +317,7 @@ public class HostComponentResourceProvider extends
AbstractControllerResourcePro
throw new IllegalArgumentException("Received an update request with no
properties");
}
- RequestStageContainer requestStages = doUpdateResources(null, request,
predicate, false);
+ RequestStageContainer requestStages = doUpdateResources(null, request,
predicate, false, false);
RequestStatusResponse response = null;
if (requestStages != null) {
@@ -401,7 +401,9 @@ public class HostComponentResourceProvider extends
AbstractControllerResourcePro
try {
LOG.info("Installing all components on host: " + hostname);
- requestStages = doUpdateResources(null, installRequest,
installPredicate, true);
+
+ // we need send special parameters to send install/start commands with
configs
+ requestStages = doUpdateResources(null, installRequest,
installPredicate, true, true);
notifyUpdate(Resource.Type.HostComponent, installRequest,
installPredicate);
try {
requestStages.persist();
@@ -478,7 +480,7 @@ public class HostComponentResourceProvider extends
AbstractControllerResourcePro
}
- requestStages = doUpdateResources(null, startRequest, startPredicate,
true);
+ requestStages = doUpdateResources(null, startRequest, startPredicate,
true, true);
notifyUpdate(Resource.Type.HostComponent, startRequest, startPredicate);
try {
requestStages.persist();
@@ -514,7 +516,7 @@ public class HostComponentResourceProvider extends
AbstractControllerResourcePro
protected RequestStageContainer updateHostComponents(RequestStageContainer
stages,
Set<ServiceComponentHostRequest> requests,
Map<String, String> requestProperties,
- boolean
runSmokeTest) throws AmbariException, AuthorizationException {
+ boolean
runSmokeTest, boolean useGeneratedConfigs) throws AmbariException,
AuthorizationException {
Clusters clusters = getManagementController().getClusters();
@@ -694,7 +696,7 @@ public class HostComponentResourceProvider extends
AbstractControllerResourcePro
return getManagementController().addStages(
stages, cluster, requestProperties, null, null, null,
- changedScHosts, ignoredScHosts, runSmokeTest, false);
+ changedScHosts, ignoredScHosts, runSmokeTest, false,
useGeneratedConfigs);
}
@Override
@@ -790,7 +792,7 @@ public class HostComponentResourceProvider extends
AbstractControllerResourcePro
* @throws NoSuchParentResourceException a specified parent resource
doesn't exist
*/
private RequestStageContainer doUpdateResources(final RequestStageContainer
stages, final Request request,
- Predicate predicate, boolean
performQueryEvaluation)
+ Predicate predicate, boolean
performQueryEvaluation, boolean useGeneratedConfigs)
throws
UnsupportedPropertyException,
SystemException,
NoSuchResourceException,
@@ -840,7 +842,7 @@ public class HostComponentResourceProvider extends
AbstractControllerResourcePro
RequestStageContainer stageContainer = null;
try {
stageContainer = updateHostComponents(stages, requests,
request.getRequestInfoProperties(),
- runSmokeTest);
+ runSmokeTest, useGeneratedConfigs);
} catch (Exception e) {
LOG.info("Caught an exception while updating host components, will
not try again: {}", e.getMessage(), e);
// !!! IllegalArgumentException results in a 400 response,
RuntimeException results in 500.
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
index f6fbce0..28e97cb 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
@@ -796,7 +796,7 @@ public class ServiceResourceProvider extends
AbstractControllerResourceProvider
return controller.addStages(requestStages, cluster, requestProperties,
null, changedServices, changedComps, changedScHosts,
- ignoredScHosts, runSmokeTest, reconfigureClients);
+ ignoredScHosts, runSmokeTest, reconfigureClients, false);
}
private void updateServiceComponents(RequestStageContainer requestStages,
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
index bfe5620..869b256 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
@@ -64,7 +64,7 @@ import
org.apache.ambari.server.controller.spi.SystemException;
import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
import org.apache.ambari.server.events.UpdateEventType;
import org.apache.ambari.server.events.UpgradeUpdateEvent;
-import org.apache.ambari.server.events.publishers.StateUpdateEventPublisher;
+import org.apache.ambari.server.events.publishers.STOMPUpdatePublisher;
import org.apache.ambari.server.orm.dao.HostRoleCommandDAO;
import org.apache.ambari.server.orm.dao.HostRoleCommandStatusSummaryDTO;
import org.apache.ambari.server.orm.dao.RequestDAO;
@@ -258,7 +258,7 @@ public class UpgradeResourceProvider extends
AbstractControllerResourceProvider
private static UpgradeContextFactory s_upgradeContextFactory;
@Inject
- private StateUpdateEventPublisher stateUpdateEventPublisher;
+ private STOMPUpdatePublisher STOMPUpdatePublisher;
@Inject
private HostRoleCommandDAO hostRoleCommandDAO;
@@ -898,7 +898,7 @@ public class UpgradeResourceProvider extends
AbstractControllerResourceProvider
upgradeEntity.setRequestEntity(requestEntity);
s_upgradeDAO.create(upgradeEntity);
- stateUpdateEventPublisher.publish(UpgradeUpdateEvent
+ STOMPUpdatePublisher.publish(UpgradeUpdateEvent
.formFullEvent(s_hostRoleCommandDAO, s_requestDAO, upgradeEntity,
UpdateEventType.CREATE));
cluster.setUpgradeEntity(upgradeEntity);
@@ -1532,7 +1532,7 @@ public class UpgradeResourceProvider extends
AbstractControllerResourceProvider
// set the upgrade to suspended
upgradeEntity.setSuspended(suspended);
upgradeEntity = s_upgradeDAO.merge(upgradeEntity);
-
stateUpdateEventPublisher.publish(UpgradeUpdateEvent.formUpdateEvent(hostRoleCommandDAO,requestDAO,
upgradeEntity));
+
STOMPUpdatePublisher.publish(UpgradeUpdateEvent.formUpdateEvent(hostRoleCommandDAO,requestDAO,
upgradeEntity));
} else {
// otherwise remove the association with the cluster since it's being
// full aborted
@@ -1553,7 +1553,7 @@ public class UpgradeResourceProvider extends
AbstractControllerResourceProvider
UpgradeEntity lastUpgradeItemForCluster =
s_upgradeDAO.findLastUpgradeOrDowngradeForCluster(cluster.getClusterId());
lastUpgradeItemForCluster.setSuspended(false);
lastUpgradeItemForCluster =
s_upgradeDAO.merge(lastUpgradeItemForCluster);
-
stateUpdateEventPublisher.publish(UpgradeUpdateEvent.formUpdateEvent(hostRoleCommandDAO,
requestDAO, lastUpgradeItemForCluster));
+
STOMPUpdatePublisher.publish(UpgradeUpdateEvent.formUpdateEvent(hostRoleCommandDAO,
requestDAO, lastUpgradeItemForCluster));
}
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/AgentActionEvent.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/AgentActionEvent.java
index 5a5d17b..e8352cf 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/AgentActionEvent.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/AgentActionEvent.java
@@ -24,7 +24,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* Event to send action commands to agent.
*/
@JsonInclude(JsonInclude.Include.NON_EMPTY)
-public class AgentActionEvent extends AmbariHostUpdateEvent {
+public class AgentActionEvent extends STOMPHostEvent {
/**
* Host id with agent action commands will be send to.
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/AgentConfigsUpdateEvent.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/AgentConfigsUpdateEvent.java
index 277caf6..797b739 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/AgentConfigsUpdateEvent.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/AgentConfigsUpdateEvent.java
@@ -32,7 +32,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* Host can be identified by AgentConfigsUpdateEvent#hostName.
*/
@JsonInclude(JsonInclude.Include.NON_NULL)
-public class AgentConfigsUpdateEvent extends AmbariHostUpdateEvent implements
Hashable {
+public class AgentConfigsUpdateEvent extends STOMPHostEvent implements
Hashable {
/**
* Actual version hash.
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/AlertDefinitionsAgentUpdateEvent.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/AlertDefinitionsAgentUpdateEvent.java
index cd1823b..ac10e04 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/AlertDefinitionsAgentUpdateEvent.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/AlertDefinitionsAgentUpdateEvent.java
@@ -32,7 +32,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* Contains info about alert definitions update. This update is specific to a
single host.
*/
@JsonInclude(JsonInclude.Include.NON_NULL)
-public class AlertDefinitionsAgentUpdateEvent extends AmbariHostUpdateEvent
implements Hashable {
+public class AlertDefinitionsAgentUpdateEvent extends STOMPHostEvent
implements Hashable {
private final Map<Long, AlertCluster> clusters;
private final AlertDefinitionEventType eventType;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/AlertDefinitionsUIUpdateEvent.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/AlertDefinitionsUIUpdateEvent.java
index e75b3a1..bb0ad6a 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/AlertDefinitionsUIUpdateEvent.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/AlertDefinitionsUIUpdateEvent.java
@@ -27,7 +27,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
@JsonInclude(JsonInclude.Include.NON_NULL)
-public class AlertDefinitionsUIUpdateEvent extends AmbariUpdateEvent {
+public class AlertDefinitionsUIUpdateEvent extends STOMPEvent {
private final Map<Long, AlertCluster> clusters;
private final AlertDefinitionEventType eventType;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/AlertGroupsUpdateEvent.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/AlertGroupsUpdateEvent.java
index 12eebed..e77a0b8 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/AlertGroupsUpdateEvent.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/AlertGroupsUpdateEvent.java
@@ -27,7 +27,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
@JsonInclude(JsonInclude.Include.NON_EMPTY)
-public class AlertGroupsUpdateEvent extends AmbariUpdateEvent {
+public class AlertGroupsUpdateEvent extends STOMPEvent {
@JsonProperty("groups")
private List<AlertGroupUpdate> groups;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/AlertUpdateEvent.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/AlertUpdateEvent.java
index c2c202a..7939e0b 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/AlertUpdateEvent.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/AlertUpdateEvent.java
@@ -26,7 +26,7 @@ import
org.apache.ambari.server.api.query.render.AlertSummaryGroupedRenderer;
/**
* Contains info about alerts update. This update will be sent to all
subscribed recipients.
*/
-public class AlertUpdateEvent extends AmbariUpdateEvent {
+public class AlertUpdateEvent extends STOMPEvent {
/**
* Alert summaries grouped by cluster id.
*/
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/ConfigsUpdateEvent.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/ConfigsUpdateEvent.java
index af4a9af..d52456f 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/ConfigsUpdateEvent.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/ConfigsUpdateEvent.java
@@ -34,7 +34,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
* Contains info about configs update. This update will be sent to all
subscribed recipients.
*/
@JsonInclude(JsonInclude.Include.NON_EMPTY)
-public class ConfigsUpdateEvent extends AmbariUpdateEvent {
+public class ConfigsUpdateEvent extends STOMPEvent {
private Long serviceConfigId;
private Long clusterId;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/DefaultMessageEmitter.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/DefaultMessageEmitter.java
index afdc4eb..739e464 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/DefaultMessageEmitter.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/DefaultMessageEmitter.java
@@ -27,25 +27,25 @@ import org.apache.ambari.server.agent.AgentSessionManager;
import org.springframework.messaging.simp.SimpMessagingTemplate;
public class DefaultMessageEmitter extends MessageEmitter {
- private final Map<AmbariUpdateEvent.Type, String> DEFAULT_DESTINATIONS =
- Collections.unmodifiableMap(new HashMap<AmbariUpdateEvent.Type,
String>(){{
- put(AmbariUpdateEvent.Type.ALERT, "/events/alerts");
- put(AmbariUpdateEvent.Type.ALERT_GROUP, "/events/alert_group");
- put(AmbariUpdateEvent.Type.METADATA, "/events/metadata");
- put(AmbariUpdateEvent.Type.HOSTLEVELPARAMS, "/host_level_params");
- put(AmbariUpdateEvent.Type.UI_TOPOLOGY, "/events/ui_topologies");
- put(AmbariUpdateEvent.Type.AGENT_TOPOLOGY, "/events/topologies");
- put(AmbariUpdateEvent.Type.AGENT_CONFIGS, "/configs");
- put(AmbariUpdateEvent.Type.CONFIGS, "/events/configs");
- put(AmbariUpdateEvent.Type.HOSTCOMPONENT, "/events/hostcomponents");
- put(AmbariUpdateEvent.Type.REQUEST, "/events/requests");
- put(AmbariUpdateEvent.Type.SERVICE, "/events/services");
- put(AmbariUpdateEvent.Type.HOST, "/events/hosts");
- put(AmbariUpdateEvent.Type.COMMAND, "/commands");
- put(AmbariUpdateEvent.Type.ALERT_DEFINITIONS, "/alert_definitions");
- put(AmbariUpdateEvent.Type.UI_ALERT_DEFINITIONS,
"/events/alert_definitions");
- put(AmbariUpdateEvent.Type.UPGRADE, "/events/upgrade");
- put(AmbariUpdateEvent.Type.AGENT_ACTIONS, "/agent_actions");
+ private final Map<STOMPEvent.Type, String> DEFAULT_DESTINATIONS =
+ Collections.unmodifiableMap(new HashMap<STOMPEvent.Type, String>(){{
+ put(STOMPEvent.Type.ALERT, "/events/alerts");
+ put(STOMPEvent.Type.ALERT_GROUP, "/events/alert_group");
+ put(STOMPEvent.Type.METADATA, "/events/metadata");
+ put(STOMPEvent.Type.HOSTLEVELPARAMS, "/host_level_params");
+ put(STOMPEvent.Type.UI_TOPOLOGY, "/events/ui_topologies");
+ put(STOMPEvent.Type.AGENT_TOPOLOGY, "/events/topologies");
+ put(STOMPEvent.Type.AGENT_CONFIGS, "/configs");
+ put(STOMPEvent.Type.CONFIGS, "/events/configs");
+ put(STOMPEvent.Type.HOSTCOMPONENT, "/events/hostcomponents");
+ put(STOMPEvent.Type.REQUEST, "/events/requests");
+ put(STOMPEvent.Type.SERVICE, "/events/services");
+ put(STOMPEvent.Type.HOST, "/events/hosts");
+ put(STOMPEvent.Type.COMMAND, "/commands");
+ put(STOMPEvent.Type.ALERT_DEFINITIONS, "/alert_definitions");
+ put(STOMPEvent.Type.UI_ALERT_DEFINITIONS, "/events/alert_definitions");
+ put(STOMPEvent.Type.UPGRADE, "/events/upgrade");
+ put(STOMPEvent.Type.AGENT_ACTIONS, "/agent_actions");
}});
public DefaultMessageEmitter(AgentSessionManager agentSessionManager,
SimpMessagingTemplate simpMessagingTemplate) {
@@ -53,13 +53,13 @@ public class DefaultMessageEmitter extends MessageEmitter {
}
@Override
- public void emitMessage(AmbariUpdateEvent event) throws AmbariException {
+ public void emitMessage(STOMPEvent event) throws AmbariException {
String destination = DEFAULT_DESTINATIONS.get(event.getType());
if (destination == null) {
throw new MessageDestinationIsNotDefinedException(event.getType());
}
- if (event instanceof AmbariHostUpdateEvent) {
- AmbariHostUpdateEvent hostUpdateEvent = (AmbariHostUpdateEvent) event;
+ if (event instanceof STOMPHostEvent) {
+ STOMPHostEvent hostUpdateEvent = (STOMPHostEvent) event;
emitMessageToHost(hostUpdateEvent, destination);
} else {
emitMessageToAll(event, destination);
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/ExecutionCommandEvent.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/ExecutionCommandEvent.java
index 632323e..1c0238b 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/ExecutionCommandEvent.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/ExecutionCommandEvent.java
@@ -28,7 +28,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* Event to send execution commands to agent.
*/
@JsonInclude(JsonInclude.Include.NON_NULL)
-public class ExecutionCommandEvent extends AmbariHostUpdateEvent {
+public class ExecutionCommandEvent extends STOMPHostEvent {
/**
* Host id with agent execution commands will be send to.
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/HostComponentsUpdateEvent.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/HostComponentsUpdateEvent.java
index fe725c7..079a7fd 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/HostComponentsUpdateEvent.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/HostComponentsUpdateEvent.java
@@ -26,7 +26,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
/**
* Contains list of updated hostcomponents. This update will be sent to all
subscribed recipients.
*/
-public class HostComponentsUpdateEvent extends AmbariUpdateEvent {
+public class HostComponentsUpdateEvent extends STOMPEvent {
@JsonProperty("hostComponents")
private List<HostComponentUpdate> hostComponentUpdates = new ArrayList<>();
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/HostLevelParamsUpdateEvent.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/HostLevelParamsUpdateEvent.java
index 8948391..d2fc257 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/HostLevelParamsUpdateEvent.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/HostLevelParamsUpdateEvent.java
@@ -32,7 +32,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* Host can be identified by AgentConfigsUpdateEvent#hostName.
*/
@JsonInclude(JsonInclude.Include.NON_NULL)
-public class HostLevelParamsUpdateEvent extends AmbariHostUpdateEvent
implements Hashable {
+public class HostLevelParamsUpdateEvent extends STOMPHostEvent implements
Hashable {
/**
* Actual version hash.
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/HostUpdateEvent.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/HostUpdateEvent.java
index a7f9fa6..3f8c0df 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/HostUpdateEvent.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/HostUpdateEvent.java
@@ -29,7 +29,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* Host info with updated parameter. This update will be sent to all
subscribed recipients.
*/
@JsonInclude(JsonInclude.Include.NON_NULL)
-public class HostUpdateEvent extends AmbariUpdateEvent {
+public class HostUpdateEvent extends STOMPEvent {
@JsonProperty("cluster_name")
private String clusterName;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/MessageEmitter.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/MessageEmitter.java
index 203bb03..cc5f2cd 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/MessageEmitter.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/MessageEmitter.java
@@ -46,7 +46,7 @@ public abstract class MessageEmitter {
* @param event message should to be emitted.
* @throws AmbariException
*/
- abstract void emitMessage(AmbariUpdateEvent event) throws AmbariException;
+ abstract void emitMessage(STOMPEvent event) throws AmbariException;
/**
* Creates STOMP message header.
@@ -65,7 +65,7 @@ public abstract class MessageEmitter {
* @param event message should to be emitted.
* @param destination
*/
- protected void emitMessageToAll(AmbariUpdateEvent event, String destination)
{
+ protected void emitMessageToAll(STOMPEvent event, String destination) {
LOG.debug("Received status update event {}", event);
simpMessagingTemplate.convertAndSend(destination, event);
}
@@ -76,7 +76,7 @@ public abstract class MessageEmitter {
* @param destination
* @throws HostNotRegisteredException in case host is not registered.
*/
- protected void emitMessageToHost(AmbariHostUpdateEvent event, String
destination) throws HostNotRegisteredException {
+ protected void emitMessageToHost(STOMPHostEvent event, String destination)
throws HostNotRegisteredException {
Long hostId = event.getHostId();
String sessionId = agentSessionManager.getSessionId(hostId);
LOG.debug("Received status update event {} for host {} registered with
session ID {}", event, hostId, sessionId);
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/MetadataUpdateEvent.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/MetadataUpdateEvent.java
index b515d5a..96d1589 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/MetadataUpdateEvent.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/MetadataUpdateEvent.java
@@ -31,7 +31,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* Contains update info about metadata for all clusters. This update will be
sent to all subscribed recipients.
*/
@JsonInclude(JsonInclude.Include.NON_NULL)
-public class MetadataUpdateEvent extends AmbariUpdateEvent implements Hashable
{
+public class MetadataUpdateEvent extends STOMPEvent implements Hashable {
/**
* Id used to send parameters common to all clusters.
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/RequestUpdateEvent.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/RequestUpdateEvent.java
index babf781..abf367b 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/RequestUpdateEvent.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/RequestUpdateEvent.java
@@ -36,7 +36,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* Contains info about request update. This update will be sent to all
subscribed recipients.
*/
@JsonInclude(JsonInclude.Include.NON_NULL)
-public class RequestUpdateEvent extends AmbariUpdateEvent {
+public class RequestUpdateEvent extends STOMPEvent {
private String clusterName;
private Long endTime;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/AmbariUpdateEvent.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/STOMPEvent.java
similarity index 96%
rename from
ambari-server/src/main/java/org/apache/ambari/server/events/AmbariUpdateEvent.java
rename to
ambari-server/src/main/java/org/apache/ambari/server/events/STOMPEvent.java
index 644008d..15c3b1e 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/AmbariUpdateEvent.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/STOMPEvent.java
@@ -22,14 +22,14 @@ import java.beans.Transient;
/**
* Update data from server side, will be sent as STOMP message to recipients
from all hosts.
*/
-public abstract class AmbariUpdateEvent {
+public abstract class STOMPEvent {
/**
* Update type.
*/
protected final Type type;
- public AmbariUpdateEvent(Type type) {
+ public STOMPEvent(Type type) {
this.type = type;
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/AmbariHostUpdateEvent.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/STOMPHostEvent.java
similarity index 90%
rename from
ambari-server/src/main/java/org/apache/ambari/server/events/AmbariHostUpdateEvent.java
rename to
ambari-server/src/main/java/org/apache/ambari/server/events/STOMPHostEvent.java
index fe49906..899cd9a 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/AmbariHostUpdateEvent.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/STOMPHostEvent.java
@@ -22,7 +22,7 @@ import java.beans.Transient;
/**
* Update data from server side, will be sent as STOMP message only to
specified recipient.
*/
-public abstract class AmbariHostUpdateEvent extends AmbariUpdateEvent {
+public abstract class STOMPHostEvent extends STOMPEvent {
/**
* Host id message will sent to.
@@ -31,7 +31,7 @@ public abstract class AmbariHostUpdateEvent extends
AmbariUpdateEvent {
@Transient
public abstract Long getHostId();
- public AmbariHostUpdateEvent(Type type) {
+ public STOMPHostEvent(Type type) {
super(type);
}
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/ServiceUpdateEvent.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/ServiceUpdateEvent.java
index a458ea3..34bc106 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/ServiceUpdateEvent.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/ServiceUpdateEvent.java
@@ -28,7 +28,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* Contains info about service update. This update will be sent to all
subscribed recipients.
*/
@JsonInclude(JsonInclude.Include.NON_NULL)
-public class ServiceUpdateEvent extends AmbariUpdateEvent {
+public class ServiceUpdateEvent extends STOMPEvent {
@JsonProperty("cluster_name")
private String clusterName;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/TopologyUpdateEvent.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/TopologyUpdateEvent.java
index 1237e5b..9bdb078 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/TopologyUpdateEvent.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/TopologyUpdateEvent.java
@@ -33,7 +33,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* Is used to messaging to UI.
*/
@JsonInclude(JsonInclude.Include.NON_NULL)
-public class TopologyUpdateEvent extends AmbariUpdateEvent implements Hashable
{
+public class TopologyUpdateEvent extends STOMPEvent implements Hashable {
/**
* Map of clusters topologies by cluster ids.
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/UpgradeUpdateEvent.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/UpgradeUpdateEvent.java
index 7fbd40d..7e58803 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/UpgradeUpdateEvent.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/UpgradeUpdateEvent.java
@@ -39,7 +39,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* Used for messaging to UI.
*/
@JsonInclude(JsonInclude.Include.NON_EMPTY)
-public class UpgradeUpdateEvent extends AmbariUpdateEvent {
+public class UpgradeUpdateEvent extends STOMPEvent {
@JsonProperty("associated_version")
private String associatedVersion;
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertDefinitionsUIUpdateListener.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertDefinitionsUIUpdateListener.java
index e4f9cf9..06bfa9c 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertDefinitionsUIUpdateListener.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertDefinitionsUIUpdateListener.java
@@ -38,7 +38,7 @@ import
org.apache.ambari.server.events.AlertDefinitionsUIUpdateEvent;
import org.apache.ambari.server.events.ServiceComponentInstalledEvent;
import org.apache.ambari.server.events.ServiceComponentUninstalledEvent;
import org.apache.ambari.server.events.publishers.AmbariEventPublisher;
-import org.apache.ambari.server.events.publishers.StateUpdateEventPublisher;
+import org.apache.ambari.server.events.publishers.STOMPUpdatePublisher;
import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.Host;
@@ -65,7 +65,7 @@ public class AlertDefinitionsUIUpdateListener {
private Provider<Clusters> clusters;
@Inject
- private StateUpdateEventPublisher stateUpdateEventPublisher;
+ private STOMPUpdatePublisher STOMPUpdatePublisher;
@Inject
private AlertDefinitionsHolder alertDefinitionsHolder;
@@ -117,7 +117,7 @@ public class AlertDefinitionsUIUpdateListener {
alertDefinitionsHolder.provideAlertDefinitionAgentUpdateEvent(UPDATE,
event.getClusterId(), definitions, hostName);
Map<Long, AlertCluster> map =
Collections.singletonMap(event.getClusterId(), new AlertCluster(definitions,
hostName));
- stateUpdateEventPublisher.publish(new
AlertDefinitionsUIUpdateEvent(UPDATE, map));
+ STOMPUpdatePublisher.publish(new AlertDefinitionsUIUpdateEvent(UPDATE,
map));
}
@Subscribe
@@ -129,7 +129,7 @@ public class AlertDefinitionsUIUpdateListener {
}
alertDefinitionsHolder.provideAlertDefinitionAgentUpdateEvent(DELETE,
event.getClusterId(), definitions, hostName);
Map<Long, AlertCluster> map =
Collections.singletonMap(event.getClusterId(), new AlertCluster(definitions,
hostName));
- stateUpdateEventPublisher.publish(new
AlertDefinitionsUIUpdateEvent(DELETE, map));
+ STOMPUpdatePublisher.publish(new AlertDefinitionsUIUpdateEvent(DELETE,
map));
}
private void handleSingleDefinitionChange(AlertDefinitionEventType
eventType, AlertDefinition alertDefinition) throws AmbariException {
@@ -147,6 +147,6 @@ public class AlertDefinitionsUIUpdateListener {
}
Map<Long, AlertCluster> update =
Collections.singletonMap(alertDefinition.getClusterId(), new
AlertCluster(alertDefinition, null));
AlertDefinitionsUIUpdateEvent event = new
AlertDefinitionsUIUpdateEvent(eventType, update);
- stateUpdateEventPublisher.publish(event);
+ STOMPUpdatePublisher.publish(event);
}
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertGroupsUpdateListener.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertGroupsUpdateListener.java
index 9fef766..46747b2 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertGroupsUpdateListener.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertGroupsUpdateListener.java
@@ -27,7 +27,7 @@ import
org.apache.ambari.server.events.AlertDefinitionDeleteEvent;
import org.apache.ambari.server.events.AlertGroupsUpdateEvent;
import org.apache.ambari.server.events.UpdateEventType;
import org.apache.ambari.server.events.publishers.AmbariEventPublisher;
-import org.apache.ambari.server.events.publishers.StateUpdateEventPublisher;
+import org.apache.ambari.server.events.publishers.STOMPUpdatePublisher;
import org.apache.ambari.server.orm.dao.AlertDispatchDAO;
import org.apache.ambari.server.orm.entities.AlertGroupEntity;
import org.slf4j.Logger;
@@ -44,7 +44,7 @@ public class AlertGroupsUpdateListener {
private static final Logger LOG =
LoggerFactory.getLogger(AlertGroupsUpdateListener.class);
@Inject
- private StateUpdateEventPublisher stateUpdateEventPublisher;
+ private STOMPUpdatePublisher STOMPUpdatePublisher;
@Inject
private AlertDispatchDAO alertDispatchDAO;
@@ -64,6 +64,6 @@ public class AlertGroupsUpdateListener {
alertGroupUpdates.add(alertGroupUpdate);
}
}
- stateUpdateEventPublisher.publish(new
AlertGroupsUpdateEvent(alertGroupUpdates, UpdateEventType.UPDATE));
+ STOMPUpdatePublisher.publish(new AlertGroupsUpdateEvent(alertGroupUpdates,
UpdateEventType.UPDATE));
}
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java
index 9a8f66d..7eabdb1 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java
@@ -37,7 +37,7 @@ import org.apache.ambari.server.events.AlertStateChangeEvent;
import org.apache.ambari.server.events.AlertUpdateEvent;
import org.apache.ambari.server.events.InitialAlertEvent;
import org.apache.ambari.server.events.publishers.AlertEventPublisher;
-import org.apache.ambari.server.events.publishers.StateUpdateEventPublisher;
+import org.apache.ambari.server.events.publishers.STOMPUpdatePublisher;
import org.apache.ambari.server.orm.RequiresSession;
import org.apache.ambari.server.orm.dao.AlertDefinitionDAO;
import org.apache.ambari.server.orm.dao.AlertsDAO;
@@ -97,7 +97,7 @@ public class AlertReceivedListener {
private Provider<Clusters> m_clusters;
@Inject
- private StateUpdateEventPublisher stateUpdateEventPublisher;
+ private STOMPUpdatePublisher STOMPUpdatePublisher;
/**
* Used to calculate the maintenance state of new alerts being created.
@@ -384,7 +384,7 @@ public class AlertReceivedListener {
m_alertEventPublisher.publish(eventToFire);
}
if (!alertUpdates.isEmpty()) {
- stateUpdateEventPublisher.publish(new AlertUpdateEvent(alertUpdates));
+ STOMPUpdatePublisher.publish(new AlertUpdateEvent(alertUpdates));
}
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/hostcomponents/HostComponentsUpdateListener.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/hostcomponents/HostComponentsUpdateListener.java
index 0265118..feda69d 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/hostcomponents/HostComponentsUpdateListener.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/hostcomponents/HostComponentsUpdateListener.java
@@ -26,7 +26,7 @@ import
org.apache.ambari.server.events.HostComponentsUpdateEvent;
import org.apache.ambari.server.events.MaintenanceModeEvent;
import org.apache.ambari.server.events.StaleConfigsUpdateEvent;
import org.apache.ambari.server.events.publishers.AmbariEventPublisher;
-import org.apache.ambari.server.events.publishers.StateUpdateEventPublisher;
+import org.apache.ambari.server.events.publishers.STOMPUpdatePublisher;
import org.apache.ambari.server.state.ConfigHelper;
import org.apache.ambari.server.state.MaintenanceState;
import org.apache.ambari.server.state.ServiceComponentHost;
@@ -40,17 +40,17 @@ import com.google.inject.Singleton;
@EagerSingleton
public class HostComponentsUpdateListener {
- private final StateUpdateEventPublisher stateUpdateEventPublisher;
+ private final STOMPUpdatePublisher STOMPUpdatePublisher;
@Inject
private Provider<ConfigHelper> m_configHelper;
@Inject
public HostComponentsUpdateListener(AmbariEventPublisher
ambariEventPublisher,
- StateUpdateEventPublisher
stateUpdateEventPublisher) {
+ STOMPUpdatePublisher
STOMPUpdatePublisher) {
ambariEventPublisher.register(this);
- stateUpdateEventPublisher.register(this);
- this.stateUpdateEventPublisher = stateUpdateEventPublisher;
+ STOMPUpdatePublisher.register(this);
+ this.STOMPUpdatePublisher = STOMPUpdatePublisher;
}
@Subscribe
@@ -68,7 +68,7 @@ public class HostComponentsUpdateListener {
HostComponentsUpdateEvent hostComponentsUpdateEvent = new
HostComponentsUpdateEvent(
Collections.singletonList(hostComponentUpdate));
- stateUpdateEventPublisher.publish(hostComponentsUpdateEvent);
+ STOMPUpdatePublisher.publish(hostComponentsUpdateEvent);
}
}
@@ -80,7 +80,7 @@ public class HostComponentsUpdateListener {
if
(m_configHelper.get().wasStaleConfigsStatusUpdated(serviceComponentHost.getClusterId(),
serviceComponentHost.getHost().getHostId(),
serviceComponentHost.getServiceName(),
serviceComponentHost.getServiceComponentName(), staleConfigs)) {
- stateUpdateEventPublisher.publish(new
HostComponentsUpdateEvent(Collections.singletonList(
+ STOMPUpdatePublisher.publish(new
HostComponentsUpdateEvent(Collections.singletonList(
HostComponentUpdate.createHostComponentStaleConfigsStatusUpdate(serviceComponentHost.getClusterId(),
serviceComponentHost.getServiceName(),
serviceComponentHost.getHostName(),
serviceComponentHost.getServiceComponentName(),
staleConfigs))));
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/hosts/HostUpdateListener.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/hosts/HostUpdateListener.java
index 95e6110..4840bc0 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/hosts/HostUpdateListener.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/hosts/HostUpdateListener.java
@@ -31,7 +31,7 @@ import org.apache.ambari.server.events.InitialAlertEvent;
import org.apache.ambari.server.events.MaintenanceModeEvent;
import org.apache.ambari.server.events.publishers.AlertEventPublisher;
import org.apache.ambari.server.events.publishers.AmbariEventPublisher;
-import org.apache.ambari.server.events.publishers.StateUpdateEventPublisher;
+import org.apache.ambari.server.events.publishers.STOMPUpdatePublisher;
import org.apache.ambari.server.orm.dao.AlertSummaryDTO;
import org.apache.ambari.server.orm.dao.AlertsDAO;
import org.apache.ambari.server.orm.dao.ServiceDesiredStateDAO;
@@ -53,7 +53,7 @@ public class HostUpdateListener {
private Map<Long, Map<String, HostUpdateEvent>> hosts = new HashMap<>();
@Inject
- private StateUpdateEventPublisher stateUpdateEventPublisher;
+ private STOMPUpdatePublisher STOMPUpdatePublisher;
@Inject
private ServiceDesiredStateDAO serviceDesiredStateDAO;
@@ -88,7 +88,7 @@ public class HostUpdateListener {
}
hostUpdateEvent.setLastHeartbeatTime(lastHeartbeatTime);
-
stateUpdateEventPublisher.publish(HostUpdateEvent.createHostStatusUpdate(hostUpdateEvent.getClusterName(),
+
STOMPUpdatePublisher.publish(HostUpdateEvent.createHostStatusUpdate(hostUpdateEvent.getClusterName(),
hostUpdateEvent.getHostName(),
hostUpdateEvent.getHostStatus(),
hostUpdateEvent.getLastHeartbeatTime()));
@@ -113,7 +113,7 @@ public class HostUpdateListener {
}
hostUpdateEvent.setLastHeartbeatTime(lastHeartbeatTime);
-
stateUpdateEventPublisher.publish(HostUpdateEvent.createHostStateUpdate(hostUpdateEvent.getClusterName(),
+
STOMPUpdatePublisher.publish(HostUpdateEvent.createHostStateUpdate(hostUpdateEvent.getClusterName(),
hostUpdateEvent.getHostName(),
hostUpdateEvent.getHostState(),
hostUpdateEvent.getLastHeartbeatTime()));
@@ -146,7 +146,7 @@ public class HostUpdateListener {
}
hostUpdateEvent.setAlertsSummary(summary);
-
stateUpdateEventPublisher.publish(HostUpdateEvent.createHostAlertsUpdate(hostUpdateEvent.getClusterName(),
+
STOMPUpdatePublisher.publish(HostUpdateEvent.createHostAlertsUpdate(hostUpdateEvent.getClusterName(),
hostName, summary));
}
@@ -169,10 +169,10 @@ public class HostUpdateListener {
MaintenanceState maintenanceState = event.getMaintenanceState();
hostUpdateEvent.setMaintenanceState(maintenanceState);
-
stateUpdateEventPublisher.publish(HostUpdateEvent.createHostMaintenanceStatusUpdate(hostUpdateEvent.getClusterName(),
+
STOMPUpdatePublisher.publish(HostUpdateEvent.createHostMaintenanceStatusUpdate(hostUpdateEvent.getClusterName(),
hostName, maintenanceState, summary));
} else {
-
stateUpdateEventPublisher.publish(HostUpdateEvent.createHostAlertsUpdate(hostUpdateEvent.getClusterName(),
+
STOMPUpdatePublisher.publish(HostUpdateEvent.createHostAlertsUpdate(hostUpdateEvent.getClusterName(),
hostName, summary));
}
} else if (event.getService()!= null) {
@@ -187,7 +187,7 @@ public class HostUpdateListener {
}
hostUpdateEvent.setAlertsSummary(summary);
-
stateUpdateEventPublisher.publish(HostUpdateEvent.createHostAlertsUpdate(hostUpdateEvent.getClusterName(),
+
STOMPUpdatePublisher.publish(HostUpdateEvent.createHostAlertsUpdate(hostUpdateEvent.getClusterName(),
hostName, summary));
}
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/requests/StateUpdateListener.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/requests/STOMPUpdateListener.java
similarity index 76%
rename from
ambari-server/src/main/java/org/apache/ambari/server/events/listeners/requests/StateUpdateListener.java
rename to
ambari-server/src/main/java/org/apache/ambari/server/events/listeners/requests/STOMPUpdateListener.java
index 07e7392..b5fae5e 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/requests/StateUpdateListener.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/requests/STOMPUpdateListener.java
@@ -20,31 +20,31 @@ package org.apache.ambari.server.events.listeners.requests;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.agent.AgentSessionManager;
-import org.apache.ambari.server.events.AmbariUpdateEvent;
import org.apache.ambari.server.events.DefaultMessageEmitter;
-import org.apache.ambari.server.events.publishers.StateUpdateEventPublisher;
+import org.apache.ambari.server.events.STOMPEvent;
+import org.apache.ambari.server.events.publishers.STOMPUpdatePublisher;
import org.springframework.beans.factory.annotation.Autowired;
import com.google.common.eventbus.AllowConcurrentEvents;
import com.google.common.eventbus.Subscribe;
import com.google.inject.Injector;
-public class StateUpdateListener {
+public class STOMPUpdateListener {
private final AgentSessionManager agentSessionManager;
@Autowired
private DefaultMessageEmitter defaultMessageEmitter;
- public StateUpdateListener(Injector injector) {
- StateUpdateEventPublisher stateUpdateEventPublisher =
- injector.getInstance(StateUpdateEventPublisher.class);
+ public STOMPUpdateListener(Injector injector) {
+ STOMPUpdatePublisher STOMPUpdatePublisher =
+ injector.getInstance(STOMPUpdatePublisher.class);
agentSessionManager = injector.getInstance(AgentSessionManager.class);
- stateUpdateEventPublisher.register(this);
+ STOMPUpdatePublisher.register(this);
}
@Subscribe
@AllowConcurrentEvents
- public void onUpdateEvent(AmbariUpdateEvent event) throws AmbariException {
+ public void onUpdateEvent(STOMPEvent event) throws AmbariException {
defaultMessageEmitter.emitMessage(event);
}
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/services/ServiceUpdateListener.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/services/ServiceUpdateListener.java
index 50dc144..0cdb34f 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/services/ServiceUpdateListener.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/services/ServiceUpdateListener.java
@@ -31,7 +31,7 @@ import
org.apache.ambari.server.events.HostComponentsUpdateEvent;
import org.apache.ambari.server.events.MaintenanceModeEvent;
import org.apache.ambari.server.events.ServiceUpdateEvent;
import org.apache.ambari.server.events.publishers.AmbariEventPublisher;
-import org.apache.ambari.server.events.publishers.StateUpdateEventPublisher;
+import org.apache.ambari.server.events.publishers.STOMPUpdatePublisher;
import org.apache.ambari.server.orm.dao.ServiceDesiredStateDAO;
import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.MaintenanceState;
@@ -47,7 +47,7 @@ import com.google.inject.Singleton;
public class ServiceUpdateListener {
private Map<Long, Map<String, State>> states = new HashMap<>();
- private StateUpdateEventPublisher stateUpdateEventPublisher;
+ private STOMPUpdatePublisher STOMPUpdatePublisher;
@Inject
private ServiceDesiredStateDAO serviceDesiredStateDAO;
@@ -56,11 +56,11 @@ public class ServiceUpdateListener {
private Provider<Clusters> m_clusters;
@Inject
- public ServiceUpdateListener(StateUpdateEventPublisher
stateUpdateEventPublisher, AmbariEventPublisher ambariEventPublisher) {
- stateUpdateEventPublisher.register(this);
+ public ServiceUpdateListener(STOMPUpdatePublisher STOMPUpdatePublisher,
AmbariEventPublisher ambariEventPublisher) {
+ STOMPUpdatePublisher.register(this);
ambariEventPublisher.register(this);
- this.stateUpdateEventPublisher = stateUpdateEventPublisher;
+ this.STOMPUpdatePublisher = STOMPUpdatePublisher;
}
@Subscribe
@@ -83,7 +83,7 @@ public class ServiceUpdateListener {
continue;
}
states.computeIfAbsent(clusterId, c -> new
HashMap<>()).put(serviceName, serviceState);
- stateUpdateEventPublisher.publish(new ServiceUpdateEvent(clusterName,
null, serviceName, serviceState));
+ STOMPUpdatePublisher.publish(new ServiceUpdateEvent(clusterName, null,
serviceName, serviceState));
}
}
}
@@ -99,6 +99,6 @@ public class ServiceUpdateListener {
MaintenanceState maintenanceState = event.getMaintenanceState();
- stateUpdateEventPublisher.publish(new ServiceUpdateEvent(clusterName,
maintenanceState, serviceName, null));
+ STOMPUpdatePublisher.publish(new ServiceUpdateEvent(clusterName,
maintenanceState, serviceName, null));
}
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/tasks/TaskStatusListener.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/tasks/TaskStatusListener.java
index 888ed5d..0570fdf 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/tasks/TaskStatusListener.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/tasks/TaskStatusListener.java
@@ -39,7 +39,7 @@ import
org.apache.ambari.server.controller.internal.CalculatedStatus;
import org.apache.ambari.server.events.RequestUpdateEvent;
import org.apache.ambari.server.events.TaskCreateEvent;
import org.apache.ambari.server.events.TaskUpdateEvent;
-import org.apache.ambari.server.events.publishers.StateUpdateEventPublisher;
+import org.apache.ambari.server.events.publishers.STOMPUpdatePublisher;
import org.apache.ambari.server.events.publishers.TaskEventPublisher;
import org.apache.ambari.server.orm.dao.RequestDAO;
import org.apache.ambari.server.orm.dao.StageDAO;
@@ -94,14 +94,14 @@ public class TaskStatusListener {
private RequestDAO requestDAO;
- private StateUpdateEventPublisher stateUpdateEventPublisher;
+ private STOMPUpdatePublisher STOMPUpdatePublisher;
@Inject
public TaskStatusListener(TaskEventPublisher taskEventPublisher, StageDAO
stageDAO, RequestDAO requestDAO,
- StateUpdateEventPublisher
stateUpdateEventPublisher) {
+ STOMPUpdatePublisher STOMPUpdatePublisher) {
this.stageDAO = stageDAO;
this.requestDAO = requestDAO;
- this.stateUpdateEventPublisher = stateUpdateEventPublisher;
+ this.STOMPUpdatePublisher = STOMPUpdatePublisher;
taskEventPublisher.register(this);
}
@@ -163,7 +163,7 @@ public class TaskStatusListener {
updateActiveRequestsStatus(requestIdsWithReceivedTaskStatus,
stagesWithReceivedTaskStatus);
}
for (RequestUpdateEvent requestToPublish : requestsToPublish) {
- stateUpdateEventPublisher.publish(requestToPublish);
+ STOMPUpdatePublisher.publish(requestToPublish);
}
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/UpgradeUpdateListener.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/UpgradeUpdateListener.java
index f1e3fd4..a39ed8a 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/UpgradeUpdateListener.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/UpgradeUpdateListener.java
@@ -21,7 +21,7 @@ import org.apache.ambari.server.EagerSingleton;
import org.apache.ambari.server.events.RequestUpdateEvent;
import org.apache.ambari.server.events.UpgradeUpdateEvent;
import org.apache.ambari.server.events.publishers.AmbariEventPublisher;
-import org.apache.ambari.server.events.publishers.StateUpdateEventPublisher;
+import org.apache.ambari.server.events.publishers.STOMPUpdatePublisher;
import org.apache.ambari.server.orm.dao.HostRoleCommandDAO;
import org.apache.ambari.server.orm.dao.RequestDAO;
import org.apache.ambari.server.orm.dao.UpgradeDAO;
@@ -35,7 +35,7 @@ import com.google.inject.Singleton;
@EagerSingleton
public class UpgradeUpdateListener {
- private StateUpdateEventPublisher stateUpdateEventPublisher;
+ private STOMPUpdatePublisher STOMPUpdatePublisher;
@Inject
private UpgradeDAO upgradeDAO;
@@ -47,17 +47,17 @@ public class UpgradeUpdateListener {
private RequestDAO requestDAO;
@Inject
- public UpgradeUpdateListener(StateUpdateEventPublisher
stateUpdateEventPublisher, AmbariEventPublisher ambariEventPublisher) {
- stateUpdateEventPublisher.register(this);
+ public UpgradeUpdateListener(STOMPUpdatePublisher STOMPUpdatePublisher,
AmbariEventPublisher ambariEventPublisher) {
+ STOMPUpdatePublisher.register(this);
- this.stateUpdateEventPublisher = stateUpdateEventPublisher;
+ this.STOMPUpdatePublisher = STOMPUpdatePublisher;
}
@Subscribe
public void onRequestUpdate(RequestUpdateEvent requestUpdateEvent) {
UpgradeEntity upgradeEntity =
upgradeDAO.findUpgradeByRequestId(requestUpdateEvent.getRequestId());
if (upgradeEntity != null) {
-
stateUpdateEventPublisher.publish(UpgradeUpdateEvent.formUpdateEvent(hostRoleCommandDAO,
requestDAO, upgradeEntity));
+
STOMPUpdatePublisher.publish(UpgradeUpdateEvent.formUpdateEvent(hostRoleCommandDAO,
requestDAO, upgradeEntity));
}
}
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/publishers/AgentCommandsPublisher.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/publishers/AgentCommandsPublisher.java
index e5722d8..c4fb497 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/publishers/AgentCommandsPublisher.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/publishers/AgentCommandsPublisher.java
@@ -74,7 +74,7 @@ public class AgentCommandsPublisher {
private HostRoleCommandDAO hostRoleCommandDAO;
@Inject
- private StateUpdateEventPublisher stateUpdateEventPublisher;
+ private STOMPUpdatePublisher STOMPUpdatePublisher;
@Inject
private AgentConfigsHolder agentConfigsHolder;
@@ -93,7 +93,7 @@ public class AgentCommandsPublisher {
executionCommandEvent.setHostId(hostId);
executionCommandEvent.setRequiredConfigTimestamp(agentConfigsHolder
.initializeDataIfNeeded(hostId, true).getTimestamp());
- stateUpdateEventPublisher.publish(executionCommandEvent);
+ STOMPUpdatePublisher.publish(executionCommandEvent);
}
}
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/publishers/StateUpdateEventPublisher.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/publishers/STOMPUpdatePublisher.java
similarity index 83%
rename from
ambari-server/src/main/java/org/apache/ambari/server/events/publishers/StateUpdateEventPublisher.java
rename to
ambari-server/src/main/java/org/apache/ambari/server/events/publishers/STOMPUpdatePublisher.java
index 80c9813..99a03d6 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/publishers/StateUpdateEventPublisher.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/publishers/STOMPUpdatePublisher.java
@@ -19,9 +19,9 @@ package org.apache.ambari.server.events.publishers;
import java.util.concurrent.Executors;
-import org.apache.ambari.server.events.AmbariUpdateEvent;
import org.apache.ambari.server.events.HostComponentsUpdateEvent;
import org.apache.ambari.server.events.RequestUpdateEvent;
+import org.apache.ambari.server.events.STOMPEvent;
import org.apache.ambari.server.events.ServiceUpdateEvent;
import com.google.common.eventbus.AsyncEventBus;
@@ -30,7 +30,7 @@ import com.google.inject.Inject;
import com.google.inject.Singleton;
@Singleton
-public class StateUpdateEventPublisher {
+public class STOMPUpdatePublisher {
private final EventBus m_eventBus;
@@ -43,17 +43,17 @@ public class StateUpdateEventPublisher {
@Inject
private ServiceUpdateEventPublisher serviceUpdateEventPublisher;
- public StateUpdateEventPublisher() {
+ public STOMPUpdatePublisher() {
m_eventBus = new AsyncEventBus("ambari-update-bus",
Executors.newSingleThreadExecutor());
}
- public void publish(AmbariUpdateEvent event) {
- if (event.getType().equals(AmbariUpdateEvent.Type.REQUEST)) {
+ public void publish(STOMPEvent event) {
+ if (event.getType().equals(STOMPEvent.Type.REQUEST)) {
requestUpdateEventPublisher.publish((RequestUpdateEvent) event,
m_eventBus);
- } else if (event.getType().equals(AmbariUpdateEvent.Type.HOSTCOMPONENT)) {
+ } else if (event.getType().equals(STOMPEvent.Type.HOSTCOMPONENT)) {
hostComponentUpdateEventPublisher.publish((HostComponentsUpdateEvent)
event, m_eventBus);
- } else if (event.getType().equals(AmbariUpdateEvent.Type.SERVICE)) {
+ } else if (event.getType().equals(STOMPEvent.Type.SERVICE)) {
serviceUpdateEventPublisher.publish((ServiceUpdateEvent) event,
m_eventBus);
} else {
m_eventBus.post(event);
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/MetricsServiceImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/MetricsServiceImpl.java
index ae59c78..37a7082 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/MetricsServiceImpl.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/MetricsServiceImpl.java
@@ -23,7 +23,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import org.apache.ambari.server.controller.AmbariManagementController;
-import org.apache.ambari.server.events.publishers.StateUpdateEventPublisher;
+import org.apache.ambari.server.events.publishers.STOMPUpdatePublisher;
import org.apache.ambari.server.metrics.system.MetricsService;
import org.apache.ambari.server.metrics.system.MetricsSink;
import org.apache.ambari.server.metrics.system.MetricsSource;
@@ -44,7 +44,7 @@ public class MetricsServiceImpl implements MetricsService {
@Inject
AmbariManagementController amc;
@Inject
- StateUpdateEventPublisher stateUpdateEventPublisher;
+ STOMPUpdatePublisher STOMPUpdatePublisher;
@Override
public void start() {
@@ -116,7 +116,7 @@ public class MetricsServiceImpl implements MetricsService {
src.init(MetricsConfiguration.getSubsetConfiguration(configuration,
"source." + sourceName + "."), sink);
sources.put(sourceName, src);
if (src instanceof StompEventsMetricsSource) {
- stateUpdateEventPublisher.register(src);
+ STOMPUpdatePublisher.register(src);
}
src.start();
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/StompEventsMetricsSource.java
b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/StompEventsMetricsSource.java
index dfc1484..b13a432 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/StompEventsMetricsSource.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/StompEventsMetricsSource.java
@@ -25,7 +25,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import org.apache.ambari.server.events.AmbariUpdateEvent;
+import org.apache.ambari.server.events.STOMPEvent;
import org.apache.ambari.server.metrics.system.MetricsSink;
import org.apache.ambari.server.metrics.system.SingleMetric;
import org.slf4j.Logger;
@@ -39,7 +39,7 @@ import com.google.common.eventbus.Subscribe;
public class StompEventsMetricsSource extends AbstractMetricsSource {
private static Logger LOG =
LoggerFactory.getLogger(StompEventsMetricsSource.class);
- private Map<AmbariUpdateEvent.Type, Long> events = new HashMap<>();
+ private Map<STOMPEvent.Type, Long> events = new HashMap<>();
private ScheduledExecutorService executor =
Executors.newScheduledThreadPool(1);
private final String EVENTS_TOTAL_METRIC = "events.total";
@@ -50,7 +50,7 @@ public class StompEventsMetricsSource extends
AbstractMetricsSource {
@Override
public void init(MetricsConfiguration configuration, MetricsSink sink) {
super.init(configuration, sink);
- for (AmbariUpdateEvent.Type type : AmbariUpdateEvent.Type.values()) {
+ for (STOMPEvent.Type type : STOMPEvent.Type.values()) {
events.put(type, 0L);
}
@@ -79,7 +79,7 @@ public class StompEventsMetricsSource extends
AbstractMetricsSource {
List<SingleMetric> metrics = new ArrayList<>();
Long totalEventsCounter = 0L;
synchronized (events) {
- for (Map.Entry<AmbariUpdateEvent.Type, Long> event : events.entrySet()) {
+ for (Map.Entry<STOMPEvent.Type, Long> event : events.entrySet()) {
totalEventsCounter += event.getValue();
metrics.add(new SingleMetric(event.getKey().getMetricName(),
event.getValue(), System.currentTimeMillis()));
@@ -100,8 +100,8 @@ public class StompEventsMetricsSource extends
AbstractMetricsSource {
}
@Subscribe
- public void onUpdateEvent(AmbariUpdateEvent ambariUpdateEvent) {
- AmbariUpdateEvent.Type metricType = ambariUpdateEvent.getType();
+ public void onUpdateEvent(STOMPEvent STOMPEvent) {
+ STOMPEvent.Type metricType = STOMPEvent.getType();
events.put(metricType, events.get(metricType) + 1);
}
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDefinitionDAO.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDefinitionDAO.java
index 229f2fe..7f7fd45 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDefinitionDAO.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDefinitionDAO.java
@@ -35,7 +35,7 @@ import
org.apache.ambari.server.events.AlertDefinitionRegistrationEvent;
import org.apache.ambari.server.events.AlertGroupsUpdateEvent;
import org.apache.ambari.server.events.UpdateEventType;
import org.apache.ambari.server.events.publishers.AmbariEventPublisher;
-import org.apache.ambari.server.events.publishers.StateUpdateEventPublisher;
+import org.apache.ambari.server.events.publishers.STOMPUpdatePublisher;
import org.apache.ambari.server.orm.RequiresSession;
import org.apache.ambari.server.orm.entities.AlertDefinitionEntity;
import org.apache.ambari.server.orm.entities.AlertGroupEntity;
@@ -106,7 +106,7 @@ public class AlertDefinitionDAO {
private AlertDefinitionFactory alertDefinitionFactory;
@Inject
- private StateUpdateEventPublisher stateUpdateEventPublisher;
+ private STOMPUpdatePublisher STOMPUpdatePublisher;
/**
* Gets an alert definition with the specified ID.
@@ -357,7 +357,7 @@ public class AlertDefinitionDAO {
AlertGroupsUpdateEvent alertGroupsUpdateEvent = new
AlertGroupsUpdateEvent(Collections.singletonList(
new AlertGroupUpdate(group)),
UpdateEventType.UPDATE);
- stateUpdateEventPublisher.publish(alertGroupsUpdateEvent);
+ STOMPUpdatePublisher.publish(alertGroupsUpdateEvent);
dispatchDao.merge(group);
// publish the alert definition registration
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDispatchDAO.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDispatchDAO.java
index e6ac466..d9ba4bc 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDispatchDAO.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDispatchDAO.java
@@ -41,7 +41,7 @@ import org.apache.ambari.server.controller.spi.Predicate;
import org.apache.ambari.server.controller.utilities.PredicateHelper;
import org.apache.ambari.server.events.AlertGroupsUpdateEvent;
import org.apache.ambari.server.events.UpdateEventType;
-import org.apache.ambari.server.events.publishers.StateUpdateEventPublisher;
+import org.apache.ambari.server.events.publishers.STOMPUpdatePublisher;
import org.apache.ambari.server.orm.RequiresSession;
import org.apache.ambari.server.orm.entities.AlertDefinitionEntity;
import org.apache.ambari.server.orm.entities.AlertGroupEntity;
@@ -89,7 +89,7 @@ public class AlertDispatchDAO {
private Provider<Clusters> m_clusters;
@Inject
- private StateUpdateEventPublisher stateUpdateEventPublisher;
+ private STOMPUpdatePublisher STOMPUpdatePublisher;
/**
* Used for ensuring that the concurrent nature of the event handler methods
@@ -428,7 +428,7 @@ public class AlertDispatchDAO {
}
AlertGroupsUpdateEvent alertGroupsUpdateEvent = new
AlertGroupsUpdateEvent(alertGroupUpdates,
UpdateEventType.CREATE);
- stateUpdateEventPublisher.publish(alertGroupsUpdateEvent);
+ STOMPUpdatePublisher.publish(alertGroupsUpdateEvent);
}
/**
@@ -465,7 +465,7 @@ public class AlertDispatchDAO {
AlertGroupsUpdateEvent alertGroupsUpdateEvent = new
AlertGroupsUpdateEvent(
Collections.singletonList(new AlertGroupUpdate(group)),
UpdateEventType.CREATE);
- stateUpdateEventPublisher.publish(alertGroupsUpdateEvent);
+ STOMPUpdatePublisher.publish(alertGroupsUpdateEvent);
}
}
@@ -565,7 +565,7 @@ public class AlertDispatchDAO {
if (fireEvent) {
AlertGroupsUpdateEvent alertGroupsUpdateEvent =
AlertGroupsUpdateEvent.deleteAlertGroupsUpdateEvent(
Collections.singletonList(alertGroup.getGroupId()));
- stateUpdateEventPublisher.publish(alertGroupsUpdateEvent);
+ STOMPUpdatePublisher.publish(alertGroupsUpdateEvent);
}
}
@@ -584,7 +584,7 @@ public class AlertDispatchDAO {
}
AlertGroupsUpdateEvent alertGroupsUpdateEvent =
AlertGroupsUpdateEvent.deleteAlertGroupsUpdateEvent(
groups.stream().map(AlertGroupEntity::getGroupId).collect(Collectors.toList()));
- stateUpdateEventPublisher.publish(alertGroupsUpdateEvent);
+ STOMPUpdatePublisher.publish(alertGroupsUpdateEvent);
}
/**
@@ -648,7 +648,7 @@ public class AlertDispatchDAO {
AlertGroupsUpdateEvent alertGroupsUpdateEvent = new
AlertGroupsUpdateEvent(Collections.singletonList(
new AlertGroupUpdate(group)),
UpdateEventType.UPDATE);
- stateUpdateEventPublisher.publish(alertGroupsUpdateEvent);
+ STOMPUpdatePublisher.publish(alertGroupsUpdateEvent);
}
}
}
@@ -690,7 +690,7 @@ public class AlertDispatchDAO {
alertGroupUpdate.getTargets().remove(alertTarget.getTargetId());
alertGroupUpdates.add(alertGroupUpdate);
}
- stateUpdateEventPublisher.publish(new
AlertGroupsUpdateEvent(alertGroupUpdates, UpdateEventType.UPDATE));
+ STOMPUpdatePublisher.publish(new AlertGroupsUpdateEvent(alertGroupUpdates,
UpdateEventType.UPDATE));
entityManagerProvider.get().remove(alertTarget);
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
index 73afef7..ac543b7 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
@@ -44,7 +44,7 @@ import
org.apache.ambari.server.controller.AmbariManagementControllerImpl;
import org.apache.ambari.server.events.AgentConfigsUpdateEvent;
import org.apache.ambari.server.events.HostComponentUpdate;
import org.apache.ambari.server.events.HostComponentsUpdateEvent;
-import org.apache.ambari.server.events.publishers.StateUpdateEventPublisher;
+import org.apache.ambari.server.events.publishers.STOMPUpdatePublisher;
import org.apache.ambari.server.orm.dao.ClusterDAO;
import org.apache.ambari.server.orm.dao.ServiceConfigDAO;
import org.apache.ambari.server.orm.entities.ClusterConfigEntity;
@@ -139,7 +139,7 @@ public class ConfigHelper {
private Provider<AmbariManagementControllerImpl>
m_ambariManagementController;
@Inject
- private StateUpdateEventPublisher stateUpdateEventPublisher;
+ private STOMPUpdatePublisher STOMPUpdatePublisher;
@Inject
private ServiceConfigDAO serviceConfigDAO;
@@ -1525,7 +1525,7 @@ public class ConfigHelper {
if (wasStaleConfigsStatusUpdated(clusterId,
serviceComponentHost.getHost().getHostId(),
serviceName, serviceComponentHostName, staleConfigs)) {
serviceComponentHost.setRestartRequiredWithoutEventPublishing(staleConfigs);
- stateUpdateEventPublisher.publish(new
HostComponentsUpdateEvent(Collections.singletonList(
+ STOMPUpdatePublisher.publish(new
HostComponentsUpdateEvent(Collections.singletonList(
HostComponentUpdate.createHostComponentStaleConfigsStatusUpdate(clusterId,
serviceName, serviceComponentHost.getHostName(),
serviceComponentHostName, staleConfigs))));
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 3df9943..a79c2da 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
@@ -72,7 +72,7 @@ import
org.apache.ambari.server.events.jpa.EntityManagerCacheInvalidationEvent;
import org.apache.ambari.server.events.jpa.JPAEvent;
import org.apache.ambari.server.events.publishers.AmbariEventPublisher;
import org.apache.ambari.server.events.publishers.JPAEventPublisher;
-import org.apache.ambari.server.events.publishers.StateUpdateEventPublisher;
+import org.apache.ambari.server.events.publishers.STOMPUpdatePublisher;
import org.apache.ambari.server.logging.LockFactory;
import org.apache.ambari.server.metadata.RoleCommandOrder;
import org.apache.ambari.server.metadata.RoleCommandOrderProvider;
@@ -310,7 +310,7 @@ public class ClusterImpl implements Cluster {
private UpgradeContextFactory upgradeContextFactory;
@Inject
- private StateUpdateEventPublisher stateUpdateEventPublisher;
+ private STOMPUpdatePublisher STOMPUpdatePublisher;
@Inject
private HostComponentDesiredStateDAO hostComponentDesiredStateDAO;
@@ -1607,7 +1607,7 @@ public class ClusterImpl implements Cluster {
serviceConfigEntity.setHostIds(new
ArrayList<>(configGroup.getHosts().keySet()));
serviceConfigEntity = serviceConfigDAO.merge(serviceConfigEntity);
}
- stateUpdateEventPublisher.publish(new
ConfigsUpdateEvent(serviceConfigEntity,
+ STOMPUpdatePublisher.publish(new ConfigsUpdateEvent(serviceConfigEntity,
configGroup == null ? null : configGroup.getName(), groupHostNames,
changedConfigs.keySet()));
configHelper.checkStaleConfigsStatusOnConfigsUpdate(clusterEntity.getClusterId(),
serviceName, groupHostNames, changedConfigs);
} finally {
@@ -1945,7 +1945,7 @@ public class ClusterImpl implements Cluster {
}
serviceConfigDAO.create(serviceConfigEntityClone);
- stateUpdateEventPublisher.publish(new
ConfigsUpdateEvent(serviceConfigEntityClone,
+ STOMPUpdatePublisher.publish(new
ConfigsUpdateEvent(serviceConfigEntityClone,
configGroupName,
groupHostNames,
changedConfigs.keySet()));
@@ -1984,7 +1984,7 @@ List<ClusterConfigEntity> appliedConfigs = new
ArrayList<>(); String serviceN
configTypes.add(config.getType());
}
- stateUpdateEventPublisher.publish(new ConfigsUpdateEvent(this,
appliedConfigs));
+ STOMPUpdatePublisher.publish(new ConfigsUpdateEvent(this,
appliedConfigs));
LOG.error("No service found for config types '{}', service config
version not created", configTypes);
return null;
} else {
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java
index 240eb9b..b588355 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java
@@ -48,7 +48,7 @@ import
org.apache.ambari.server.events.ServiceComponentUninstalledEvent;
import org.apache.ambari.server.events.StaleConfigsUpdateEvent;
import org.apache.ambari.server.events.TopologyUpdateEvent;
import org.apache.ambari.server.events.publishers.AmbariEventPublisher;
-import org.apache.ambari.server.events.publishers.StateUpdateEventPublisher;
+import org.apache.ambari.server.events.publishers.STOMPUpdatePublisher;
import org.apache.ambari.server.orm.dao.HostComponentDesiredStateDAO;
import org.apache.ambari.server.orm.dao.HostComponentStateDAO;
import org.apache.ambari.server.orm.dao.HostDAO;
@@ -137,7 +137,7 @@ public class ServiceComponentHostImpl implements
ServiceComponentHost {
private RepositoryVersionHelper repositoryVersionHelper;
@Inject
- StateUpdateEventPublisher stateUpdateEventPublisher;
+ STOMPUpdatePublisher STOMPUpdatePublisher;
@Inject
private Provider<TopologyHolder> m_topologyHolder;
@@ -909,7 +909,7 @@ public class ServiceComponentHostImpl implements
ServiceComponentHost {
}
stateEntity = hostComponentStateDAO.merge(stateEntity);
if (!oldState.equals(state)) {
- stateUpdateEventPublisher.publish(new
HostComponentsUpdateEvent(Collections.singletonList(
+ STOMPUpdatePublisher.publish(new
HostComponentsUpdateEvent(Collections.singletonList(
HostComponentUpdate.createHostComponentStatusUpdate(stateEntity,
oldState))));
}
} else {
@@ -1040,7 +1040,7 @@ public class ServiceComponentHostImpl implements
ServiceComponentHost {
stateEntity.setCurrentState(stateMachine.getCurrentState());
stateEntity = hostComponentStateDAO.merge(stateEntity);
if (statusUpdated) {
- stateUpdateEventPublisher.publish(new
HostComponentsUpdateEvent(Collections.singletonList(
+ STOMPUpdatePublisher.publish(new
HostComponentsUpdateEvent(Collections.singletonList(
HostComponentUpdate.createHostComponentStatusUpdate(stateEntity,
oldState))));
}
// TODO Audit logs
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
index 41e0c43..c072923 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
@@ -1340,7 +1340,7 @@ public class TestHeartbeatHandler {
expect(nnComponent.getDesiredStackId()).andReturn(dummyStackId).atLeastOnce();
componentMap.put("NAMENODE", nnComponent);
- expect(service.getServiceComponents()).andReturn(componentMap);
+
expect(service.getServiceComponents()).andReturn(componentMap).atLeastOnce();
ActionManager am = actionManagerTestHelper.getMockActionManager();
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java
index 86e4e13..00ccd0d 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java
@@ -373,7 +373,7 @@ public class HostComponentResourceProviderTest {
changedHosts.put("Component100", Collections.singletonMap(State.STARTED,
changedComponentHosts));
expect(managementController.addStages(null, cluster, mapRequestProps,
null, null, null, changedHosts,
- Collections.emptyList(), false,
false)).andReturn(stageContainer).once();
+ Collections.emptyList(), false, false,
false)).andReturn(stageContainer).once();
stageContainer.persist();
expect(stageContainer.getRequestStatusResponse()).andReturn(response).once();
@@ -616,7 +616,7 @@ public class HostComponentResourceProviderTest {
provider.setFieldValue("maintenanceStateHelper",
injector.getInstance(MaintenanceStateHelper.class));
provider.setFieldValue("hostVersionDAO",
injector.getInstance(HostVersionDAO.class));
- RequestStageContainer requestStages = provider.updateHostComponents(null,
requests, requestProperties, runSmokeTest);
+ RequestStageContainer requestStages = provider.updateHostComponents(null,
requests, requestProperties, runSmokeTest, false);
requestStages.persist();
return requestStages.getRequestStatusResponse();
}
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 c24bf3b..9a26b44 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
@@ -659,7 +659,7 @@ public class ServiceResourceProviderTest {
expect(managementController.addStages((RequestStageContainer) isNull(),
capture(clusterCapture), capture(requestPropertiesCapture),
capture(requestParametersCapture), capture(changedServicesCapture),
capture(changedCompsCapture),
- capture(changedScHostsCapture), capture(ignoredScHostsCapture),
anyBoolean(), anyBoolean()
+ capture(changedScHostsCapture), capture(ignoredScHostsCapture),
anyBoolean(), anyBoolean(), anyBoolean()
)).andReturn(requestStages);
requestStages.persist();
expect(requestStages.getRequestStatusResponse()).andReturn(requestStatusResponse);
@@ -782,12 +782,12 @@ public class ServiceResourceProviderTest {
expect(managementController1.addStages((RequestStageContainer) isNull(),
capture(clusterCapture), capture(requestPropertiesCapture),
capture(requestParametersCapture), capture(changedServicesCapture),
capture(changedCompsCapture),
- capture(changedScHostsCapture), capture(ignoredScHostsCapture),
anyBoolean(), anyBoolean()
+ capture(changedScHostsCapture), capture(ignoredScHostsCapture),
anyBoolean(), anyBoolean(), anyBoolean()
)).andReturn(requestStages1);
expect(managementController2.addStages((RequestStageContainer) isNull(),
capture(clusterCapture), capture(requestPropertiesCapture),
capture(requestParametersCapture), capture(changedServicesCapture),
capture(changedCompsCapture),
- capture(changedScHostsCapture), capture(ignoredScHostsCapture),
anyBoolean(), anyBoolean()
+ capture(changedScHostsCapture), capture(ignoredScHostsCapture),
anyBoolean(), anyBoolean(), anyBoolean()
)).andReturn(requestStages2);
requestStages1.persist();
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/tasks/TaskStatusListenerTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/tasks/TaskStatusListenerTest.java
index fc60758..6e62ef4 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/tasks/TaskStatusListenerTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/tasks/TaskStatusListenerTest.java
@@ -34,7 +34,7 @@ import org.apache.ambari.server.actionmanager.HostRoleCommand;
import org.apache.ambari.server.actionmanager.HostRoleStatus;
import org.apache.ambari.server.events.TaskCreateEvent;
import org.apache.ambari.server.events.TaskUpdateEvent;
-import org.apache.ambari.server.events.publishers.StateUpdateEventPublisher;
+import org.apache.ambari.server.events.publishers.STOMPUpdatePublisher;
import org.apache.ambari.server.events.publishers.TaskEventPublisher;
import org.apache.ambari.server.orm.dao.ExecutionCommandDAO;
import org.apache.ambari.server.orm.dao.HostDAO;
@@ -92,7 +92,7 @@ public class TaskStatusListenerTest extends EasyMockSupport {
RequestDAO requestDAO = createNiceMock(RequestDAO.class);
StageEntity stageEntity = createNiceMock(StageEntity.class);
RequestEntity requestEntity = createNiceMock(RequestEntity.class);
- StateUpdateEventPublisher statePublisher =
createNiceMock(StateUpdateEventPublisher.class);
+ STOMPUpdatePublisher statePublisher =
createNiceMock(STOMPUpdatePublisher.class);
EasyMock.expect(stageEntity.getStatus()).andReturn(hostRoleStatus).anyTimes();;
EasyMock.expect(stageEntity.getDisplayStatus()).andReturn(hostRoleStatus).anyTimes();
EasyMock.expect(stageEntity.isSkippable()).andReturn(Boolean.FALSE).anyTimes();;
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigHelperTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigHelperTest.java
index cc67575..6c7d648 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigHelperTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigHelperTest.java
@@ -46,7 +46,7 @@ import
org.apache.ambari.server.controller.AmbariManagementController;
import org.apache.ambari.server.controller.ClusterRequest;
import org.apache.ambari.server.controller.ConfigurationRequest;
import org.apache.ambari.server.controller.spi.ClusterController;
-import org.apache.ambari.server.events.publishers.StateUpdateEventPublisher;
+import org.apache.ambari.server.events.publishers.STOMPUpdatePublisher;
import org.apache.ambari.server.orm.DBAccessor;
import org.apache.ambari.server.orm.GuiceJpaInitializer;
import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
@@ -1092,7 +1092,7 @@ public class ConfigHelperTest {
bind(ClusterController.class).toInstance(clusterController);
bind(StackManagerFactory.class).toInstance(createNiceMock(StackManagerFactory.class));
bind(HostRoleCommandDAO.class).toInstance(createNiceMock(HostRoleCommandDAO.class));
-
bind(StateUpdateEventPublisher.class).toInstance(createNiceMock(StateUpdateEventPublisher.class));
+
bind(STOMPUpdatePublisher.class).toInstance(createNiceMock(STOMPUpdatePublisher.class));
}
});
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog260Test.java
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog260Test.java
index 35ee9f5..1e92ec5 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog260Test.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog260Test.java
@@ -75,7 +75,7 @@ import
org.apache.ambari.server.controller.RootServiceResponseFactory;
import org.apache.ambari.server.controller.ServiceConfigVersionResponse;
import org.apache.ambari.server.events.AmbariEvent;
import org.apache.ambari.server.events.MetadataUpdateEvent;
-import org.apache.ambari.server.events.publishers.StateUpdateEventPublisher;
+import org.apache.ambari.server.events.publishers.STOMPUpdatePublisher;
import org.apache.ambari.server.hooks.AmbariEventFactory;
import org.apache.ambari.server.hooks.HookContext;
import org.apache.ambari.server.hooks.HookContextFactory;
@@ -1046,7 +1046,7 @@ public class UpgradeCatalog260Test {
bind(AbstractRootServiceResponseFactory.class).to(RootServiceResponseFactory.class);
bind(CredentialStoreService.class).toInstance(createNiceMock(CredentialStoreService.class));
bind(ExecutionScheduler.class).toInstance(createNiceMock(ExecutionScheduler.class));
-
bind(StateUpdateEventPublisher.class).toInstance(createNiceMock(StateUpdateEventPublisher.class));
+
bind(STOMPUpdatePublisher.class).toInstance(createNiceMock(STOMPUpdatePublisher.class));
bind(KerberosHelper.class).toInstance(createNiceMock(KerberosHelperImpl.class));
}
});
--
To stop receiving notification emails like this one, please contact
mpapirkovs...@apache.org.
