satellite/repair: test inmemory/disk difference only once

We don't need to have every single test for both, only one for
each should be sufficient. For all other tests it doesn't matter
which one we use.

Change-Id: I9962206a4ee025d367332c29ea3e6bc9f0f9a1de
This commit is contained in:
Egon Elbre 2022-03-29 13:42:21 +03:00
parent 1f1f777d06
commit 566fc8ee25
2 changed files with 50 additions and 147 deletions

View File

@ -1,54 +1,56 @@
// Copyright (C) 2020 Storj Labs, Inc. // Copyright (C) 2020 Storj Labs, Inc.
// See LICENSE for copying information. // See LICENSE for copying information.
package repair package repair_test
import ( import (
"math" "math"
"testing" "testing"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"storj.io/storj/satellite/repair"
) )
func TestSegmentHealth(t *testing.T) { func TestSegmentHealth(t *testing.T) {
const failureRate = 0.01 const failureRate = 0.01
assert.Less(t, assert.Less(t,
SegmentHealth(11, 10, 10000, failureRate), repair.SegmentHealth(11, 10, 10000, failureRate),
SegmentHealth(10, 5, 10000, failureRate)) repair.SegmentHealth(10, 5, 10000, failureRate))
assert.Less(t, assert.Less(t,
SegmentHealth(11, 10, 10000, failureRate), repair.SegmentHealth(11, 10, 10000, failureRate),
SegmentHealth(10, 9, 10000, failureRate)) repair.SegmentHealth(10, 9, 10000, failureRate))
assert.Less(t, assert.Less(t,
SegmentHealth(10, 10, 10000, failureRate), repair.SegmentHealth(10, 10, 10000, failureRate),
SegmentHealth(9, 9, 10000, failureRate)) repair.SegmentHealth(9, 9, 10000, failureRate))
assert.Greater(t, assert.Greater(t,
SegmentHealth(11, 10, 10000, failureRate), repair.SegmentHealth(11, 10, 10000, failureRate),
SegmentHealth(12, 11, 10000, failureRate)) repair.SegmentHealth(12, 11, 10000, failureRate))
assert.Greater(t, assert.Greater(t,
SegmentHealth(13, 10, 10000, failureRate), repair.SegmentHealth(13, 10, 10000, failureRate),
SegmentHealth(12, 10, 10000, failureRate)) repair.SegmentHealth(12, 10, 10000, failureRate))
} }
func TestSegmentHealthForDecayedSegment(t *testing.T) { func TestSegmentHealthForDecayedSegment(t *testing.T) {
const failureRate = 0.01 const failureRate = 0.01
got := SegmentHealth(9, 10, 10000, failureRate) got := repair.SegmentHealth(9, 10, 10000, failureRate)
assert.Equal(t, float64(0), got) assert.Equal(t, float64(0), got)
} }
func TestHighHealthAndLowFailureRate(t *testing.T) { func TestHighHealthAndLowFailureRate(t *testing.T) {
const failureRate = 0.00005435 const failureRate = 0.00005435
assert.Less(t, assert.Less(t,
SegmentHealth(36, 35, 10000, failureRate), math.Inf(1)) repair.SegmentHealth(36, 35, 10000, failureRate), math.Inf(1))
assert.Greater(t, assert.Greater(t,
SegmentHealth(36, 35, 10000, failureRate), repair.SegmentHealth(36, 35, 10000, failureRate),
SegmentHealth(35, 35, 10000, failureRate)) repair.SegmentHealth(35, 35, 10000, failureRate))
assert.Less(t, assert.Less(t,
SegmentHealth(60, 29, 10000, failureRate), math.Inf(1)) repair.SegmentHealth(60, 29, 10000, failureRate), math.Inf(1))
assert.Greater(t, assert.Greater(t,
SegmentHealth(61, 29, 10000, failureRate), repair.SegmentHealth(61, 29, 10000, failureRate),
SegmentHealth(60, 29, 10000, failureRate)) repair.SegmentHealth(60, 29, 10000, failureRate))
assert.Greater(t, assert.Greater(t,
SegmentHealth(11, 10, 10000, failureRate), repair.SegmentHealth(11, 10, 10000, failureRate),
SegmentHealth(39, 34, 10000, failureRate)) repair.SegmentHealth(39, 34, 10000, failureRate))
} }

View File

@ -77,7 +77,6 @@ func testDataRepair(t *testing.T, inMemoryRepair bool) {
), ),
}, },
}, func(t *testing.T, ctx *testcontext.Context, planet *testplanet.Planet) { }, func(t *testing.T, ctx *testcontext.Context, planet *testplanet.Planet) {
// first, upload some remote data // first, upload some remote data
uplinkPeer := planet.Uplinks[0] uplinkPeer := planet.Uplinks[0]
satellite := planet.Satellites[0] satellite := planet.Satellites[0]
@ -213,14 +212,7 @@ func testDataRepair(t *testing.T, inMemoryRepair bool) {
// threshold // threshold
// - Completes the multipart upload. // - Completes the multipart upload.
// - Downloads the data from those left nodes and check that it's the same than the uploaded one. // - Downloads the data from those left nodes and check that it's the same than the uploaded one.
func TestDataRepairPendingObjectInMemory(t *testing.T) { func TestDataRepairPendingObject(t *testing.T) {
testDataRepairPendingObject(t, true)
}
func TestDataRepairPendingObjectToDisk(t *testing.T) {
testDataRepairPendingObject(t, false)
}
func testDataRepairPendingObject(t *testing.T, inMemoryRepair bool) {
const ( const (
RepairMaxExcessRateOptimalThreshold = 0.05 RepairMaxExcessRateOptimalThreshold = 0.05
minThreshold = 3 minThreshold = 3
@ -235,7 +227,7 @@ func testDataRepairPendingObject(t *testing.T, inMemoryRepair bool) {
Satellite: testplanet.Combine( Satellite: testplanet.Combine(
func(log *zap.Logger, index int, config *satellite.Config) { func(log *zap.Logger, index int, config *satellite.Config) {
config.Repairer.MaxExcessRateOptimalThreshold = RepairMaxExcessRateOptimalThreshold config.Repairer.MaxExcessRateOptimalThreshold = RepairMaxExcessRateOptimalThreshold
config.Repairer.InMemoryRepair = inMemoryRepair config.Repairer.InMemoryRepair = true
}, },
testplanet.ReconfigureRS(minThreshold, 5, successThreshold, 9), testplanet.ReconfigureRS(minThreshold, 5, successThreshold, 9),
), ),
@ -365,14 +357,7 @@ func testDataRepairPendingObject(t *testing.T, inMemoryRepair bool) {
// the numbers of nodes determined by the upload repair max threshold // the numbers of nodes determined by the upload repair max threshold
// - Expects that the repair succeed. // - Expects that the repair succeed.
// Reputation info to be updated for all remaining nodes. // Reputation info to be updated for all remaining nodes.
func TestMinRequiredDataRepairInMemory(t *testing.T) { func TestMinRequiredDataRepair(t *testing.T) {
testMinRequiredDataRepair(t, true)
}
func TestMinRequiredDataRepairToDisk(t *testing.T) {
testMinRequiredDataRepair(t, false)
}
func testMinRequiredDataRepair(t *testing.T, inMemoryRepair bool) {
const RepairMaxExcessRateOptimalThreshold = 0.05 const RepairMaxExcessRateOptimalThreshold = 0.05
testplanet.Run(t, testplanet.Config{ testplanet.Run(t, testplanet.Config{
@ -383,7 +368,7 @@ func testMinRequiredDataRepair(t *testing.T, inMemoryRepair bool) {
Satellite: testplanet.Combine( Satellite: testplanet.Combine(
func(log *zap.Logger, index int, config *satellite.Config) { func(log *zap.Logger, index int, config *satellite.Config) {
config.Repairer.MaxExcessRateOptimalThreshold = RepairMaxExcessRateOptimalThreshold config.Repairer.MaxExcessRateOptimalThreshold = RepairMaxExcessRateOptimalThreshold
config.Repairer.InMemoryRepair = inMemoryRepair config.Repairer.InMemoryRepair = true
}, },
testplanet.ReconfigureRS(4, 4, 9, 9), testplanet.ReconfigureRS(4, 4, 9, 9),
), ),
@ -468,14 +453,7 @@ func testMinRequiredDataRepair(t *testing.T, inMemoryRepair bool) {
// the numbers of nodes determined by the upload repair max threshold // the numbers of nodes determined by the upload repair max threshold
// - Expects that the repair failed and the pointer was not updated. // - Expects that the repair failed and the pointer was not updated.
// Reputation info to be updated for all remaining nodes. // Reputation info to be updated for all remaining nodes.
func TestFailedDataRepairInMemory(t *testing.T) { func TestFailedDataRepair(t *testing.T) {
testFailedDataRepair(t, true)
}
func TestFailedDataRepairToDisk(t *testing.T) {
testFailedDataRepair(t, false)
}
func testFailedDataRepair(t *testing.T, inMemoryRepair bool) {
const RepairMaxExcessRateOptimalThreshold = 0.05 const RepairMaxExcessRateOptimalThreshold = 0.05
testplanet.Run(t, testplanet.Config{ testplanet.Run(t, testplanet.Config{
@ -489,7 +467,7 @@ func testFailedDataRepair(t *testing.T, inMemoryRepair bool) {
Satellite: testplanet.Combine( Satellite: testplanet.Combine(
func(log *zap.Logger, index int, config *satellite.Config) { func(log *zap.Logger, index int, config *satellite.Config) {
config.Repairer.MaxExcessRateOptimalThreshold = RepairMaxExcessRateOptimalThreshold config.Repairer.MaxExcessRateOptimalThreshold = RepairMaxExcessRateOptimalThreshold
config.Repairer.InMemoryRepair = inMemoryRepair config.Repairer.InMemoryRepair = true
}, },
testplanet.ReconfigureRS(4, 5, 9, 9), testplanet.ReconfigureRS(4, 5, 9, 9),
), ),
@ -595,14 +573,7 @@ func testFailedDataRepair(t *testing.T, inMemoryRepair bool) {
// the numbers of nodes determined by the upload repair max threshold // the numbers of nodes determined by the upload repair max threshold
// - Expects that the repair succeed and the pointer should contain the offline piece. // - Expects that the repair succeed and the pointer should contain the offline piece.
// Reputation info to be updated for all remaining nodes. // Reputation info to be updated for all remaining nodes.
func TestOfflineNodeDataRepairInMemory(t *testing.T) { func TestOfflineNodeDataRepair(t *testing.T) {
testOfflineNodeDataRepair(t, true)
}
func TestOfflineNodeDataRepairToDisk(t *testing.T) {
testOfflineNodeDataRepair(t, false)
}
func testOfflineNodeDataRepair(t *testing.T, inMemoryRepair bool) {
const RepairMaxExcessRateOptimalThreshold = 0.05 const RepairMaxExcessRateOptimalThreshold = 0.05
testplanet.Run(t, testplanet.Config{ testplanet.Run(t, testplanet.Config{
@ -613,7 +584,7 @@ func testOfflineNodeDataRepair(t *testing.T, inMemoryRepair bool) {
Satellite: testplanet.Combine( Satellite: testplanet.Combine(
func(log *zap.Logger, index int, config *satellite.Config) { func(log *zap.Logger, index int, config *satellite.Config) {
config.Repairer.MaxExcessRateOptimalThreshold = RepairMaxExcessRateOptimalThreshold config.Repairer.MaxExcessRateOptimalThreshold = RepairMaxExcessRateOptimalThreshold
config.Repairer.InMemoryRepair = inMemoryRepair config.Repairer.InMemoryRepair = true
}, },
testplanet.ReconfigureRS(3, 4, 9, 9), testplanet.ReconfigureRS(3, 4, 9, 9),
), ),
@ -719,14 +690,7 @@ func testOfflineNodeDataRepair(t *testing.T, inMemoryRepair bool) {
// the numbers of nodes determined by the upload repair max threshold // the numbers of nodes determined by the upload repair max threshold
// - Expects that the repair succeed and the pointer should contain the unknown piece. // - Expects that the repair succeed and the pointer should contain the unknown piece.
// Reputation info to be updated for all remaining nodes. // Reputation info to be updated for all remaining nodes.
func TestUnknownErrorDataRepairInMemory(t *testing.T) { func TestUnknownErrorDataRepair(t *testing.T) {
testUnknownErrorDataRepair(t, true)
}
func TestUnknownErrorDataRepairToDisk(t *testing.T) {
testUnknownErrorDataRepair(t, false)
}
func testUnknownErrorDataRepair(t *testing.T, inMemoryRepair bool) {
const RepairMaxExcessRateOptimalThreshold = 0.05 const RepairMaxExcessRateOptimalThreshold = 0.05
testplanet.Run(t, testplanet.Config{ testplanet.Run(t, testplanet.Config{
@ -740,7 +704,7 @@ func testUnknownErrorDataRepair(t *testing.T, inMemoryRepair bool) {
Satellite: testplanet.Combine( Satellite: testplanet.Combine(
func(log *zap.Logger, index int, config *satellite.Config) { func(log *zap.Logger, index int, config *satellite.Config) {
config.Repairer.MaxExcessRateOptimalThreshold = RepairMaxExcessRateOptimalThreshold config.Repairer.MaxExcessRateOptimalThreshold = RepairMaxExcessRateOptimalThreshold
config.Repairer.InMemoryRepair = inMemoryRepair config.Repairer.InMemoryRepair = true
}, },
testplanet.ReconfigureRS(3, 4, 9, 9), testplanet.ReconfigureRS(3, 4, 9, 9),
), ),
@ -848,14 +812,7 @@ func testUnknownErrorDataRepair(t *testing.T, inMemoryRepair bool) {
// the numbers of nodes determined by the upload repair max threshold // the numbers of nodes determined by the upload repair max threshold
// - Expects that the repair succeed and the pointer should not contain the missing piece. // - Expects that the repair succeed and the pointer should not contain the missing piece.
// Reputation info to be updated for all remaining nodes. // Reputation info to be updated for all remaining nodes.
func TestMissingPieceDataRepairInMemory_Succeed(t *testing.T) { func TestMissingPieceDataRepair_Succeed(t *testing.T) {
testMissingPieceDataRepairSucceed(t, true)
}
func TestMissingPieceDataRepairToDisk_Succeed(t *testing.T) {
testMissingPieceDataRepairSucceed(t, false)
}
func testMissingPieceDataRepairSucceed(t *testing.T, inMemoryRepair bool) {
const RepairMaxExcessRateOptimalThreshold = 0.05 const RepairMaxExcessRateOptimalThreshold = 0.05
testplanet.Run(t, testplanet.Config{ testplanet.Run(t, testplanet.Config{
@ -866,7 +823,7 @@ func testMissingPieceDataRepairSucceed(t *testing.T, inMemoryRepair bool) {
Satellite: testplanet.Combine( Satellite: testplanet.Combine(
func(log *zap.Logger, index int, config *satellite.Config) { func(log *zap.Logger, index int, config *satellite.Config) {
config.Repairer.MaxExcessRateOptimalThreshold = RepairMaxExcessRateOptimalThreshold config.Repairer.MaxExcessRateOptimalThreshold = RepairMaxExcessRateOptimalThreshold
config.Repairer.InMemoryRepair = inMemoryRepair config.Repairer.InMemoryRepair = true
}, },
testplanet.ReconfigureRS(3, 4, 9, 9), testplanet.ReconfigureRS(3, 4, 9, 9),
), ),
@ -970,14 +927,7 @@ func testMissingPieceDataRepairSucceed(t *testing.T, inMemoryRepair bool) {
// the numbers of nodes determined by the upload repair max threshold // the numbers of nodes determined by the upload repair max threshold
// - Expects that the repair failed and the pointer was not updated. // - Expects that the repair failed and the pointer was not updated.
// Reputation info to be updated for node missing the piece. // Reputation info to be updated for node missing the piece.
func TestMissingPieceDataRepairInMemory_Failed(t *testing.T) { func TestMissingPieceDataRepair(t *testing.T) {
testMissingPieceDataRepairFailed(t, true)
}
func TestMissingPieceDataRepairToDisk_Failed(t *testing.T) {
testMissingPieceDataRepairFailed(t, false)
}
func testMissingPieceDataRepairFailed(t *testing.T, inMemoryRepair bool) {
const RepairMaxExcessRateOptimalThreshold = 0.05 const RepairMaxExcessRateOptimalThreshold = 0.05
testplanet.Run(t, testplanet.Config{ testplanet.Run(t, testplanet.Config{
@ -988,7 +938,7 @@ func testMissingPieceDataRepairFailed(t *testing.T, inMemoryRepair bool) {
Satellite: testplanet.Combine( Satellite: testplanet.Combine(
func(log *zap.Logger, index int, config *satellite.Config) { func(log *zap.Logger, index int, config *satellite.Config) {
config.Repairer.MaxExcessRateOptimalThreshold = RepairMaxExcessRateOptimalThreshold config.Repairer.MaxExcessRateOptimalThreshold = RepairMaxExcessRateOptimalThreshold
config.Repairer.InMemoryRepair = inMemoryRepair config.Repairer.InMemoryRepair = true
}, },
testplanet.ReconfigureRS(4, 4, 9, 9), testplanet.ReconfigureRS(4, 4, 9, 9),
), ),
@ -1092,14 +1042,7 @@ func testMissingPieceDataRepairFailed(t *testing.T, inMemoryRepair bool) {
// the numbers of nodes determined by the upload repair max threshold // the numbers of nodes determined by the upload repair max threshold
// - Expects that the repair succeed and the pointer should not contain the corrupted piece. // - Expects that the repair succeed and the pointer should not contain the corrupted piece.
// Reputation info to be updated for all remaining nodes. // Reputation info to be updated for all remaining nodes.
func TestCorruptDataRepairInMemory_Succeed(t *testing.T) { func TestCorruptDataRepair_Succeed(t *testing.T) {
testCorruptDataRepairSucceed(t, true)
}
func TestCorruptDataRepairToDisk_Succeed(t *testing.T) {
testCorruptDataRepairSucceed(t, false)
}
func testCorruptDataRepairSucceed(t *testing.T, inMemoryRepair bool) {
const RepairMaxExcessRateOptimalThreshold = 0.05 const RepairMaxExcessRateOptimalThreshold = 0.05
testplanet.Run(t, testplanet.Config{ testplanet.Run(t, testplanet.Config{
@ -1110,7 +1053,7 @@ func testCorruptDataRepairSucceed(t *testing.T, inMemoryRepair bool) {
Satellite: testplanet.Combine( Satellite: testplanet.Combine(
func(log *zap.Logger, index int, config *satellite.Config) { func(log *zap.Logger, index int, config *satellite.Config) {
config.Repairer.MaxExcessRateOptimalThreshold = RepairMaxExcessRateOptimalThreshold config.Repairer.MaxExcessRateOptimalThreshold = RepairMaxExcessRateOptimalThreshold
config.Repairer.InMemoryRepair = inMemoryRepair config.Repairer.InMemoryRepair = true
}, },
testplanet.ReconfigureRS(3, 4, 9, 9), testplanet.ReconfigureRS(3, 4, 9, 9),
), ),
@ -1213,14 +1156,7 @@ func testCorruptDataRepairSucceed(t *testing.T, inMemoryRepair bool) {
// the numbers of nodes determined by the upload repair max threshold // the numbers of nodes determined by the upload repair max threshold
// - Expects that the repair failed and the pointer was not updated. // - Expects that the repair failed and the pointer was not updated.
// Reputation info to be updated for corrupted node. // Reputation info to be updated for corrupted node.
func TestCorruptDataRepairInMemory_Failed(t *testing.T) { func TestCorruptDataRepair_Failed(t *testing.T) {
testCorruptDataRepairFailed(t, true)
}
func TestCorruptDataRepairToDisk_Failed(t *testing.T) {
testCorruptDataRepairFailed(t, false)
}
func testCorruptDataRepairFailed(t *testing.T, inMemoryRepair bool) {
const RepairMaxExcessRateOptimalThreshold = 0.05 const RepairMaxExcessRateOptimalThreshold = 0.05
testplanet.Run(t, testplanet.Config{ testplanet.Run(t, testplanet.Config{
@ -1231,7 +1167,7 @@ func testCorruptDataRepairFailed(t *testing.T, inMemoryRepair bool) {
Satellite: testplanet.Combine( Satellite: testplanet.Combine(
func(log *zap.Logger, index int, config *satellite.Config) { func(log *zap.Logger, index int, config *satellite.Config) {
config.Repairer.MaxExcessRateOptimalThreshold = RepairMaxExcessRateOptimalThreshold config.Repairer.MaxExcessRateOptimalThreshold = RepairMaxExcessRateOptimalThreshold
config.Repairer.InMemoryRepair = inMemoryRepair config.Repairer.InMemoryRepair = true
}, },
testplanet.ReconfigureRS(4, 4, 9, 9), testplanet.ReconfigureRS(4, 4, 9, 9),
), ),
@ -1865,14 +1801,7 @@ func updateNodeCheckIn(ctx context.Context, overlayDB overlay.DB, node *testplan
// - Now we have just the 3 new nodes to which the data was repaired // - Now we have just the 3 new nodes to which the data was repaired
// - Downloads the data from these 3 nodes (succeeds because 3 nodes are enough for download) // - Downloads the data from these 3 nodes (succeeds because 3 nodes are enough for download)
// - Expect newly repaired pointer does not contain the disqualified or suspended nodes. // - Expect newly repaired pointer does not contain the disqualified or suspended nodes.
func TestRepairMultipleDisqualifiedAndSuspendedInMemory(t *testing.T) { func TestRepairMultipleDisqualifiedAndSuspended(t *testing.T) {
testRepairMultipleDisqualifiedAndSuspended(t, true)
}
func TestRepairMultipleDisqualifiedAndSuspendedToDisk(t *testing.T) {
testRepairMultipleDisqualifiedAndSuspended(t, false)
}
func testRepairMultipleDisqualifiedAndSuspended(t *testing.T, inMemoryRepair bool) {
testplanet.Run(t, testplanet.Config{ testplanet.Run(t, testplanet.Config{
SatelliteCount: 1, SatelliteCount: 1,
StorageNodeCount: 12, StorageNodeCount: 12,
@ -1880,7 +1809,7 @@ func testRepairMultipleDisqualifiedAndSuspended(t *testing.T, inMemoryRepair boo
Reconfigure: testplanet.Reconfigure{ Reconfigure: testplanet.Reconfigure{
Satellite: testplanet.Combine( Satellite: testplanet.Combine(
func(log *zap.Logger, index int, config *satellite.Config) { func(log *zap.Logger, index int, config *satellite.Config) {
config.Repairer.InMemoryRepair = inMemoryRepair config.Repairer.InMemoryRepair = true
}, },
testplanet.ReconfigureRS(3, 5, 7, 7), testplanet.ReconfigureRS(3, 5, 7, 7),
), ),
@ -1972,14 +1901,7 @@ func testRepairMultipleDisqualifiedAndSuspended(t *testing.T, inMemoryRepair boo
// - Kills nodes to fall to the Repair Override Value of the checker but stays above the original Repair Threshold // - Kills nodes to fall to the Repair Override Value of the checker but stays above the original Repair Threshold
// - Triggers data repair, which attempts to repair the data from the remaining nodes to // - Triggers data repair, which attempts to repair the data from the remaining nodes to
// the numbers of nodes determined by the upload repair max threshold // the numbers of nodes determined by the upload repair max threshold
func TestDataRepairOverride_HigherLimitInMemory(t *testing.T) { func TestDataRepairOverride_HigherLimit(t *testing.T) {
testDataRepairOverrideHigherLimit(t, true)
}
func TestDataRepairOverride_HigherLimitToDisk(t *testing.T) {
testDataRepairOverrideHigherLimit(t, false)
}
func testDataRepairOverrideHigherLimit(t *testing.T, inMemoryRepair bool) {
const repairOverride = 6 const repairOverride = 6
testplanet.Run(t, testplanet.Config{ testplanet.Run(t, testplanet.Config{
@ -1989,7 +1911,7 @@ func testDataRepairOverrideHigherLimit(t *testing.T, inMemoryRepair bool) {
Reconfigure: testplanet.Reconfigure{ Reconfigure: testplanet.Reconfigure{
Satellite: testplanet.Combine( Satellite: testplanet.Combine(
func(log *zap.Logger, index int, config *satellite.Config) { func(log *zap.Logger, index int, config *satellite.Config) {
config.Repairer.InMemoryRepair = inMemoryRepair config.Repairer.InMemoryRepair = true
config.Checker.RepairOverrides = checker.RepairOverrides{ config.Checker.RepairOverrides = checker.RepairOverrides{
List: []checker.RepairOverride{ List: []checker.RepairOverride{
{Min: 3, Success: 9, Total: 9, Override: repairOverride}, {Min: 3, Success: 9, Total: 9, Override: repairOverride},
@ -2066,14 +1988,7 @@ func testDataRepairOverrideHigherLimit(t *testing.T, inMemoryRepair bool) {
// - Kills more nodes to fall to the Override Value to trigger repair // - Kills more nodes to fall to the Override Value to trigger repair
// - Triggers data repair, which attempts to repair the data from the remaining nodes to // - Triggers data repair, which attempts to repair the data from the remaining nodes to
// the numbers of nodes determined by the upload repair max threshold // the numbers of nodes determined by the upload repair max threshold
func TestDataRepairOverride_LowerLimitInMemory(t *testing.T) { func TestDataRepairOverride_LowerLimit(t *testing.T) {
testDataRepairOverrideLowerLimit(t, true)
}
func TestDataRepairOverride_LowerLimitToDisk(t *testing.T) {
testDataRepairOverrideLowerLimit(t, false)
}
func testDataRepairOverrideLowerLimit(t *testing.T, inMemoryRepair bool) {
const repairOverride = 4 const repairOverride = 4
testplanet.Run(t, testplanet.Config{ testplanet.Run(t, testplanet.Config{
@ -2083,7 +1998,7 @@ func testDataRepairOverrideLowerLimit(t *testing.T, inMemoryRepair bool) {
Reconfigure: testplanet.Reconfigure{ Reconfigure: testplanet.Reconfigure{
Satellite: testplanet.Combine( Satellite: testplanet.Combine(
func(log *zap.Logger, index int, config *satellite.Config) { func(log *zap.Logger, index int, config *satellite.Config) {
config.Repairer.InMemoryRepair = inMemoryRepair config.Repairer.InMemoryRepair = true
config.Checker.RepairOverrides = checker.RepairOverrides{ config.Checker.RepairOverrides = checker.RepairOverrides{
List: []checker.RepairOverride{ List: []checker.RepairOverride{
{Min: 3, Success: 9, Total: 9, Override: repairOverride}, {Min: 3, Success: 9, Total: 9, Override: repairOverride},
@ -2188,14 +2103,7 @@ func testDataRepairOverrideLowerLimit(t *testing.T, inMemoryRepair bool) {
// - Triggers data repair // - Triggers data repair
// - Verify that the number of pieces which repaired has uploaded don't overpass // - Verify that the number of pieces which repaired has uploaded don't overpass
// the established limit (success threshold + % of excess) // the established limit (success threshold + % of excess)
func TestDataRepairUploadLimitInMemory(t *testing.T) { func TestDataRepairUploadLimit(t *testing.T) {
testDataRepairUploadLimit(t, true)
}
func TestDataRepairUploadLimitToDisk(t *testing.T) {
testDataRepairUploadLimit(t, false)
}
func testDataRepairUploadLimit(t *testing.T, inMemoryRepair bool) {
const ( const (
RepairMaxExcessRateOptimalThreshold = 0.05 RepairMaxExcessRateOptimalThreshold = 0.05
repairThreshold = 5 repairThreshold = 5
@ -2211,7 +2119,7 @@ func testDataRepairUploadLimit(t *testing.T, inMemoryRepair bool) {
Satellite: testplanet.Combine( Satellite: testplanet.Combine(
func(log *zap.Logger, index int, config *satellite.Config) { func(log *zap.Logger, index int, config *satellite.Config) {
config.Repairer.MaxExcessRateOptimalThreshold = RepairMaxExcessRateOptimalThreshold config.Repairer.MaxExcessRateOptimalThreshold = RepairMaxExcessRateOptimalThreshold
config.Repairer.InMemoryRepair = inMemoryRepair config.Repairer.InMemoryRepair = true
}, },
testplanet.ReconfigureRS(3, repairThreshold, successThreshold, maxThreshold), testplanet.ReconfigureRS(3, repairThreshold, successThreshold, maxThreshold),
), ),
@ -2318,14 +2226,7 @@ func testDataRepairUploadLimit(t *testing.T, inMemoryRepair bool) {
// - Now we have just the 3 new nodes to which the data was repaired // - Now we have just the 3 new nodes to which the data was repaired
// - Downloads the data from these 3 nodes (succeeds because 3 nodes are enough for download) // - Downloads the data from these 3 nodes (succeeds because 3 nodes are enough for download)
// - Expect newly repaired pointer does not contain the gracefully exited nodes. // - Expect newly repaired pointer does not contain the gracefully exited nodes.
func TestRepairGracefullyExitedInMemory(t *testing.T) { func TestRepairGracefullyExited(t *testing.T) {
testRepairGracefullyExited(t, true)
}
func TestRepairGracefullyExitedToDisk(t *testing.T) {
testRepairGracefullyExited(t, false)
}
func testRepairGracefullyExited(t *testing.T, inMemoryRepair bool) {
testplanet.Run(t, testplanet.Config{ testplanet.Run(t, testplanet.Config{
SatelliteCount: 1, SatelliteCount: 1,
StorageNodeCount: 12, StorageNodeCount: 12,
@ -2333,7 +2234,7 @@ func testRepairGracefullyExited(t *testing.T, inMemoryRepair bool) {
Reconfigure: testplanet.Reconfigure{ Reconfigure: testplanet.Reconfigure{
Satellite: testplanet.Combine( Satellite: testplanet.Combine(
func(log *zap.Logger, index int, config *satellite.Config) { func(log *zap.Logger, index int, config *satellite.Config) {
config.Repairer.InMemoryRepair = inMemoryRepair config.Repairer.InMemoryRepair = true
}, },
testplanet.ReconfigureRS(3, 5, 7, 7), testplanet.ReconfigureRS(3, 5, 7, 7),
), ),