You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2016/10/20 12:47:10 UTC
jclouds-labs git commit: Ignore storage account access failures when
listing custom images
Repository: jclouds-labs
Updated Branches:
refs/heads/master a1684e2d8 -> e1670f5c9
Ignore storage account access failures when listing custom images
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/e1670f5c
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/e1670f5c
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/e1670f5c
Branch: refs/heads/master
Commit: e1670f5c97442be977bf97cbf3b35423b1377532
Parents: a1684e2
Author: Ignasi Barrera <na...@apache.org>
Authored: Wed Oct 19 16:55:10 2016 +0200
Committer: Ignasi Barrera <na...@apache.org>
Committed: Wed Oct 19 16:55:10 2016 +0200
----------------------------------------------------------------------
.../arm/compute/AzureComputeServiceAdapter.java | 36 +++++++++++++-------
1 file changed, 24 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/e1670f5c/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceAdapter.java
----------------------------------------------------------------------
diff --git a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceAdapter.java b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceAdapter.java
index 9670433..3b207b7 100644
--- a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceAdapter.java
+++ b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceAdapter.java
@@ -32,7 +32,9 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import javax.annotation.Resource;
import javax.inject.Inject;
+import javax.inject.Named;
import javax.inject.Singleton;
import org.jclouds.azurecompute.arm.AzureComputeApi;
@@ -79,7 +81,9 @@ import org.jclouds.compute.ComputeServiceAdapter;
import org.jclouds.compute.domain.Image;
import org.jclouds.compute.domain.OsFamily;
import org.jclouds.compute.domain.Template;
+import org.jclouds.compute.reference.ComputeServiceConstants;
import org.jclouds.location.Region;
+import org.jclouds.logging.Logger;
import com.google.common.base.Function;
import com.google.common.base.Objects;
@@ -101,6 +105,10 @@ public class AzureComputeServiceAdapter implements ComputeServiceAdapter<Virtual
public static final String GROUP_KEY = "jclouds_group";
+ @Resource
+ @Named(ComputeServiceConstants.COMPUTE_LOGGER)
+ protected Logger logger = Logger.NULL;
+
private final CleanupResources cleanupResources;
private final AzureComputeApi api;
private final AzureComputeConstants azureComputeConstants;
@@ -223,19 +231,23 @@ public class AzureComputeServiceAdapter implements ComputeServiceAdapter<Virtual
List<StorageService> storages = api.getStorageAccountApi(azureGroup).list();
for (StorageService storage : storages) {
- String name = storage.name();
- StorageService storageService = api.getStorageAccountApi(azureGroup).get(name);
- if (storageService != null
- && Status.Succeeded == storageService.storageServiceProperties().provisioningState()) {
- String key = api.getStorageAccountApi(azureGroup).getKeys(name).key1();
- BlobHelper blobHelper = new BlobHelper(storage.name(), key);
- try {
- List<VMImage> images = blobHelper.getImages(CONTAINER_NAME, azureGroup, CUSTOM_IMAGE_OFFER,
- storage.location());
- osImages.addAll(images);
- } finally {
- closeQuietly(blobHelper);
+ try {
+ String name = storage.name();
+ StorageService storageService = api.getStorageAccountApi(azureGroup).get(name);
+ if (storageService != null
+ && Status.Succeeded == storageService.storageServiceProperties().provisioningState()) {
+ String key = api.getStorageAccountApi(azureGroup).getKeys(name).key1();
+ BlobHelper blobHelper = new BlobHelper(storage.name(), key);
+ try {
+ List<VMImage> images = blobHelper.getImages(CONTAINER_NAME, azureGroup, CUSTOM_IMAGE_OFFER,
+ storage.location());
+ osImages.addAll(images);
+ } finally {
+ closeQuietly(blobHelper);
+ }
}
+ } catch (Exception ex) {
+ logger.warn("<< could not get custom images from storage account %s: %s", storage, ex.getMessage());
}
}
}