satellite/repair: jobq re-push should keep stat fields

elek · Storj Robot · commit 2147402184fa · 2025-09-11T11:47:09.000Z
For retry (Release) we select the repair item, and re-push it. We need to keep the stats both for the Select, and the Push

Change-Id: I0f8e287e659b86013519ac435ee0d014aee9d5af
diff --git a/satellite/jobq/repairqueue.go b/satellite/jobq/repairqueue.go
@@ -111,13 +111,16 @@ func (rjq *RepairJobQueue) Select(ctx context.Context, limit int, includedPlacem
 			attemptedAt = &t
 		}
 		seg := queue.InjuredSegment{
-			StreamID:      job.ID.StreamID,
-			Position:      metabase.SegmentPositionFromEncoded(job.ID.Position),
-			SegmentHealth: job.Health,
-			AttemptedAt:   attemptedAt,
-			UpdatedAt:     time.Unix(int64(job.UpdatedAt), 0),
-			InsertedAt:    time.Unix(int64(job.InsertedAt), 0),
-			Placement:     storj.PlacementConstraint(job.Placement),
+			StreamID:                 job.ID.StreamID,
+			Position:                 metabase.SegmentPositionFromEncoded(job.ID.Position),
+			SegmentHealth:            job.Health,
+			AttemptedAt:              attemptedAt,
+			UpdatedAt:                time.Unix(int64(job.UpdatedAt), 0),
+			InsertedAt:               time.Unix(int64(job.InsertedAt), 0),
+			Placement:                storj.PlacementConstraint(job.Placement),
+			NumNormalizedRetrievable: job.NumNormalizedRetrievable,
+			NumNormalizedHealthy:     job.NumNormalizedHealthy,
+			NumOutOfPlacement:        job.NumOutOfPlacement,
 		}
 		injuredSegments = append(injuredSegments, seg)
 	}
@@ -138,12 +141,15 @@ func (rjq *RepairJobQueue) Release(ctx context.Context, job queue.InjuredSegment
 		// would be left in the queue under PostgreSQL/Cockroach,
 		// just with an updated LastAttemptedAt.
 		rJob := RepairJob{
-			ID:              SegmentIdentifier{StreamID: job.StreamID, Position: job.Position.Encode()},
-			Health:          job.SegmentHealth,
-			InsertedAt:      uint64(job.InsertedAt.Unix()),
-			LastAttemptedAt: ServerTimeNow,
-			UpdatedAt:       uint64(job.UpdatedAt.Unix()),
-			Placement:       uint16(job.Placement),
+			ID:                       SegmentIdentifier{StreamID: job.StreamID, Position: job.Position.Encode()},
+			Health:                   job.SegmentHealth,
+			InsertedAt:               uint64(job.InsertedAt.Unix()),
+			LastAttemptedAt:          ServerTimeNow,
+			UpdatedAt:                uint64(job.UpdatedAt.Unix()),
+			Placement:                uint16(job.Placement),
+			NumNormalizedHealthy:     job.NumNormalizedHealthy,
+			NumNormalizedRetrievable: job.NumNormalizedRetrievable,
+			NumOutOfPlacement:        job.NumOutOfPlacement,
 		}
 		rJob.NumAttempts++
 		_, err := rjq.jobqClient.Push(ctx, rJob)
@@ -171,13 +177,16 @@ func (rjq *RepairJobQueue) SelectN(ctx context.Context, limit int) ([]queue.Inju
 			attemptedAt = &t
 		}
 		seg := queue.InjuredSegment{
-			StreamID:      job.ID.StreamID,
-			Position:      metabase.SegmentPositionFromEncoded(job.ID.Position),
-			SegmentHealth: job.Health,
-			AttemptedAt:   attemptedAt,
-			UpdatedAt:     time.Unix(int64(job.UpdatedAt), 0),
-			InsertedAt:    time.Unix(int64(job.InsertedAt), 0),
-			Placement:     storj.PlacementConstraint(job.Placement),
+			StreamID:                 job.ID.StreamID,
+			Position:                 metabase.SegmentPositionFromEncoded(job.ID.Position),
+			SegmentHealth:            job.Health,
+			AttemptedAt:              attemptedAt,
+			UpdatedAt:                time.Unix(int64(job.UpdatedAt), 0),
+			InsertedAt:               time.Unix(int64(job.InsertedAt), 0),
+			Placement:                storj.PlacementConstraint(job.Placement),
+			NumNormalizedRetrievable: job.NumNormalizedRetrievable,
+			NumNormalizedHealthy:     job.NumNormalizedHealthy,
+			NumOutOfPlacement:        job.NumOutOfPlacement,
 		}
 		injuredSegments = append(injuredSegments, seg)
 	}
diff --git a/satellite/jobq/repairqueue_test.go b/satellite/jobq/repairqueue_test.go
@@ -23,6 +23,7 @@ import (
 	"storj.io/common/testcontext"
 	"storj.io/common/testrand"
 	"storj.io/common/uuid"
+	"storj.io/storj/satellite/jobq"
 	"storj.io/storj/satellite/jobq/jobqtest"
 	"storj.io/storj/satellite/metabase"
 	"storj.io/storj/satellite/repair/queue"
@@ -231,7 +232,8 @@ func TestRepairQueue_BatchInsert(t *testing.T) {
 }
 
 func TestRepairQueue_Stat(t *testing.T) {
-	jobqtest.Run(t, func(ctx *testcontext.Context, t *testing.T, rq queue.RepairQueue) {
+	jobqtest.WithServerAndClient(t, nil, func(ctx *testcontext.Context, srv *jobqtest.TestServer, cli *jobq.Client) {
+		rq := jobq.WrapJobQueue(cli)
 		testSegments := make([]*queue.InjuredSegment, 20)
 		for i := 0; i < len(testSegments); i++ {
 
@@ -245,8 +247,11 @@ func TestRepairQueue_Stat(t *testing.T) {
 					Part:  uint32(i),
 					Index: 2,
 				},
-				SegmentHealth: 10,
-				Placement:     placement,
+				SegmentHealth:            10,
+				Placement:                placement,
+				NumNormalizedHealthy:     5,
+				NumNormalizedRetrievable: 6,
+				NumOutOfPlacement:        7,
 			}
 			testSegments[i] = is
 		}
@@ -259,6 +264,12 @@ func TestRepairQueue_Stat(t *testing.T) {
 		err = rq.Release(ctx, job[0], false)
 		require.NoError(t, err)
 
+		inspect, err := cli.Inspect(ctx, job[0].Placement, job[0].StreamID, job[0].Position.Encode())
+		require.NoError(t, err)
+		require.Equal(t, int16(5), inspect.NumNormalizedHealthy)
+		require.Equal(t, int16(6), inspect.NumNormalizedRetrievable)
+		require.Equal(t, int16(7), inspect.NumOutOfPlacement)
+
 		stat, err := rq.Stat(ctx)
 		require.NoError(t, err)
 
