Test legacy check retries behavior #1584
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ttaylorr
commented
Oct 14, 2016
| @@ -338,7 +338,7 @@ func (q *TransferQueue) individualApiRoutine(apiWaiter chan interface{}) { | |||
| for t := range q.apic { | |||
| obj, err := t.LegacyCheck() | |||
| if err != nil { | |||
| if q.canRetryObject(obj.Oid, err) { | |||
| if q.canRetryObject(t.Oid(), err) { | |||
There was a problem hiding this comment.
This is the actual bug.
There was a problem hiding this comment.
Confirmed that this fixes the issue, and that the new test-legacy-retries would catch it if it still was present. Thanks!
| @@ -70,7 +70,8 @@ refute_server_object() { | |||
| curl -v "$GITSERVER/$reponame.git/info/lfs/objects/$oid" \ | |||
| -u "user:pass" \ | |||
| -o http.json \ | |||
| -H "Accept: application/vnd.git-lfs+json" 2>&1 | | |||
| -H "Accept: application/vnd.git-lfs+json" \ | |||
| -H "X-Ignore-Retries: true" 2>&1 | | |||
There was a problem hiding this comment.
X-Ignore-Retries is added as a header value here so as to not fail these assert_server_object when the objects that are being looked for have a failure count assosciated with them.
technoweenie
approved these changes
Oct 14, 2016
Versions of Git in the 1.8.x series do not support empty config values during clone, so provide a no-op smudge filter during clone.
ttaylorr
force-pushed
the
legacy-retries-test
branch
from
904a812 to
0779577
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull-request fixes an issue described in #1580, where, when using the transferqueue with
lfs.batch=false, a failed legacy check would result in a nil-pointer dereferencepanic.To ensure further safety, I added two new
oidHandlers to force a finite number of retries into both the upload/download check for legacy transfers. I will follow this up in my next pull-request with a similar solution for the storage endpoint so we can also test this behavior when using the batch API./cc @technoweenie @rubyist @sschuberth #1580