[KARAF-2262] - cellar-cloud: The IP is not enough, sometimes the IP is hidden but a valid dns name is available
git-svn-id: https://svn.apache.org/repos/asf/karaf/cellar/branches/cellar-2.2.x@1466395 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/ffaf4020 Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/ffaf4020 Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/ffaf4020 Branch: refs/heads/cellar-2.2.x Commit: ffaf4020ed388a3bc177deed013172d7f1eff361 Parents: 216aa91 Author: anierbeck <anierbeck@13f79535-47bb-0310-9956-ffa450edef68> Authored: Wed Apr 10 09:16:07 2013 +0000 Committer: anierbeck <anierbeck@13f79535-47bb-0310-9956-ffa450edef68> Committed: Wed Apr 10 09:16:07 2013 +0000 ---------------------------------------------------------------------- .../karaf/cellar/cloud/BlobStoreDiscoveryService.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ffaf4020/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 128d135..df5dd86 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 @@ -18,7 +18,9 @@ import org.jclouds.blobstore.BlobStore; import org.jclouds.blobstore.BlobStoreContext; import org.jclouds.blobstore.BlobStoreContextFactory; import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.PageSet; import org.jclouds.blobstore.domain.StorageMetadata; +import org.jclouds.blobstore.domain.StorageType; import org.jclouds.blobstore.options.ListContainerOptions; import org.joda.time.DateTime; import org.slf4j.Logger; @@ -91,7 +93,13 @@ public class BlobStoreDiscoveryService implements DiscoveryService { Set<String> members = new HashSet<String>(); ListContainerOptions opt = new ListContainerOptions(); - for (StorageMetadata md : blobStore.list(container, opt)) { + PageSet<? extends StorageMetadata> pageSet = blobStore.list(container, opt); + LOGGER.debug("CELLAR CLOUD: storage contains a pageset of size {}", pageSet.size()); + for (StorageMetadata md : pageSet) { + if (md.getType() != StorageType.BLOB) { + //skip everything that isn't of type BLOB ... + continue; + } String ip = md.getName(); Object obj = readBlob(container, ip); //Check if ip hasn't been updated recently. @@ -118,6 +126,7 @@ public class BlobStoreDiscoveryService implements DiscoveryService { } } } + LOGGER.debug("CELLAR CLOUD: returning members {}", members); return members; }
