Fix/object counters with new GC (#3615)

Author: roman-khimov

pkg/local_object_storage/metabase/delete.go

@@ -70,15 +70,13 @@ func (db *DB) Delete(addrs []oid.Address) (DeleteRes, error) {
 // removed number: objects that were available (without Tombstones, GCMarks
 // non-expired, etc.)
 func (db *DB) deleteGroup(tx *bbolt.Tx, addrs []oid.Address, sizes []uint64) (uint64, uint64, error) {
-	currEpoch := db.epochState.CurrentEpoch()
-
 	var rawDeleted uint64
 	var availableDeleted uint64
 	var errorCount int
 	var firstErr error
 
 	for i := range addrs {
-		removed, available, size, err := db.delete(tx, addrs[i], currEpoch)
+		removed, available, size, err := db.delete(tx, addrs[i])
 		if err != nil {
 			errorCount++
 			db.log.Warn("failed to delete object", zap.Stringer("addr", addrs[i]), zap.Error(err))
@@ -127,7 +125,7 @@ func (db *DB) deleteGroup(tx *bbolt.Tx, addrs []oid.Address, sizes []uint64) (ui
 // non-exist object is error-free). The second return value indicates if an
 // object was available before the removal (for calculating the logical object
 // counter). The third return value is removed object payload size.
-func (db *DB) delete(tx *bbolt.Tx, addr oid.Address, currEpoch uint64) (bool, bool, uint64, error) {
+func (db *DB) delete(tx *bbolt.Tx, addr oid.Address) (bool, bool, uint64, error) {
 	key := make([]byte, addressKeySize)
 	cID := addr.Container()
 	addrKey := addressKey(addr, key)
@@ -154,6 +152,16 @@ func (db *DB) delete(tx *bbolt.Tx, addr oid.Address, currEpoch uint64) (bool, bo
 		return false, false, 0, fmt.Errorf("can't remove metadata indexes: %w", err)
 	}
 
+	// if object is not available, counters have already been handled in
+	// `Inhume` call, but if we are removing an available object, this is
+	// either a force removal or GC work, and counters must be kept up-to-date
+	if removeAvailableObject {
+		err = changeContainerInfo(tx, cID, -int(payloadSize), -1)
+		if err != nil {
+			return false, false, 0, fmt.Errorf("can't update container info: %w", err)
+		}
+	}
+
 	return true, removeAvailableObject, payloadSize, nil
 }
 

pkg/local_object_storage/metabase/delete_test.go

@@ -72,6 +72,39 @@ func TestDB_Delete(t *testing.T) {
 	require.False(t, ok)
 }
 
+func TestContainerInfo(t *testing.T) {
+	db := newDB(t)
+
+	cID := cidtest.ID()
+	obj := generateObjectWithCID(t, cID)
+	obj.ResetRelations()
+
+	payloadSize := obj.PayloadSize()
+
+	err := putBig(db, obj)
+	require.NoError(t, err)
+
+	info, err := db.GetContainerInfo(cID)
+	require.NoError(t, err)
+
+	require.Equal(t, uint64(1), info.ObjectsNumber)
+	require.Equal(t, payloadSize, info.StorageSize)
+
+	res, err := db.Delete([]oid.Address{object.AddressOf(obj)})
+	require.NoError(t, err)
+
+	require.Equal(t, uint64(1), res.AvailableRemoved)
+	require.Equal(t, uint64(1), res.RawRemoved)
+	require.Len(t, res.Sizes, 1)
+	require.Equal(t, payloadSize, res.Sizes[0])
+
+	info, err = db.GetContainerInfo(cID)
+	require.NoError(t, err)
+
+	require.Zero(t, info.ObjectsNumber)
+	require.Zero(t, info.StorageSize)
+}
+
 func TestDeleteAllChildren(t *testing.T) {
 	db := newDB(t)