sync: update skipped bytes on skipped files

scylladb · Nov 22, 2023 · 5ef09c5 · 5ef09c5
1 parent 39b1bed
commit 5ef09c5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/fs/accounting/stats.go b/fs/accounting/stats.go
@@ -625,6 +625,13 @@ func (s *StatsInfo) DoneTransferring(remote string, ok bool) {
  }
 }
 
+// UpdateSkipped marks file bytes as skipped in oldTransfers.
+func (s *StatsInfo) UpdateSkipped(size int64) {
+ s.mu.Lock()
+ s.oldTransfers.Skipped += size
+ s.mu.Unlock()
+}
+
 // SetCheckQueue sets the number of queued checks
 func (s *StatsInfo) SetCheckQueue(n int, size int64) {
  s.mu.Lock()

diff --git a/fs/accounting/transfer.go b/fs/accounting/transfer.go
@@ -47,14 +47,11 @@ func (ai *AggregatedTransferInfo) update(t *Transfer) {
  b, s = t.acc.progress()
  }
  ai.Size += s
- switch {
- case t.err != nil:
+ if t.err != nil {
  ai.Failed += s
  ai.Error = errors.Join(ai.Error, t.err)
- case b > 0:
+ } else {
  ai.Uploaded += b
- default:
- ai.Skipped += s
  }
 }
 

diff --git a/fs/sync/sync.go b/fs/sync/sync.go
@@ -364,8 +364,7 @@ func (s *syncCopyMove) pairChecker(in *pipe, out *pipe, fraction int, wg *sync.W
  }
  }
  if !ok {
- // Record dummy transfer for calculating skipped bytes of skipped files
- accounting.Stats(s.ctx).NewTransfer(src).Done(s.ctx, err)
+ accounting.Stats(s.ctx).UpdateSkipped(tr.Snapshot().Size)
  }
  tr.Done(s.ctx, err)
  }
@@ -387,6 +386,8 @@ func (s *syncCopyMove) pairRenamer(in *pipe, out *pipe, fraction int, wg *sync.W
  if !ok {
  return
  }
+ } else {
+ accounting.Stats(s.ctx).UpdateSkipped(src.Size())
  }
  }
 }
@@ -1012,8 +1013,7 @@ func (s *syncCopyMove) SrcOnly(src fs.DirEntry) (recurse bool) {
  return
  }
  } else {
- // Record dummy transfer for calculating skipped bytes of skipped files
- accounting.Stats(s.ctx).NewTransfer(x).Done(s.ctx, err)
+ accounting.Stats(s.ctx).UpdateSkipped(x.Size())
  }
  }
  case fs.Directory: