Ignore concurrently-deleted files when deleting by prefix from GCS

rails · Jul 30, 2018 · f1107ac · f1107ac
1 parent 6ad4a0e
commit f1107ac
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/activestorage/lib/active_storage/service/gcs_service.rb b/activestorage/lib/active_storage/service/gcs_service.rb
@@ -68,7 +68,13 @@ def delete(key)
 
     def delete_prefixed(prefix)
       instrument :delete_prefixed, prefix: prefix do
-        bucket.files(prefix: prefix).all(&:delete)
+        bucket.files(prefix: prefix).all do |file|
+          begin
+            file.delete
+          rescue Google::Cloud::NotFoundError
+            # Ignore concurrently-deleted files
+          end
+        end
       end
     end