lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

api,transfer: teach Object to return when it expired

Browse Source
This commit is contained in:
Taylor Blau 2016-10-21 14:36:05 -06:00
parent 8beb41aff8
commit ca4821db28
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api/object.go
View File

@ -59,19 +59,20 @@ func (o *ObjectResource) Rel(name string) (*LinkRelation, bool) {
return rel, ok
}
// IsExpired returns true if any of the actions in this object resource have an
// ExpiresAt field that is after the given instant "now".
// IsExpired returns true, and the time of the expired action, if any of the
// actions in this object resource have an ExpiresAt field that is after the
// given instant "now".
//
// If the object contains no actions, or none of the actions it does contain
// have non-zero ExpiresAt fields, the object is not expired.
func (o *ObjectResource) IsExpired(now time.Time) bool {
func (o *ObjectResource) IsExpired(now time.Time) (time.Time, bool) {
for _, a := range o.Actions {
if !a.ExpiresAt.IsZero() && a.ExpiresAt.Before(now) {
return true
return a.ExpiresAt, true
}
}
return false
return time.Time{}, false
}
func (o *ObjectResource) NeedsAuth() bool {

10
api/object_test.go
View File

@ -14,7 +14,8 @@ func TestObjectsWithNoActionsAreNotExpired(t *testing.T) {
Actions: map[string]*api.LinkRelation{},
}
assert.False(t, o.IsExpired(time.Now()))
_, expired := o.IsExpired(time.Now())
assert.False(t, expired)
}
func TestObjectsWithZeroValueTimesAreNotExpired(t *testing.T) {
@ -28,7 +29,8 @@ func TestObjectsWithZeroValueTimesAreNotExpired(t *testing.T) {
},
}
assert.False(t, o.IsExpired(time.Now()))
_, expired := o.IsExpired(time.Now())
assert.False(t, expired)
}
func TestObjectsWithExpirationDatesAreExpired(t *testing.T) {
@ -45,5 +47,7 @@ func TestObjectsWithExpirationDatesAreExpired(t *testing.T) {
},
}
assert.True(t, o.IsExpired(now))
expiredAt, expired := o.IsExpired(now)
assert.Equal(t, expires, expiredAt)
assert.True(t, expired)
}

11
transfer/adapterbase.go
View File

@ -124,11 +124,18 @@ func (a *adapterBase) worker(workerNum int, ctx interface{}) {
}
tracerx.Printf("xfer: adapter %q worker %d processing job for %q", a.Name(), workerNum, t.Object.Oid)
// tt is the time that we are to compare the transfer's
// `expired_at` property against.
tt := time.Now().Add(-objectExpirationGracePeriod)
// Actual transfer happens here
var err error
if t.Object.IsExpired(time.Now().Add(objectExpirationGracePeriod)) {
if expAt, expired := t.Object.IsExpired(tt); expired {
tracerx.Printf("xfer: adapter %q worker %d found job for %q expired, retrying...", a.Name(), workerNum, t.Object.Oid)
err = errors.NewRetriableError(errors.Errorf("lfs/transfer: object %q has expired", t.Object.Oid))
err = errors.NewRetriableError(errors.Errorf(
"lfs/transfer: object %q has expired at %s, %s ago",
t.Object.Oid, expAt, tt.Sub(expAt),
))
} else if t.Object.Size < 0 {
tracerx.Printf("xfer: adapter %q worker %d found invalid size for %q (got: %d), retrying...", a.Name(), workerNum, t.Object.Oid, t.Object.Size)
err = fmt.Errorf("Git LFS: object %q has invalid size (got: %d)", t.Object.Oid, t.Object.Size)