storage/localstore: do not later batch in setSync if moveToGc is false (#1909)

Author: janos

storage/localstore/mode_set.go

@@ -201,20 +201,6 @@ func (db *DB) setSync(batch *leveldb.Batch, addr chunk.Address, mode chunk.ModeS
 	item.StoreTimestamp = i.StoreTimestamp
 	item.BinID = i.BinID
 
-	i, err = db.retrievalAccessIndex.Get(item)
-	switch err {
-	case nil:
-		item.AccessTimestamp = i.AccessTimestamp
-		db.gcIndex.DeleteInBatch(batch, item)
-		gcSizeChange--
-	case leveldb.ErrNotFound:
-		// the chunk is not accessed before
-	default:
-		return 0, err
-	}
-	item.AccessTimestamp = now()
-	db.retrievalAccessIndex.PutInBatch(batch, item)
-
 	// moveToGc toggles the deletion of the item from pushsync index
 	// it will be false in the case pull sync was called but push sync was meant on that chunk (!tag.Anonymous)
 	moveToGc := true
@@ -258,6 +244,20 @@ func (db *DB) setSync(batch *leveldb.Batch, addr chunk.Address, mode chunk.ModeS
 	if !moveToGc {
 		return 0, nil
 	}
+
+	i, err = db.retrievalAccessIndex.Get(item)
+	switch err {
+	case nil:
+		item.AccessTimestamp = i.AccessTimestamp
+		db.gcIndex.DeleteInBatch(batch, item)
+		gcSizeChange--
+	case leveldb.ErrNotFound:
+		// the chunk is not accessed before
+	default:
+		return 0, err
+	}
+	item.AccessTimestamp = now()
+	db.retrievalAccessIndex.PutInBatch(batch, item)
 	db.pushIndex.DeleteInBatch(batch, item)
 
 	// Add in gcIndex only if this chunk is not pinned

storage/localstore/mode_set_test.go

@@ -220,7 +220,6 @@ func TestModeSetSyncPull(t *testing.T) {
 						po := db.po(ch.Address())
 						binIDs[po]++
 
-						newRetrieveIndexesTestWithAccess(db, ch, wantTimestamp, wantTimestamp)(t)
 						newPullIndexTest(db, ch, binIDs[po], nil)(t)
 						newPushIndexTest(db, ch, wantTimestamp, mtc.expErrPushIndex)(t)
 						newGCIndexTest(db, ch, wantTimestamp, wantTimestamp, binIDs[po], mtc.expErrGCIndex)(t)
@@ -230,6 +229,7 @@ func TestModeSetSyncPull(t *testing.T) {
 						if mtc.anonymous && mtc.mode != chunk.ModeSetSyncPush {
 							// run gc index count test
 							newItemsCountTest(db.gcIndex, tc.count)
+							newRetrieveIndexesTestWithAccess(db, ch, wantTimestamp, wantTimestamp)(t)
 						}
 					}