.

go/zodb/btree/btree_test.go

@@ -106,6 +106,9 @@ func TestBTree(t *testing.T) {
 		t.Fatal(err)
 	}
 	db := zodb.NewDB(stor)
+	defer func() {
+		err := db.Close(); X(err)
+	}()
 
 	txn, ctx := transaction.New(ctx)
 	defer txn.Abort()

go/zodb/db.go

@@ -45,7 +45,8 @@ import (
 //
 // DB is safe to access from multiple goroutines simultaneously.
 type DB struct {
-	stor IStorage
+	stor   IStorage
+	watchq chan Event // we are watching .stor via here
 
 	mu sync.Mutex
 
@@ -114,25 +115,42 @@ type DB struct {
 
 
 // NewDB creates new database handle.
+//
+// Created database handle must be closed when no longer needed.
 func NewDB(stor IStorage) *DB {
 	// XXX db options?
 	db := &DB{
-		stor:  stor,
-		δwait: make(map[δwaiter]struct{}),
+		stor:   stor,
+		watchq: make(chan Event),
+		δwait:  make(map[δwaiter]struct{}),
 
 		tδkeep: 10*time.Minute, // see δtail discussion
 	}
 
-	watchq := make(chan Event)
-	at0 := stor.AddWatch(watchq)
+	at0 := stor.AddWatch(db.watchq)
 	db.δtail = NewΔTail(at0) // init to (at0, at0]
 
-	go db.watcher(watchq)
-	// XXX DelWatch? in db.Close() ?
-
+	go db.watcher()
 	return db
 }
 
+// XXX DB.shutdown(reason error) ?
+
+// Close closes database handle.
+//
+// After Close DB.Open calls will return error. However it is ok to continue
+// working with connections opened prior Close.
+func (db *DB) Close() error {
+	db.mu.Lock()
+	defer db.mu.Unlock()
+
+	stor.DelWatch(db.watchq)
+
+	// XXX stub
+	return nil
+}
+
+
 // ConnOptions describes options to DB.Open .
 type ConnOptions struct {
 	At     Tid  // if !0, open Connection bound to `at` view of database; not latest.
@@ -177,9 +195,10 @@ type δwaiter struct {
 // watcher receives events about new committed transactions and updates δtail.
 //
 // it also notifies δtail waiters.
-func (db *DB) watcher(watchq <-chan Event) { // XXX err ?
+func (db *DB) watcher() { // XXX err ?
 	for {
-		event, ok := <-watchq
+		// XXX check for db.down
+		event, ok := <-db.watchq
 		if !ok {
 			fmt.Printf("db: watcher: close\n")
 			// XXX wake up all waiters?
@@ -255,6 +274,8 @@ func (db *DB) Open(ctx context.Context, opt *ConnOptions) (_ *Connection, err er
 		}
 	}()
 
+	// XXX check db is aready down/closed
+
 	txn := transaction.Current(ctx)
 
 	// find out db state we should open at

go/zodb/persistent_test.go

@@ -347,6 +347,9 @@ func testPersistentDB(t0 *testing.T, rawcache bool) {
 	ctx := context.Background()
 	stor, err := OpenStorage(ctx, zurl, &OpenOptions{ReadOnly: true, NoCache: !rawcache}); X(err)
 	db := NewDB(stor)
+	defer func() {
+		err := db.Close(); X(err)
+	}()
 
 	// testopen opens new db transaction/connection and wraps it with tPersistentDB.
 	testopen := func(opt *ConnOptions) *tPersistentDB {

go/zodb/zodb.go

@@ -359,6 +359,8 @@ type IStorageDriver interface {
 	// LastTid returns the id of the last committed transaction.
 	//
 	// If no transactions have been committed yet, LastTid returns 0.
+	//
+	// XXX clarify semantic		XXX -> Sync + Head ?
 	LastTid(ctx context.Context) (Tid, error)
 
 	Loader