storagenode/pieces: update used space on trash-lazyfilewalker completion

Turns out the lazyfilewalker does not update the used space
cache after cleaning the trash, well, because it doesn't
have access to the cache.
We update the cache with the bytesDeleted returned by the
subprocess.

Also fixes a small flaky test

#6950

Change-Id: I7e6cfa37fff143a8abcc0d0ca844ad4659b4cb4a

storagenode/bandwidth/db_test.go

@@ -145,22 +145,14 @@ func TestEgressSummary(t *testing.T) {
 
 		// test egress summarizing.
 		{
-			usage, err := bandwidthdb.EgressSummary(ctx, now.Add(-10*time.Hour), now.Add(10*time.Hour))
-			require.NoError(t, err)
-			require.Equal(t, &bandwidth.Usage{}, usage)
-
 			// only range capturing second satellite.
-			usage, err = bandwidthdb.EgressSummary(ctx, time.Time{}, time.Now())
+			usage, err := bandwidthdb.EgressSummary(ctx, time.Time{}, time.Now())
 			require.NoError(t, err)
 			require.Equal(t, expectedEgressUsageTotal, usage)
 		}
 
 		{
-			usageBySatellite, err := bandwidthdb.SummaryBySatellite(ctx, now.Add(-10*time.Hour), now.Add(10*time.Hour))
-			require.NoError(t, err)
-			require.Equal(t, map[storj.NodeID]*bandwidth.Usage{}, usageBySatellite)
-
-			usageBySatellite, err = bandwidthdb.SummaryBySatellite(ctx, time.Time{}, time.Now())
+			usageBySatellite, err := bandwidthdb.SummaryBySatellite(ctx, time.Time{}, time.Now())
 			require.NoError(t, err)
 			require.Equal(t, expectedEgressUsageBySatellite, usageBySatellite)
 		}
@@ -208,22 +200,14 @@ func TestIngressSummary(t *testing.T) {
 
 		// test ingress summarizing.
 		{
-			usage, err := bandwidthdb.IngressSummary(ctx, now.Add(-10*time.Hour), now.Add(10*time.Hour))
-			require.NoError(t, err)
-			require.Equal(t, &bandwidth.Usage{}, usage)
-
 			// only range capturing second satellite.
-			usage, err = bandwidthdb.IngressSummary(ctx, time.Time{}, time.Now())
+			usage, err := bandwidthdb.IngressSummary(ctx, time.Time{}, time.Now())
 			require.NoError(t, err)
 			require.Equal(t, expectedIngressUsage, usage)
 		}
 
 		{
-			usageBySatellite, err := bandwidthdb.SummaryBySatellite(ctx, now.Add(-10*time.Hour), now.Add(10*time.Hour))
-			require.NoError(t, err)
-			require.Equal(t, map[storj.NodeID]*bandwidth.Usage{}, usageBySatellite)
-
-			usageBySatellite, err = bandwidthdb.SummaryBySatellite(ctx, time.Time{}, time.Now())
+			usageBySatellite, err := bandwidthdb.SummaryBySatellite(ctx, time.Time{}, time.Now())
 			require.NoError(t, err)
 			require.Equal(t, expectedIngressUsageBySatellite, usageBySatellite)
 		}

storagenode/pieces/lazyfilewalker/supervisor.go

@@ -170,6 +170,8 @@ func (fw *Supervisor) WalkSatellitePiecesToTrash(ctx context.Context, satelliteI
 }
 
 // WalkCleanupTrash deletes per-day trash directories which are older than the given time.
+// The lazyfilewalker does not update the space used by the trash so the caller should update the space used
+// after the filewalker completes.
 func (fw *Supervisor) WalkCleanupTrash(ctx context.Context, satelliteID storj.NodeID, dateBefore time.Time) (bytesDeleted int64, keysDeleted []storj.PieceID, err error) {
 	defer mon.Task()(&ctx)(&err)
 

storagenode/pieces/store.go

@@ -416,7 +416,11 @@ func (store *Store) EmptyTrash(ctx context.Context, satelliteID storj.NodeID, tr
 	defer mon.Task()(&ctx)(&err)
 
 	if store.config.EnableLazyFilewalker && store.lazyFilewalker != nil {
-		_, _, err := store.lazyFilewalker.WalkCleanupTrash(ctx, satelliteID, trashedBefore)
+		bytesDeleted, _, err := store.lazyFilewalker.WalkCleanupTrash(ctx, satelliteID, trashedBefore)
+		// The lazy filewalker does not update the space used by the trash so we need to update it here.
+		if cache, ok := store.blobs.(*BlobsUsageCache); ok {
+			cache.Update(ctx, satelliteID, 0, 0, -bytesDeleted)
+		}
 		return Error.Wrap(err)
 	}
 	_, _, err = store.blobs.EmptyTrash(ctx, satelliteID[:], trashedBefore)