.

wcfs/internal/xbtree/δbtail.go

@@ -433,7 +433,7 @@ func (δBtail *ΔBtail) track(path []zodb.Oid, keycov KeyRange) {
 //
 // vδT is rebuilt if there are such not-yet-handled Track requests.
 func (δBtail *ΔBtail) vδTSnapForTrackedKey(root zodb.Oid, key Key) (vδT []ΔTree, err error) {
-	δBtail.mu.Lock()
+	δBtail.mu.Lock() // TODO verify that there is no in-progress writers
 	δTtail := δBtail.byRoot[root] // must be there
 	if δTtail == nil {
 		δBtail.mu.Unlock()
@@ -479,7 +479,7 @@ func (δBtail *ΔBtail) vδTSnapForTrackedKey(root zodb.Oid, key Key) (vδT []Δ
 //
 // vδT is rebuilt if there are such not-yet-handled Track requests.
 func (δBtail *ΔBtail) vδTSnapForTracked(root zodb.Oid) (vδT []ΔTree, err error) {
-	δBtail.mu.Lock()
+	δBtail.mu.Lock() // TODO verify that there is no in-progress writers
 	δTtail := δBtail.byRoot[root] // must be there
 	if δTtail == nil {
 		δBtail.mu.Unlock()
@@ -530,6 +530,9 @@ func (δBtail *ΔBtail) vδTSnapForTracked(root zodb.Oid) (vδT []ΔTree, err er
 //
 // XXX naming -> _rebuild1 ?
 func (δTtail *_ΔTtail) _runRebuildJob(root zodb.Oid, δBtail *ΔBtail) (err error) {
+	return δTtail.__runRebuildJob(root, δBtail, /*releaseLock=*/true)
+}
+func (δTtail *_ΔTtail) __runRebuildJob(root zodb.Oid, δBtail *ΔBtail, releaseLock bool) (err error) {
 	// XXX errctx
 	job := &_RebuildJob{ready: make(chan struct{})}
 
@@ -546,9 +549,13 @@ func (δTtail *_ΔTtail) _runRebuildJob(root zodb.Oid, δBtail *ΔBtail) (err er
 	delete(δBtail.trackNewRoots, root)
 
 	// build δ(vδT) without the lock
+	if releaseLock {
 		δBtail.mu.Unlock()
+	}
 	vδTnew, δtrackSet, err := vδTBuild(root, trackNew, δBtail.δZtail, δBtail.db)
+	if releaseLock {
 		δBtail.mu.Lock()
+	}
 
 	// krebuildJobs -= ktrackNew
 	for _, r := range ktrackNew.AllRanges() {
@@ -588,7 +595,9 @@ func (δTtail *_ΔTtail) _runRebuildJob(root zodb.Oid, δBtail *ΔBtail) (err er
 //
 // TODO optionally accept zconnOld/zconnNew from client
 func (δBtail *ΔBtail) Update(δZ *zodb.EventCommit) (_ ΔB, err error) {
-	// XXX locking
+	δBtail.mu.Lock()
+	defer δBtail.mu.Unlock()
+	// TODO verify that there is no in-progress readers/writers
 
 	headOld := δBtail.Head()
 	defer xerr.Contextf(&err, "ΔBtail.Update %s -> %s", headOld, δZ.Tid)
@@ -670,14 +679,14 @@ func (δBtail *ΔBtail) _Update1(δZ *zodb.EventCommit) (δB1 _ΔBUpdate1, err e
 	δB1 = _ΔBUpdate1{ByRoot: make(map[zodb.Oid]*_ΔTUpdate1)}
 
 	// update .trackSet and vδB from .trackNew
-	err = δBtail.rebuildAll()
+	err = δBtail._rebuildAll()
 	if err != nil {
 		return δB1, err
 	}
 
 	δBtail.δZtail.Append(δZ.Tid, δZ.Changev)
 
-	// NOTE: keep vvv in sync with vδTRebuild1
+	// NOTE: keep vvv in sync with vδTBuild1
 
 	δZTC, δtopsByRoot := δZConnectTracked(δZ.Changev, δBtail.trackSet)
 
@@ -722,18 +731,14 @@ func (δBtail *ΔBtail) _Update1(δZ *zodb.EventCommit) (δB1 _ΔBUpdate1, err e
 	return δB1, nil
 }
 
-// rebuildAll rebuilds ΔBtail taking all trackNew requests into account.
-func (δBtail *ΔBtail) rebuildAll() (err error) {
-	defer xerr.Context(&err, "ΔBtail rebuildAll")
-	// XXX locking correct?
-	δBtail.mu.Lock()
-	defer δBtail.mu.Unlock()
-
+// _rebuildAll rebuilds ΔBtail taking all trackNew requests into account.
+func (δBtail *ΔBtail) _rebuildAll() (err error) {
+	defer xerr.Context(&err, "ΔBtail _rebuildAll")
 	tracefΔBtail("\nRebuildAll @%s..@%s    trackNewRoots: %s\n", δBtail.Tail(), δBtail.Head(), δBtail.trackNewRoots)
 
 	for root := range δBtail.trackNewRoots {
 		δTtail := δBtail.byRoot[root] // must be there
-		err = δTtail._runRebuildJob(root, δBtail)
+		err = δTtail.__runRebuildJob(root, δBtail, /*releaseLock=*/false)
 		if err != nil {
 			return err
 		}
@@ -771,7 +776,9 @@ func (δBtail *ΔBtail) _vδBroots_Update1(root zodb.Oid, rev zodb.Tid) {
 
 // ForgetPast forgets history entries with revision ≤ revCut.
 func (δBtail *ΔBtail) ForgetPast(revCut zodb.Tid) {
-	// XXX locking
+	δBtail.mu.Lock()
+	defer δBtail.mu.Unlock()
+	// TODO verify that there is no in-progress readers/writers
 
 	δBtail.δZtail.ForgetPast(revCut)
 

wcfs/internal/xbtree/δbtail_test.go

@@ -1055,7 +1055,7 @@ func xverifyΔBTail_rebuild_TR(t *testing.T, δbtail *ΔBtail, tj *xbtreetest.Co
 	subj := fmt.Sprintf("@%s: after Track%v", tj.AtSymb(), keys)
 	δbtail.assertTrack(t, subj, trackSet, trackNew)
 
-	δbtail.rebuildAll()
+	δbtail._rebuildAll()
 
 	subj += " + rebuild"
 	δbtail.assertTrack(t, subj, trackSetAfterRebuild, ø)
@@ -1209,7 +1209,7 @@ func TestΔBtailSliceByRootRev(t_ *testing.T) {
 	// track 2 + rebuild.
 	_2 := setKey{}; _2.Add(2)
 	trackKeys(δbtail, t2, _2)
-	err = δbtail.rebuildAll();  X(err)
+	err = δbtail._rebuildAll();  X(err)
 
 	δttail := δbtail.byRoot[t.Root()]
 
@@ -1276,7 +1276,7 @@ func TestΔBtailSliceByRootRev(t_ *testing.T) {
 	// after track 1 + rebuild old slices remain unchanged, but new queries return updated data
 	_1 := setKey{}; _1.Add(1)
 	trackKeys(δbtail, t2, _1)
-	err = δbtail.rebuildAll();  X(err)
+	err = δbtail._rebuildAll();  X(err)
 
 	s00_ := δbtail.SliceByRootRev(t.Root(), t0.At, t0.At)
 	s01_ := δbtail.SliceByRootRev(t.Root(), t0.At, t1.At)
@@ -1341,7 +1341,7 @@ func TestΔBtailClone(t_ *testing.T) {
 	_, err := δbtail.Update(t1.ΔZ); X(err)
 	_2 := setKey{}; _2.Add(2)
 	trackKeys(δbtail, t1, _2)
-	err = δbtail.rebuildAll(); X(err)
+	err = δbtail._rebuildAll(); X(err)
 
 	δkv1_1 := map[Key]Δstring{2:{"b","d"}}
 	assertΔTtail(t.T, "orig @at1", δbtail, t1, t.Root(), δkv1_1)