benjamyn/any-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ranges deadlock

Browse Source
This commit is contained in:
mcrakhman 2022-10-21 11:00:38 +02:00 committed by Mikhail Iudin
parent e0e0ed08ae
commit 27ff00eb48
No known key found for this signature in database
GPG Key ID: FAAAA8BAABDFF1C0
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/pkg/ldiff/diff.go
View File

@ -218,10 +218,6 @@ func (d *diff) Ranges(ctx context.Context, ranges []Range, resBuf []RangeResult)
d.mu.RLock() d.mu.RLock()
defer d.mu.RUnlock() defer d.mu.RUnlock()
return d.ranges(ranges, resBuf)
}
func (d *diff) ranges(ranges []Range, resBuf []RangeResult) (results []RangeResult, err error) {
results = resBuf[:0] results = resBuf[:0]
for _, r := range ranges { for _, r := range ranges {
results = append(results, d.getRange(r)) results = append(results, d.getRange(r))
@ -240,9 +236,6 @@ var errMismatched = errors.New("query and results mismatched")
// Diff makes diff with remote container // Diff makes diff with remote container
func (d *diff) Diff(ctx context.Context, dl Remote) (newIds, changedIds, removedIds []string, err error) { func (d *diff) Diff(ctx context.Context, dl Remote) (newIds, changedIds, removedIds []string, err error) {
d.mu.RLock()
defer d.mu.RUnlock()
dctx := &diffCtx{} dctx := &diffCtx{}
dctx.toSend = append(dctx.toSend, Range{ dctx.toSend = append(dctx.toSend, Range{
From: 0, From: 0,
@ -256,10 +249,10 @@ func (d *diff) Diff(ctx context.Context, dl Remote) (newIds, changedIds, removed
return return
default: default:
} }
if dctx.myRes, err = d.ranges(dctx.toSend, dctx.myRes); err != nil { if dctx.otherRes, err = dl.Ranges(ctx, dctx.toSend, dctx.otherRes); err != nil {
return return
} }
if dctx.otherRes, err = dl.Ranges(ctx, dctx.toSend, dctx.otherRes); err != nil { if dctx.myRes, err = d.Ranges(ctx, dctx.toSend, dctx.myRes); err != nil {
return return
} }
if len(dctx.otherRes) != len(dctx.toSend) || len(dctx.myRes) != len(dctx.toSend) { if len(dctx.otherRes) != len(dctx.toSend) || len(dctx.myRes) != len(dctx.toSend) {