.

wcfs/wcfs.go

@@ -1346,14 +1346,15 @@ func (wlink *WatchLink) setupWatch(ctx context.Context, foid zodb.Oid, at zodb.T
 
 	// watch was not previously established - set it up anew
 	// XXX locking
-	bfdir := wlink.head.bfdir
+	head := wlink.head
+	bfdir := head.bfdir
 	f := bfdir.fileTab[foid]
 	if f == nil {
 		// by "invalidation protocol" watch is setup after data file was opened
 		return fmt.Errorf("file not yet known or is not a ZBigFile")
 	}
 
-	// XXX wait wlink.head.zconn.At() ≥ at
+	// XXX wait head.zconn.At() ≥ at
 	// XXX <~> f.δtail.Head() ≥ at (?)
 
 	if at < bfdir.δFtail.Tail() {
@@ -1367,22 +1368,17 @@ func (wlink *WatchLink) setupWatch(ctx context.Context, foid zodb.Oid, at zodb.T
 	bfdir.δFmu.RLock()
 	defer bfdir.δFmu.RUnlock()
 
-/* XXX reenable
-
-	// FIXME (!!!) since f.δtail does not have all changes to f, here we
-	// can be missing some pins we should be sending. (see wcfs_test.py for details)
-	for _, δ := range δFtail.SliceByRev(f, at, f.δtail.Head()) {
-		for _, blk := range δ.Changev {
+	// pin all tracked file blocks that were changed (at, head] range
+	for _, δfile := range bfdir.δFtail.SliceByFileRev(f, at, head.zconn.At()) {
+		for _, blk := range δfile.Change {
 			_, already := toPin[blk]
 			if already {
 				continue
 			}
 
-			// FIXME (!!!) again f.δtail can miss some entries
-			toPin[blk], _ = f.LastBlkRev(blk, at)
+			toPin[blk], _ = f.LastBlkRev(ctx, blk, at)
 		}
 	}
-*/
 
 	wg, ctx := errgroup.WithContext(ctx)
 	for blk, rev := range toPin {