Merge pull request #36941 from ts-3156/master

Ignore Errno::ENOTEMPTY when calling AS::Cache::FileStore#clear with race conditions
rails · Apr 13, 2020 · a0fb2b2 · a0fb2b2
2 parents 205d0c6 + b7e440e
commit a0fb2b2
Showing 1 changed file with 1 addition and 1 deletion.
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.