You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mp...@apache.org on 2018/01/05 17:13:49 UTC
[3/3] ambari git commit: AMBARI-22735. Delete host event doesn't have
hostName property. (mpapirkovskyy)
AMBARI-22735. Delete host event doesn't have hostName property. (mpapirkovskyy)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0045c04b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0045c04b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0045c04b
Branch: refs/heads/branch-3.0-perf
Commit: 0045c04b42e6ddccffb39b22508853fdb7266b7a
Parents: 57a0e5c
Author: Myroslav Papirkovskyi <mp...@hortonworks.com>
Authored: Thu Nov 2 19:56:15 2017 +0200
Committer: Myroslav Papirkovskyi <mp...@hortonworks.com>
Committed: Fri Jan 5 19:13:28 2018 +0200
----------------------------------------------------------------------
.../org/apache/ambari/server/agent/stomp/TopologyHolder.java | 5 +++++
.../org/apache/ambari/server/agent/stomp/dto/TopologyHost.java | 3 ++-
.../ambari/server/controller/internal/HostResourceProvider.java | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/0045c04b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/TopologyHolder.java
----------------------------------------------------------------------
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 50ef15a..46bf7d5 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
@@ -169,6 +169,11 @@ public class TopologyHolder extends AgentClusterDataHolder<TopologyUpdateEvent>
topologyComponent.setHostNames(new HashSet<>());
topologyComponent.setPublicHostNames(new HashSet<>());
}
+ if (topologyUpdateEvent.getEventType().equals(TopologyUpdateEvent.EventType.DELETE)) {
+ for (TopologyHost topologyHost : topologyCluster.getTopologyHosts()) {
+ topologyHost.setHostName(null);
+ }
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/0045c04b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/dto/TopologyHost.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/dto/TopologyHost.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/dto/TopologyHost.java
index 0e9a418..8b1d43d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/dto/TopologyHost.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/dto/TopologyHost.java
@@ -31,8 +31,9 @@ public class TopologyHost {
public TopologyHost() {
}
- public TopologyHost(Long hostId) {
+ public TopologyHost(Long hostId, String hostName) {
this.hostId = hostId;
+ this.hostName = hostName;
}
public TopologyHost(Long hostId, String hostName, String rackName, String ipv4) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/0045c04b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
index bd746f5..b07e834 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
@@ -1051,7 +1051,7 @@ public class HostResourceProvider extends AbstractControllerResourceProvider {
if (!topologyUpdates.containsKey(clusterId)) {
topologyUpdates.put(clusterId, new TopologyCluster());
}
- topologyUpdates.get(clusterId).getTopologyHosts().add(new TopologyHost(hostId));
+ topologyUpdates.get(clusterId).getTopologyHosts().add(new TopologyHost(hostId, hostname));
}
deleteStatusMetaData.addDeletedKey(hostname);
} catch (Exception ex) {