diff --git a/satellite/repair/checker/config.go b/satellite/repair/checker/config.go index c5b7f2c69..23749e299 100644 --- a/satellite/repair/checker/config.go +++ b/satellite/repair/checker/config.go @@ -24,7 +24,7 @@ type Config struct { NodeFailureRate float64 `help:"the probability of a single node going down within the next checker iteration" default:"0.00005435" ` RepairQueueInsertBatchSize int `help:"Number of damaged segments to buffer in-memory before flushing to the repair queue" default:"100" ` RepairExcludedCountryCodes []string `help:"list of country codes to treat node from this country as offline " default:"" hidden:"true"` - DoDeclumping bool `help:"Treat pieces on the same network as in need of repair" default:"false"` + DoDeclumping bool `help:"Treat pieces on the same network as in need of repair" default:"true"` DoPlacementCheck bool `help:"Treat pieces out of segment placement as in need of repair" default:"true"` } diff --git a/satellite/repair/repairer/repairer.go b/satellite/repair/repairer/repairer.go index 21a3d9787..53b700ed3 100644 --- a/satellite/repair/repairer/repairer.go +++ b/satellite/repair/repairer/repairer.go @@ -37,7 +37,7 @@ type Config struct { ReputationUpdateEnabled bool `help:"whether the audit score of nodes should be updated as a part of repair" default:"false"` UseRangedLoop bool `help:"whether to enable repair checker observer with ranged loop" default:"true"` RepairExcludedCountryCodes []string `help:"list of country codes to treat node from this country as offline" default:"" hidden:"true"` - DoDeclumping bool `help:"repair pieces on the same network to other nodes" default:"false"` + DoDeclumping bool `help:"repair pieces on the same network to other nodes" default:"true"` DoPlacementCheck bool `help:"repair pieces out of segment placement" default:"true"` } diff --git a/satellite/repair/repairer/segments_test.go b/satellite/repair/repairer/segments_test.go index 6d88ad47b..89348738b 100644 --- a/satellite/repair/repairer/segments_test.go +++ b/satellite/repair/repairer/segments_test.go @@ -31,7 +31,12 @@ func TestSegmentRepairPlacement(t *testing.T) { testplanet.Run(t, testplanet.Config{ SatelliteCount: 1, StorageNodeCount: 12, UplinkCount: 1, Reconfigure: testplanet.Reconfigure{ - Satellite: testplanet.ReconfigureRS(1, 1, piecesCount, piecesCount), + Satellite: testplanet.Combine( + testplanet.ReconfigureRS(1, 1, piecesCount, piecesCount), + func(log *zap.Logger, index int, config *satellite.Config) { + config.Repairer.DoDeclumping = false + }, + ), }, }, func(t *testing.T, ctx *testcontext.Context, planet *testplanet.Planet) { require.NoError(t, planet.Uplinks[0].CreateBucket(ctx, planet.Satellites[0], "testbucket")) diff --git a/scripts/testdata/satellite-config.yaml.lock b/scripts/testdata/satellite-config.yaml.lock index 66bfae36d..095d6001a 100755 --- a/scripts/testdata/satellite-config.yaml.lock +++ b/scripts/testdata/satellite-config.yaml.lock @@ -92,7 +92,7 @@ # audit.worker-concurrency: 2 # Treat pieces on the same network as in need of repair -# checker.do-declumping: false +# checker.do-declumping: true # Treat pieces out of segment placement as in need of repair # checker.do-placement-check: true @@ -938,7 +938,7 @@ identity.key-path: /root/.local/share/storj/identity/satellite/identity.key # repairer.dial-timeout: 5s # repair pieces on the same network to other nodes -# repairer.do-declumping: false +# repairer.do-declumping: true # repair pieces out of segment placement # repairer.do-placement-check: true