Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue 763: cache loader does not reload after AuthorizationException

This commit is contained in:
Aled Sage 2011-12-08 14:14:23 +00:00 committed by Adrian Cole
parent dad5356991
commit 094e537488
4 changed files with 136 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2ComputeServiceContextModule.java
View File

@ -102,6 +102,7 @@ public class EC2ComputeServiceContextModule extends BaseComputeServiceContextMod
protected Supplier<CacheLoader<RegionAndName, Image>> provideRegionAndNameToImageSupplierCacheLoader(
final RegionAndIdToImage delegate) {
return Suppliers.<CacheLoader<RegionAndName, Image>>ofInstance(new CacheLoader<RegionAndName, Image>() {
private final AtomicReference<AuthorizationException> authException = new AtomicReference<AuthorizationException>();
@Override
public Image load(final RegionAndName key) throws Exception {
@ -117,7 +118,6 @@ public class EC2ComputeServiceContextModule extends BaseComputeServiceContextMod
};
// wrap in retry logic
AtomicReference<AuthorizationException> authException = new AtomicReference<AuthorizationException>();
Supplier<Image> retryingSupplier = new RetryOnTimeOutExceptionSupplier<Image>(
new SetAndThrowAuthorizationExceptionSupplier<Image>(rawSupplier, authException));

67
apis/ec2/src/test/java/org/jclouds/ec2/compute/config/EC2ComputeServiceContextModuleTest.java Normal file
View File

@ -0,0 +1,67 @@
/**
* Licensed to jclouds, Inc. (jclouds) under one or more
* contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. jclouds licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.jclouds.ec2.compute.config;
import static org.easymock.EasyMock.expect;
import static org.easymock.classextension.EasyMock.createMock;
import static org.easymock.classextension.EasyMock.replay;
import static org.testng.Assert.fail;
import org.jclouds.compute.domain.Image;
import org.jclouds.ec2.compute.domain.RegionAndName;
import org.jclouds.ec2.compute.functions.RegionAndIdToImage;
import org.jclouds.rest.AuthorizationException;
import org.testng.annotations.Test;
import com.google.common.base.Supplier;
import com.google.common.cache.CacheLoader;
/**
* @author Aled Sage
*/
@Test(groups = "unit")
public class EC2ComputeServiceContextModuleTest {
@Test
public void testCacheLoaderDoesNotReloadAfterAuthorizationException() throws Exception {
EC2ComputeServiceContextModule module = new EC2ComputeServiceContextModule() {
public Supplier<CacheLoader<RegionAndName, Image>> provideRegionAndNameToImageSupplierCacheLoader(RegionAndIdToImage delegate) {
return super.provideRegionAndNameToImageSupplierCacheLoader(delegate);
}
};
RegionAndName regionAndName = new RegionAndName("myregion", "myname");
AuthorizationException authException = new AuthorizationException();
RegionAndIdToImage mockRegionAndIdToImage = createMock(RegionAndIdToImage.class);
expect(mockRegionAndIdToImage.load(regionAndName)).andThrow(authException).once();
replay(mockRegionAndIdToImage);
CacheLoader<RegionAndName, Image> cacheLoader = module.provideRegionAndNameToImageSupplierCacheLoader(mockRegionAndIdToImage).get();
for (int i = 0; i < 2; i++) {
try {
Image image = cacheLoader.load(regionAndName);
fail("Expected Authrization exception, but got "+image);
} catch (AuthorizationException e) {
// success
}
}
}
}

2
providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceContextModule.java
View File

@ -131,6 +131,7 @@ public class AWSEC2ComputeServiceContextModule extends BaseComputeServiceContext
protected Supplier<CacheLoader<RegionAndName, Image>> provideRegionAndNameToImageSupplierCacheLoader(
final RegionAndIdToImage delegate) {
return Suppliers.<CacheLoader<RegionAndName, Image>>ofInstance(new CacheLoader<RegionAndName, Image>() {
private final AtomicReference<AuthorizationException> authException = new AtomicReference<AuthorizationException>();
@Override
public Image load(final RegionAndName key) throws Exception {
@ -146,7 +147,6 @@ public class AWSEC2ComputeServiceContextModule extends BaseComputeServiceContext
};
// wrap in retry logic
AtomicReference<AuthorizationException> authException = new AtomicReference<AuthorizationException>();
Supplier<Image> retryingSupplier = new RetryOnTimeOutExceptionSupplier<Image>(
new SetAndThrowAuthorizationExceptionSupplier<Image>(rawSupplier, authException));

67
providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceContextModuleTest.java Normal file
View File

@ -0,0 +1,67 @@
/**
* Licensed to jclouds, Inc. (jclouds) under one or more
* contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. jclouds licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.jclouds.aws.ec2.compute.config;
import static org.easymock.EasyMock.expect;
import static org.easymock.classextension.EasyMock.createMock;
import static org.easymock.classextension.EasyMock.replay;
import static org.testng.Assert.fail;
import org.jclouds.compute.domain.Image;
import org.jclouds.ec2.compute.domain.RegionAndName;
import org.jclouds.ec2.compute.functions.RegionAndIdToImage;
import org.jclouds.rest.AuthorizationException;
import org.testng.annotations.Test;
import com.google.common.base.Supplier;
import com.google.common.cache.CacheLoader;
/**
* @author Aled Sage
*/
@Test(groups = "unit")
public class AWSEC2ComputeServiceContextModuleTest {
@Test
public void testCacheLoaderDoesNotReloadAfterAuthorizationException() throws Exception {
AWSEC2ComputeServiceContextModule module = new AWSEC2ComputeServiceContextModule() {
public Supplier<CacheLoader<RegionAndName, Image>> provideRegionAndNameToImageSupplierCacheLoader(RegionAndIdToImage delegate) {
return super.provideRegionAndNameToImageSupplierCacheLoader(delegate);
}
};
RegionAndName regionAndName = new RegionAndName("myregion", "myname");
AuthorizationException authException = new AuthorizationException();
RegionAndIdToImage mockRegionAndIdToImage = createMock(RegionAndIdToImage.class);
expect(mockRegionAndIdToImage.load(regionAndName)).andThrow(authException).once();
replay(mockRegionAndIdToImage);
CacheLoader<RegionAndName, Image> cacheLoader = module.provideRegionAndNameToImageSupplierCacheLoader(mockRegionAndIdToImage).get();
for (int i = 0; i < 2; i++) {
try {
Image image = cacheLoader.load(regionAndName);
fail("Expected Authrization exception, but got "+image);
} catch (AuthorizationException e) {
// success
}
}
}
}