[KARAF-2262] - cellar-cloud: The IP is not enough, sometimes the IP is hidden but a valid dns name is available ----- reverted parts of it, it looks a lot like IP is better used since the host name is not really fully qualified
git-svn-id: https://svn.apache.org/repos/asf/karaf/cellar/branches/cellar-2.2.x@1466407 13f79535-47bb-0310-9956-ffa450edef68 Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/b49de53d Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/b49de53d Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/b49de53d Branch: refs/heads/cellar-2.2.x Commit: b49de53d1ae81f5658185da6d1826e5a231b1918 Parents: ffaf402 Author: anierbeck <anierbeck@13f79535-47bb-0310-9956-ffa450edef68> Authored: Wed Apr 10 09:40:36 2013 +0000 Committer: anierbeck <anierbeck@13f79535-47bb-0310-9956-ffa450edef68> Committed: Wed Apr 10 09:40:36 2013 +0000 ---------------------------------------------------------------------- .../karaf/cellar/cloud/BlobStoreDiscoveryService.java | 6 +++--- .../org/apache/karaf/cellar/cloud/ServiceContainer.java | 9 ++++++++- 2 files changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/b49de53d/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java ---------------------------------------------------------------------- diff --git a/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java b/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java index df5dd86..632fdca 100644 --- a/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java +++ b/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java @@ -119,7 +119,7 @@ public class BlobStoreDiscoveryService implements DiscoveryService { DateTime registeredTime = serviceContainer.getRegisteredTime(); if (registeredTime != null && registeredTime.plusSeconds(validityPeriod).isAfterNow()) { LOGGER.debug("CELLAR CLOUD: adding member {} for IP {}", serviceContainer.getHostName(), ip); - members.add(serviceContainer.getHostName()); + members.add(serviceContainer.getHostIp()); } else { LOGGER.debug("CELLAR CLOUD: remove container {}", ip); blobStore.removeBlob(container, ip); @@ -135,7 +135,7 @@ public class BlobStoreDiscoveryService implements DiscoveryService { */ public void signIn() { DateTime now = new DateTime(); - createBlob(container, ipAddress, new ServiceContainer(getHostAdress(),now)); + createBlob(container, ipAddress, new ServiceContainer(getHostAdress(), getIpAddress(), now)); } /** @@ -143,7 +143,7 @@ public class BlobStoreDiscoveryService implements DiscoveryService { */ public void refresh() { DateTime now = new DateTime(); - createBlob(container, ipAddress, new ServiceContainer(getHostAdress(),now)); + createBlob(container, ipAddress, new ServiceContainer(getHostAdress(), getIpAddress(), now)); } /** http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/b49de53d/cloud/src/main/java/org/apache/karaf/cellar/cloud/ServiceContainer.java ---------------------------------------------------------------------- diff --git a/cloud/src/main/java/org/apache/karaf/cellar/cloud/ServiceContainer.java b/cloud/src/main/java/org/apache/karaf/cellar/cloud/ServiceContainer.java index d2bd31c..c7a5098 100644 --- a/cloud/src/main/java/org/apache/karaf/cellar/cloud/ServiceContainer.java +++ b/cloud/src/main/java/org/apache/karaf/cellar/cloud/ServiceContainer.java @@ -27,6 +27,8 @@ public class ServiceContainer implements Serializable { private DateTime registeredTime; private String hostName; + private String hostIp; + public DateTime getRegisteredTime() { return registeredTime; } @@ -35,8 +37,13 @@ public class ServiceContainer implements Serializable { return hostName; } - public ServiceContainer(String hostName, DateTime registeredTime) { + public String getHostIp() { + return hostIp; + } + + public ServiceContainer(String hostName, String hostIp, DateTime registeredTime) { this.registeredTime = registeredTime; this.hostName = hostName; + this.hostIp = hostIp; } }
