Merge pull request square#40 from square/jmartin/add-cache-clean-retry-failure-mode

Add a new automatic cache clean failure mode 'did not receive expected object'

Author: Justin Martin

.travis.yml

@@ -4,3 +4,7 @@ language:
 rvm:
   - 2.3.1
   - 2.6.1
+
+before_install:
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '< 2.0'

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git-fastclone (1.2.4)
+    git-fastclone (1.2.5)
       colorize
       terrapin (~> 0.6.0)
 

lib/git-fastclone.rb

@@ -357,7 +357,8 @@ def with_git_mirror(url)
             'fatal: remote did not send all necessary objects',
             /fatal: packed object [a-z0-9]+ \(stored in .*?\) is corrupt/,
             /fatal: pack has \d+ unresolved deltas/,
-            'error: unable to read sha1 file of '
+            'error: unable to read sha1 file of ',
+            'fatal: did not receive expected object'
           ]
           if e.to_s =~ /^STDERR:\n.+^#{Regexp.union(error_strings)}/m
             # To avoid corruption of the cache, if we failed to update or check out we remove

lib/git-fastclone/version.rb

@@ -2,5 +2,5 @@
 
 # Version string for git-fastclone
 module GitFastCloneVersion
-  VERSION = '1.2.4'.freeze
+  VERSION = '1.2.5'.freeze
 end

spec/git_fastclone_runner_spec.rb

@@ -389,4 +389,32 @@
     expect(responses).to be_empty
     expect(yielded).to eq([test_url_valid])
   end
+
+  it 'should retry when the cache errors with did not receive expected object' do
+    allow(subject).to receive(:update_reference_repo) {}
+    expect(subject).to receive(:reference_repo_dir)
+    expect(subject).to receive(:reference_repo_lock_file).and_return(lockfile)
+
+    responses = [
+      lambda { |_url|
+        raise Terrapin::ExitStatusError, <<-ERROR.gsub(/^ {12}/, '')
+            STDOUT:
+
+            STDERR:
+
+            error: Could not read 6682dfe81f66656436e60883dd795e7ec6735153
+            error: Could not read 0cd3703c23fa44c0043d97fbc26356a23939f31b
+            fatal: did not receive expected object 3c64c9dd49c79bd09aa13d4b05ac18263ca29ccd
+            fatal: index-pack failed
+        ERROR
+      },
+      ->(url) { url }
+    ]
+    subject.with_git_mirror(test_url_valid) do
+      yielded << responses.shift.call(test_url_valid)
+    end
+
+    expect(responses).to be_empty
+    expect(yielded).to eq([test_url_valid])
+  end
 end