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

Merge pull request #893 from andrewgaul/clear-container-retry 

Retry each operation up to maxErrors times
This commit is contained in:
Adrian Cole 2012-10-11 02:04:09 -07:00
parent f94504c9aa 331c3be2e8
commit bc0db19af3
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/DeleteAllKeysInList.java
View File

@ -93,7 +93,7 @@ public class DeleteAllKeysInList implements ClearListStrategy, ClearContainerStr
Map<StorageMetadata, Exception> exceptions = Maps.newHashMap(); Map<StorageMetadata, Exception> exceptions = Maps.newHashMap();
PageSet<? extends StorageMetadata> listing; PageSet<? extends StorageMetadata> listing;
int maxErrors = 3; // TODO parameterize int maxErrors = 3; // TODO parameterize
for (int i = 0; i < maxErrors; ) { for (int numErrors = 0; numErrors < maxErrors; ) {
// fetch partial directory listing // fetch partial directory listing
try { try {
listing = connection.list(containerName, options).get(); listing = connection.list(containerName, options).get();
@ -101,11 +101,11 @@ public class DeleteAllKeysInList implements ClearListStrategy, ClearContainerStr
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
break; break;
} catch (ExecutionException ee) { } catch (ExecutionException ee) {
++i; ++numErrors;
if (i == maxErrors) { if (numErrors == maxErrors) {
throw Throwables.propagate(ee.getCause()); throw Throwables.propagate(ee.getCause());
} }
retryHandler.imposeBackoffExponentialDelay(i, message); retryHandler.imposeBackoffExponentialDelay(numErrors, message);
continue; continue;
} }
@ -155,8 +155,8 @@ public class DeleteAllKeysInList implements ClearListStrategy, ClearContainerStr
exceptions = awaitCompletion(responses, userExecutor, maxTime, logger, message); exceptions = awaitCompletion(responses, userExecutor, maxTime, logger, message);
if (!exceptions.isEmpty()) { if (!exceptions.isEmpty()) {
++i; ++numErrors;
retryHandler.imposeBackoffExponentialDelay(i, message); retryHandler.imposeBackoffExponentialDelay(numErrors, message);
continue; continue;
} }
@ -165,6 +165,12 @@ public class DeleteAllKeysInList implements ClearListStrategy, ClearContainerStr
break; break;
} }
options = options.afterMarker(marker); options = options.afterMarker(marker);
// Reset numErrors if we execute a successful iteration. This ensures
// that we only try an unsuccessful operation maxErrors times but
// allow progress with directories containing many blobs in the face
// of some failures.
numErrors = 0;
} }
if (!exceptions.isEmpty()) if (!exceptions.isEmpty())
throw new BlobRuntimeException(String.format("error %s: %s", message, exceptions)); throw new BlobRuntimeException(String.format("error %s: %s", message, exceptions));