.

go/zodb/persistent.go

@@ -208,10 +208,10 @@ func (obj *Persistent) PActivate(ctx context.Context) (err error) {
 			"%v (want %v); .loading = %p (want %p)", s, GHOST, l, loading))
 	}
 
-	obj.serial = serial
-
 	// try to pass loaded state to object
 	if err == nil {
+		obj.serial = serial
+
 		switch istate := obj.istate().(type) {
 		case Stateful:
 			err = istate.SetState(state)
@@ -229,15 +229,15 @@ func (obj *Persistent) PActivate(ctx context.Context) (err error) {
 		if err == nil {
 			obj.state = UPTODATE
 		}
-	}
-
-	loading.err = err
 
+	} else {
+		obj.serial = InvalidTid
 		// force reload on next activate if it was an error
-	if err != nil {
 		obj.loading = nil
 	}
 
+	loading.err = err
+
 	obj.mu.Unlock()
 	close(loading.ready)
 

go/zodb/persistent_test.go

@@ -487,13 +487,11 @@ func testPersistentDB(t0 *testing.T, rawcache bool) {
 
 	tdb.Add(101, "bonjour")
 	tdb.Add(102, "monde")
-	tdb.Commit()
-	at0 := tdb.head
+	at0 := tdb.Commit()
 
 	tdb.Add(101, "hello")
 	tdb.Add(102, "world")
-	tdb.Commit()
-	at1 := tdb.head
+	at1 := tdb.Commit()
 
 	tdb.Reopen() // so that at0 is not covered by db.δtail
 	db := tdb.db
@@ -555,8 +553,7 @@ func testPersistentDB(t0 *testing.T, rawcache bool) {
 
 	// commit change to obj2 from external process
 	tdb.Add(102, "kitty")
-	tdb.Commit()
-	at2 := tdb.head
+	at2 := tdb.Commit()
 
 	// new db connection should see the change
 	t2 := tdb.Open(&ConnOptions{})
@@ -733,6 +730,8 @@ func testPersistentDB(t0 *testing.T, rawcache bool) {
 	t.checkObj(robj2, 102, InvalidTid, GHOST, 0)
 }
 
+// Verify that PActivate works correctly after hitting an error from the storage.
+// In this test the error is "object was deleted".
 func TestActivateAfterDelete(t0 *testing.T) {
 	assert := assert.New(t0)
 
@@ -768,7 +767,7 @@ func TestActivateAfterDelete(t0 *testing.T) {
 	// conn stays at older view with obj pinned into the cache
 	t.checkObj(obj, 101, at0, UPTODATE, 0, "object")
 
-	// finish transaction and reopen new connection - it should be conn
+	// finish transaction and reopen new connection - it should be the same conn
 	t.Abort()
 	assert.Equal(db.pool, []*Connection{t.conn})
 	t_ := tdb.Open(&ConnOptions{})
@@ -780,7 +779,7 @@ func TestActivateAfterDelete(t0 *testing.T) {
 	t.checkObj(obj, 101, InvalidTid, GHOST, 0)
 
 	// activating obj should give "no data" error
-	// (loop because second activate used to panic)
+	// loop because second activate used to panic
 	for i := 0; i < 10; i++ {
 		err := obj.PActivate(t.ctx)
 		eok := &NoDataError{Oid: obj.POid(), DeletedAt: at1}
@@ -789,6 +788,8 @@ func TestActivateAfterDelete(t0 *testing.T) {
 		if !reflect.DeepEqual(e, eok) {
 			t.Fatalf("(%d) after delete: err:\nhave: %s\nwant cause: %s", i, err, eok)
 		}
+		// obj should stay in the cache in ghost state
+		t.checkObj(obj, 101, InvalidTid, GHOST, 0)
 	}
 }
 
@@ -805,8 +806,7 @@ func TestLiveCache(t0 *testing.T) {
 	tdb.Add(102, "труд")
 	tdb.Add(103, "май")
 	tdb.Add(104, "весна")
-	tdb.Commit()
-	at1 := tdb.head
+	at1 := tdb.Commit()
 
 	zcc := &zcacheControl{map[Oid]PCachePolicy{
 		// obj1 - default (currently: don't pin and don't keep state)