From 7c33521ace3083c1987a92f878b5cd2780942308 Mon Sep 17 00:00:00 2001 From: Michal Niewrzal Date: Sat, 10 Jun 2023 20:50:03 +0200 Subject: [PATCH] satellite/repair/repairer: use placement to select nodes for repair upload We missed to set placement as a part of selection request. It can case uploading repaired data out of specified placement. I will provide test as a separate change. Change-Id: I4efe67f2d5f545a1d70e831e5d297f0977a4eed1 --- satellite/repair/repairer/segments.go | 1 + satellite/repair/repairer/segments_test.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/satellite/repair/repairer/segments.go b/satellite/repair/repairer/segments.go index 05645632c..9e9e0086d 100644 --- a/satellite/repair/repairer/segments.go +++ b/satellite/repair/repairer/segments.go @@ -400,6 +400,7 @@ func (repairer *SegmentRepairer) Repair(ctx context.Context, queueSegment *queue request := overlay.FindStorageNodesRequest{ RequestedCount: requestCount, ExcludedIDs: excludeNodeIDs, + Placement: segment.Placement, } newNodes, err := repairer.overlay.FindStorageNodesForUpload(ctx, request) if err != nil { diff --git a/satellite/repair/repairer/segments_test.go b/satellite/repair/repairer/segments_test.go index 5756ced04..7bc6f345b 100644 --- a/satellite/repair/repairer/segments_test.go +++ b/satellite/repair/repairer/segments_test.go @@ -27,7 +27,7 @@ import ( func TestSegmentRepairPlacement(t *testing.T) { piecesCount := 4 testplanet.Run(t, testplanet.Config{ - SatelliteCount: 1, StorageNodeCount: 8, UplinkCount: 1, + SatelliteCount: 1, StorageNodeCount: 10, UplinkCount: 1, Reconfigure: testplanet.Reconfigure{ Satellite: testplanet.ReconfigureRS(1, 2, piecesCount, piecesCount), },