diff --git a/monkit.lock b/monkit.lock index 2da0b2118..7a02828ce 100644 --- a/monkit.lock +++ b/monkit.lock @@ -91,7 +91,6 @@ storj.io/storj/satellite/repair/repairer."download_failed_not_enough_pieces_repa storj.io/storj/satellite/repair/repairer."healthy_ratio_after_repair" FloatVal storj.io/storj/satellite/repair/repairer."healthy_ratio_before_repair" FloatVal storj.io/storj/satellite/repair/repairer."repair_attempts" Meter -storj.io/storj/satellite/repair/repairer."repair_expired" Meter storj.io/storj/satellite/repair/repairer."repair_failed" Meter storj.io/storj/satellite/repair/repairer."repair_nodes_unavailable" Meter storj.io/storj/satellite/repair/repairer."repair_partial" Meter diff --git a/satellite/repair/repair_test.go b/satellite/repair/repair_test.go index 568b80011..8925a5713 100644 --- a/satellite/repair/repair_test.go +++ b/satellite/repair/repair_test.go @@ -402,8 +402,8 @@ func testCorruptDataRepairSucceed(t *testing.T, inMemoryRepair bool) { // - Call checker to add segment to the repair queue // - Modify segment to be expired // - Run the repairer -// - Verify segment is no longer in the repair queue. -func TestRemoveExpiredSegmentFromQueue(t *testing.T) { +// - Verify segment is still in the repair queue. We don't want the data repairer to have any special treatment for expired segment. +func TestRepairExpiredSegment(t *testing.T) { testplanet.Run(t, testplanet.Config{ SatelliteCount: 1, StorageNodeCount: 10, @@ -482,7 +482,7 @@ func TestRemoveExpiredSegmentFromQueue(t *testing.T) { // Verify that the segment was removed count, err = satellite.DB.RepairQueue().Count(ctx) require.NoError(t, err) - require.Equal(t, count, 0) + require.Equal(t, count, 1) }) } diff --git a/satellite/repair/repairer/segments.go b/satellite/repair/repairer/segments.go index 4d0d2ed0a..061cc5b88 100644 --- a/satellite/repair/repairer/segments.go +++ b/satellite/repair/repairer/segments.go @@ -117,11 +117,6 @@ func (repairer *SegmentRepairer) Repair(ctx context.Context, path storj.Path) (s return true, invalidRepairError.New("cannot repair inline segment") } - if !pointer.ExpirationDate.IsZero() && pointer.ExpirationDate.Before(time.Now().UTC()) { - mon.Meter("repair_expired").Mark(1) //mon:locked - return true, nil - } - mon.Meter("repair_attempts").Mark(1) //mon:locked mon.IntVal("repair_segment_size").Observe(pointer.GetSegmentSize()) //mon:locked