Merge pull request #1721 from Deradon/feature/file-storage_cache-with…

…-clean-on-exception

Store::File#cache! will clean_cache! and retry after Errno::EMLINK

lib/carrierwave/storage/file.rb

@@ -64,6 +64,14 @@ def retrieve!(identifier)
       #
       def cache!(new_file)
         new_file.move_to(::File.expand_path(uploader.cache_path, uploader.root), uploader.permissions, uploader.directory_permissions, true)
+      rescue Errno::EMLINK => e
+        raise(e) if @cache_called
+        @cache_called = true
+
+        # NOTE: Remove cached files older than 10 minutes
+        clean_cache!(600)
+
+        cache!(new_file)
       end
 
       ##

spec/storage/file_spec.rb

@@ -1,8 +1,16 @@
 # encoding: utf-8
 
 require 'spec_helper'
+require 'support/file_utils_helper'
+require 'tempfile'
 
 describe CarrierWave::Storage::File do
+  include FileUtilsHelper
+
+  subject(:storage) { described_class.new(@uploader) }
+
+  let(:tempfile) { Tempfile.new("foo") }
+  let(:sanitized_temp_file) { CarrierWave::SanitizedFile.new(tempfile) }
 
   before do
     @uploader_class = Class.new(CarrierWave::Uploader::Base)
@@ -39,6 +47,15 @@
     end
   end
 
+  describe '#cache!' do
+    context "when FileUtils.mkdir_p raises Errno::EMLINK" do
+      before { fake_failed_mkdir_p }
+      after { storage.cache!(sanitized_temp_file) }
+
+      it { is_expected.to receive(:clean_cache!).with(600) }
+    end
+  end
+
   describe '#clean_cache!' do
     before do
       five_days_ago_int  = 1369894322

spec/support/file_utils_helper.rb

@@ -0,0 +1,15 @@
+module FileUtilsHelper
+  # NOTE: Make FileUtils.mkdir_p to raise `Errno::EMLINK` only once
+  def fake_failed_mkdir_p
+    original_mkdir_p = FileUtils.method(:mkdir_p)
+    mkdir_p_called = false
+    allow(FileUtils).to receive(:mkdir_p) do |args|
+      if mkdir_p_called
+        original_mkdir_p.call(*args)
+      else
+        mkdir_p_called = true
+        raise Errno::EMLINK
+      end
+    end
+  end
+end