.

wcfs/wcfs.go

@@ -1535,6 +1535,7 @@ func main() {
 	defer zstor.Close()
 
 	zdb := zodb.NewDB(zstor)
+	defer zdb.Close()	// XXX err
 	zhead, err := zopen(ctx, zdb, &zodb.ConnOptions{
 		// we need zhead.cache to be maintained across several transactions.
 		// see "3) for head/bigfile/* the following invariant is maintained ..."
@@ -1543,7 +1544,9 @@ func main() {
 	if err != nil {
 		log.Fatal(err)
 	}
-	zhead.Cache().SetControl(&zodbCacheControl{})	// XXX +locking?
+	zhead.Cache().Lock()
+	zhead.Cache().SetControl(&zodbCacheControl{})
+	zhead.Cache().Unlock()
 
 	// mount root + head/
 	// XXX -> newHead()

wcfs/zblk_test.go

@@ -46,6 +46,9 @@ func TestZBlk(t *testing.T) {
 	ctx := context.Background()
 	stor, err := zodb.OpenStorage(ctx, "testdata/zblk.fs", &zodb.OpenOptions{ReadOnly: true}); X(err)
 	db := zodb.NewDB(stor)
+	defer func() {
+		err := db.Close(); X(err)
+	}()
 
 	txn, ctx := transaction.New(ctx)
 	defer txn.Abort()