Merge pull request #5279 from wzshiming/fix/backoff

mxpv · web-flow · commit cc393ea87a9b · 2021-04-15T10:05:33.000-07:00
Optimize content/local/store.Writer backoff
diff --git a/content/local/store.go b/content/local/store.go
@@ -465,7 +465,6 @@ func (s *store) Writer(ctx context.Context, opts ...content.WriterOpt) (content.
 	}
 	var lockErr error
 	for count := uint64(0); count < 10; count++ {
-		time.Sleep(time.Millisecond * time.Duration(rand.Intn(1<<count)))
 		if err := tryLock(wOpts.Ref); err != nil {
 			if !errdefs.IsUnavailable(err) {
 				return nil, err
@@ -476,6 +475,7 @@ func (s *store) Writer(ctx context.Context, opts ...content.WriterOpt) (content.
 			lockErr = nil
 			break
 		}
+		time.Sleep(time.Millisecond * time.Duration(rand.Intn(1<<count)))
 	}
 
 	if lockErr != nil {

Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,6 @@ func (s *store) Writer(ctx context.Context, opts ...content.WriterOpt) (content.`
`465`	`465`	`}`
`466`	`466`	`var lockErr error`
`467`	`467`	`for count := uint64(0); count < 10; count++ {`
`468`		`- time.Sleep(time.Millisecond * time.Duration(rand.Intn(1<<count)))`
`469`	`468`	`if err := tryLock(wOpts.Ref); err != nil {`
`470`	`469`	`if !errdefs.IsUnavailable(err) {`
`471`	`470`	`return nil, err`
`@@ -476,6 +475,7 @@ func (s *store) Writer(ctx context.Context, opts ...content.WriterOpt) (content.`
`476`	`475`	`lockErr = nil`
`477`	`476`	`break`
`478`	`477`	`}`
	`478`	`+ time.Sleep(time.Millisecond * time.Duration(rand.Intn(1<<count)))`
`479`	`479`	`}`
`480`	`480`
`481`	`481`	`if lockErr != nil {`