Merge pull request #82 from ajordens/handle-deleted-items-while-refre…

…shing It's possible that an item could be removed mid-refresh cycle
spinnaker · Mar 22, 2016 · a277d8a · a277d8a
2 parents 99b3f8e + 3ae0245
commit a277d8a
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/front50-s3/src/main/java/com/netflix/spinnaker/front50/model/S3Support.java b/front50-s3/src/main/java/com/netflix/spinnaker/front50/model/S3Support.java
@@ -213,8 +213,19 @@ protected Set<T> fetchAllItems(Set<T> existingItems) {
         .buffer(10)
         .flatMap(ids -> Observable
             .from(ids)
-            .flatMap(s3ObjectSummary ->
-                Observable.just(amazonS3.getObject(s3ObjectSummary.getBucketName(), s3ObjectSummary.getKey()))
+            .flatMap(s3ObjectSummary -> {
+                  try {
+                    return Observable.just(amazonS3.getObject(s3ObjectSummary.getBucketName(), s3ObjectSummary.getKey()));
+                  } catch (AmazonS3Exception e) {
+                    if (e.getStatusCode() == 404) {
+                      // an item has been removed between the time that object summaries were fetched and now
+                      existingItemsByName.remove(extractItemName(s3ObjectSummary));
+                      return Observable.empty();
+                    }
+
+                    throw e;
+                  }
+                }
             )
             .subscribeOn(scheduler)
         )
@@ -292,5 +303,6 @@ private String extractItemName(S3ObjectSummary s3ObjectSummary) {
   }
 
   abstract Class<T> getSerializedClass();
+
   abstract String getMetadataFilename();
 }