Return-Path: X-Original-To: apmail-karaf-commits-archive@minotaur.apache.org Delivered-To: apmail-karaf-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F06361094F for ; Wed, 10 Apr 2013 09:16:43 +0000 (UTC) Received: (qmail 16014 invoked by uid 500); 10 Apr 2013 09:16:43 -0000 Delivered-To: apmail-karaf-commits-archive@karaf.apache.org Received: (qmail 15717 invoked by uid 500); 10 Apr 2013 09:16:30 -0000 Mailing-List: contact commits-help@karaf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@karaf.apache.org Delivered-To: mailing list commits@karaf.apache.org Received: (qmail 15681 invoked by uid 99); 10 Apr 2013 09:16:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Apr 2013 09:16:29 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Apr 2013 09:16:28 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1122A2388847; Wed, 10 Apr 2013 09:16:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1466395 - /karaf/cellar/branches/cellar-2.2.x/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java Date: Wed, 10 Apr 2013 09:16:07 -0000 To: commits@karaf.apache.org From: anierbeck@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130410091608.1122A2388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: anierbeck Date: Wed Apr 10 09:16:07 2013 New Revision: 1466395 URL: http://svn.apache.org/r1466395 Log: [KARAF-2262] - cellar-cloud: The IP is not enough, sometimes the IP is hidden but a valid dns name is available Modified: karaf/cellar/branches/cellar-2.2.x/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java Modified: karaf/cellar/branches/cellar-2.2.x/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java?rev=1466395&r1=1466394&r2=1466395&view=diff ============================================================================== --- karaf/cellar/branches/cellar-2.2.x/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java (original) +++ karaf/cellar/branches/cellar-2.2.x/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java Wed Apr 10 09:16:07 2013 @@ -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 i Set members = new HashSet(); ListContainerOptions opt = new ListContainerOptions(); - for (StorageMetadata md : blobStore.list(container, opt)) { + PageSet 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 i } } } + LOGGER.debug("CELLAR CLOUD: returning members {}", members); return members; }