JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-enabling and fixing repairer tests (#2099)

Browse Source 
* Disabled discovery service by changiing from Stop() to Pause()

Paused to solve race condition.  If discovery is running, it may mark a node "up" after they've been manually marked "down" in this test.

* Extend to the repair timeout

Fixes intermittent test failures when repairs were taking more than 2 seconds.

* Re-enabled test. Disabled discovery service by changiing from Stop() to Pause()

* Changed back to Stop.

* Revert "Changed back to Stop."

This reverts commit 46d410e72dfae63e0c44915be42784cc9a7b5abf.

* re-enabling TestIdentifyInjuredSegments

* Changed Pause to Stop.  Commented on timeout change

* testing...

* temporarily skipping audit tests

* changing back to discover Stop for testing via jenkins

* Revert "changing back to discover Stop for testing via jenkins"

This reverts commit 6aa8558b11a0053c30e0c8b2dbf0d6c0cb34ee6c.

* Changing back to Stop().  Depends on PR 2137

* Revert "temporarily skipping audit tests"

This reverts commit 1940ed9b315d663a0eb6c95521780cbcb48cb121.

* Removed reference to Graveyard since its been removed
This commit is contained in:
ethanadams 2019-06-10 03:06:22 -04:00 committed by Michal Niewrzal
parent 469d485f62
commit 8f2dca8437
4 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/testplanet/planet.go
View File

@ -476,7 +476,7 @@ func (planet *Planet) newSatellites(count int) ([]*satellite.Peer, error) {
Repairer: repairer.Config{
MaxRepair: 10,
Interval: time.Hour,
Timeout: 2 * time.Second,
Timeout: 10 * time.Second, // Repairs can take up to 4 seconds. Leaving room for outliers
MaxBufferMem: 4 * memory.MiB,
},
Audit: audit.Config{

1
pkg/datarepair/checker/checker_test.go
View File

@ -22,7 +22,6 @@ import (
)
func TestIdentifyInjuredSegments(t *testing.T) {
t.Skip()
testplanet.Run(t, testplanet.Config{
SatelliteCount: 1, StorageNodeCount: 4, UplinkCount: 0,
}, func(t *testing.T, ctx *testcontext.Context, planet *testplanet.Planet) {

1
pkg/datarepair/datarepair_test.go
View File

@ -19,7 +19,6 @@ import (
)
func TestDataRepair(t *testing.T) {
t.Skip()
testplanet.Run(t, testplanet.Config{
SatelliteCount: 1,
StorageNodeCount: 12,

3
pkg/storage/segments/repairer_test.go
View File

@ -22,8 +22,6 @@ import (
)
func TestSegmentStoreRepair(t *testing.T) {
t.Skip("flaky")
testplanet.Run(t, testplanet.Config{
SatelliteCount: 1, StorageNodeCount: 6, UplinkCount: 1,
}, func(t *testing.T, ctx *testcontext.Context, planet *testplanet.Planet) {
@ -34,6 +32,7 @@ func TestSegmentStoreRepair(t *testing.T) {
satellite.Repair.Checker.Loop.Stop()
// stop discovery service so that we do not get a race condition when we delete nodes from overlay cache
satellite.Discovery.Service.Discovery.Stop()
satellite.Discovery.Service.Refresh.Stop()
testData := make([]byte, 1*memory.MiB)
_, err := rand.Read(testData)