Delete chunks in S3 on error if any exist

astra/src/main/java/com/slack/astra/blobfs/BlobStore.java

@@ -84,6 +84,17 @@ public void upload(String prefix, Path directoryToUpload) {
                 upload.failedTransfers().size()));
       }
     } catch (ExecutionException | InterruptedException e) {
+
+      // Sometimes the upload above will upload _some_ of the data before
+      // throwing an error. If that's the case, we need to clean up the data
+      // in S3
+      try {
+        this.delete(prefix);
+        LOG.info("Successfully cleaned up prefix {}.", prefix);
+      } catch (Exception _) {
+        LOG.info("Unable to cleanup prefix {}. Ignoring exception.", prefix);
+      }
+
       throw new RuntimeException(e);
     }
   }

astra/src/main/java/com/slack/astra/chunkManager/IndexingChunkManager.java

@@ -196,7 +196,7 @@ public void addMessage(
   }
 
   /**
-   * This method initiates a roll over of the active chunk. In future, consider moving the some of
+   * This method initiates a roll over of the active chunk. In the future, consider moving some of
    * the roll over logic into ChunkImpl.
    */
   private void doRollover(ReadWriteChunk<T> currentChunk) {