Merge pull request rails#36941 from ts-3156/master

rafaelfranca · web-flow · commit a0fb2b2227c7 · 2020-04-13T16:19:49.000-04:00
Ignore Errno::ENOTEMPTY when calling AS::Cache::FileStore#clear with race conditions
diff --git a/activesupport/lib/active_support/cache/file_store.rb b/activesupport/lib/active_support/cache/file_store.rb
@@ -36,7 +36,7 @@ def self.supports_cache_versioning?
       def clear(options = nil)
         root_dirs = (Dir.children(cache_path) - GITKEEP_FILES)
         FileUtils.rm_r(root_dirs.collect { |f| File.join(cache_path, f) })
-      rescue Errno::ENOENT
+      rescue Errno::ENOENT, Errno::ENOTEMPTY
       end
 
       # Preemptively iterates through all stored keys and removes the ones which have expired.
