This is an automated email from the ASF dual-hosted git repository. mpapirkovskyy pushed a commit to branch branch-3.0-perf in repository https://gitbox.apache.org/repos/asf/ambari.git
commit e6d8deb32b59cfe287335244ab39640d9c605af0 Author: Myroslav Papirkovskyi <[email protected]> AuthorDate: Fri Dec 8 16:04:22 2017 +0200 AMBARI-22763. Fix checkstyle failure after merging trunk to branch-3.0-perf. (mpapirkovskyy) --- .../java/org/apache/ambari/server/agent/CommandRepository.java | 7 +++++++ .../org/apache/ambari/server/agent/stomp/AgentHostDataHolder.java | 2 +- .../ambari/server/controller/AmbariManagementControllerImpl.java | 2 -- .../ambari/server/events/publishers/AgentCommandsPublisher.java | 3 ++- .../java/org/apache/ambari/server/upgrade/UpgradeCatalog300.java | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/CommandRepository.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/CommandRepository.java index 7e0f269..72c9436 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/CommandRepository.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/CommandRepository.java @@ -234,6 +234,13 @@ public class CommandRepository { this.m_isPreInstalled = isPreInstalled.equalsIgnoreCase("true"); } + public Boolean getM_isPreInstalled() { + return m_isPreInstalled; + } + + public boolean isM_isScoped() { + return m_isScoped; + } } /** 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 7f1c1a9..23ab4ff 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 @@ -48,7 +48,7 @@ public abstract class AgentHostDataHolder<T extends AmbariHostUpdateEvent & Hash return !Objects.equals(agentHash, hostData.getHash()) ? hostData : getEmptyData(); } - private T initializeDataIfNeeded(Long hostId, boolean regenerateHash) throws AmbariException { + public T initializeDataIfNeeded(Long hostId, boolean regenerateHash) throws AmbariException { T hostData = data.get(hostId); if (hostData == null) { hostData = getCurrentData(hostId); 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 f5003db..d8bad3e 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 @@ -132,7 +132,6 @@ import org.apache.ambari.server.controller.metrics.MetricPropertyProviderFactory import org.apache.ambari.server.controller.metrics.MetricsCollectorHAManager; import org.apache.ambari.server.controller.metrics.timeline.cache.TimelineMetricCacheProvider; import org.apache.ambari.server.controller.spi.Resource; -import org.apache.ambari.server.controller.spi.SystemException; import org.apache.ambari.server.customactions.ActionDefinition; import org.apache.ambari.server.events.MetadataUpdateEvent; import org.apache.ambari.server.events.TopologyUpdateEvent; @@ -179,7 +178,6 @@ import org.apache.ambari.server.serveraction.kerberos.KerberosInvalidConfigurati import org.apache.ambari.server.serveraction.kerberos.KerberosOperationException; import org.apache.ambari.server.stack.ExtensionHelper; import org.apache.ambari.server.stack.RepoUtil; -import org.apache.ambari.server.stack.StackManager; import org.apache.ambari.server.stageplanner.RoleGraph; import org.apache.ambari.server.stageplanner.RoleGraphFactory; import org.apache.ambari.server.state.Cluster; 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 6decb7f..6676b16 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 @@ -90,7 +90,8 @@ public class AgentCommandsPublisher { Long hostId = hostEntry.getKey(); ExecutionCommandEvent executionCommandEvent = new ExecutionCommandEvent(hostEntry.getValue()); executionCommandEvent.setHostId(hostId); - executionCommandEvent.setRequiredConfigTimestamp(agentConfigsHolder.getCurrentData(hostId).getTimestamp()); + executionCommandEvent.setRequiredConfigTimestamp(agentConfigsHolder + .initializeDataIfNeeded(hostId, true).getTimestamp()); stateUpdateEventPublisher.publish(executionCommandEvent); } } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog300.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog300.java index 1ee1679..61224cb 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog300.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog300.java @@ -47,8 +47,8 @@ import org.apache.ambari.server.state.Cluster; import org.apache.ambari.server.state.Clusters; import org.apache.ambari.server.state.Config; import org.apache.ambari.server.state.ConfigHelper; -import org.apache.commons.collections.MapUtils; import org.apache.ambari.server.state.State; +import org.apache.commons.collections.MapUtils; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
