724bb44723
What: cmd/inspector/main.go: removes kad commands internal/testplanet/planet.go: Waits for contact chore to finish satellite/contact/nodesservice.go: creates an empty nodes service implementation satellite/contact/service.go: implements Local and FetchInfo methods & adds external address config value satellite/discovery/service.go: replaces kad.FetchInfo with contact.FetchInfo in Refresh() & removes Discover() satellite/peer.go: sets up contact service and endpoints storagenode/console/service.go: replaces nodeID with contact.Local() storagenode/contact/chore.go: replaces routing table with contact service storagenode/contact/nodesservice.go: creates empty implementation for ping and request info nodes service & implements RequestInfo method storagenode/contact/service.go: creates a service to return the local node and update its own capacity storagenode/monitor/monitor.go: uses contact service in place of routing table storagenode/operator.go: moves operatorconfig from kad into its own setup storagenode/peer.go: sets up contact service, chore, pingstats and endpoints satellite/overlay/config.go: changes NodeSelectionConfig.OnlineWindow default to 4hr to allow for accurate repair selection Removes kademlia setups in: cmd/storagenode/main.go cmd/storj-sim/network.go internal/testplane/planet.go internal/testplanet/satellite.go internal/testplanet/storagenode.go satellite/peer.go scripts/test-sim-backwards.sh scripts/testdata/satellite-config.yaml.lock storagenode/inspector/inspector.go storagenode/peer.go storagenode/storagenodedb/database.go Why: Replacing Kademlia Please describe the tests: • internal/testplanet/planet_test.go: TestBasic: assert that the storagenode can check in with the satellite without any errors TestContact: test that all nodes get inserted into both satellites' overlay cache during testplanet setup • satellite/contact/contact_test.go: TestFetchInfo: Tests that the FetchInfo method returns the correct info • storagenode/contact/contact_test.go: TestNodeInfoUpdated: tests that the contact chore updates the node information TestRequestInfoEndpoint: tests that the Request info endpoint returns the correct info Please describe the performance impact: Node discovery should be at least slightly more performant since each node connects directly to each satellite and no longer needs to wait for bootstrapping. It probably won't be faster in real time on start up since each node waits a random amount of time (less than 1 hr) to initialize its first connection (jitter).
97 lines
2.4 KiB
Go
97 lines
2.4 KiB
Go
// Copyright (C) 2019 Storj Labs, Inc.
|
|
// See LICENSE for copying information
|
|
|
|
package testplanet_test
|
|
|
|
import (
|
|
"context"
|
|
"strconv"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"storj.io/storj/internal/testcontext"
|
|
"storj.io/storj/internal/testplanet"
|
|
"storj.io/storj/pkg/pb"
|
|
"storj.io/storj/pkg/storj"
|
|
)
|
|
|
|
func TestBasic(t *testing.T) {
|
|
ctx := testcontext.New(t)
|
|
defer ctx.Cleanup()
|
|
|
|
test := func(version storj.IDVersion) {
|
|
planet, err := testplanet.NewWithIdentityVersion(t, &version, 2, 4, 1)
|
|
require.NoError(t, err)
|
|
defer ctx.Check(planet.Shutdown)
|
|
|
|
planet.Start(ctx)
|
|
|
|
for _, satellite := range planet.Satellites {
|
|
t.Log("SATELLITE", satellite.ID(), satellite.Addr())
|
|
}
|
|
for _, storageNode := range planet.StorageNodes {
|
|
t.Log("STORAGE", storageNode.ID(), storageNode.Addr())
|
|
}
|
|
for _, uplink := range planet.Uplinks {
|
|
t.Log("UPLINK", uplink.ID(), uplink.Addr())
|
|
}
|
|
|
|
sat := planet.Satellites[0].Local().Node
|
|
node := planet.StorageNodes[0].Local()
|
|
conn, err := planet.StorageNodes[0].Transport.DialNode(ctx, &sat)
|
|
require.NoError(t, err)
|
|
_, err = pb.NewNodeClient(conn).CheckIn(ctx, &pb.CheckInRequest{
|
|
Address: node.GetAddress().GetAddress(),
|
|
Version: &node.Version,
|
|
Capacity: &node.Capacity,
|
|
Operator: &node.Operator,
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
// wait a bit to see whether some failures occur
|
|
time.Sleep(time.Second)
|
|
}
|
|
|
|
for _, version := range storj.IDVersions {
|
|
test(version)
|
|
}
|
|
}
|
|
|
|
// test that nodes get put into each satellite's overlay cache
|
|
func TestContact(t *testing.T) {
|
|
testplanet.Run(t, testplanet.Config{
|
|
SatelliteCount: 2, StorageNodeCount: 5, UplinkCount: 0,
|
|
}, func(t *testing.T, ctx *testcontext.Context, planet *testplanet.Planet) {
|
|
satellite0 := planet.Satellites[0]
|
|
satellite1 := planet.Satellites[1]
|
|
|
|
for _, n := range planet.StorageNodes {
|
|
_, err := satellite0.Overlay.Service.Get(ctx, n.ID())
|
|
require.NoError(t, err)
|
|
_, err = satellite1.Overlay.Service.Get(ctx, n.ID())
|
|
require.NoError(t, err)
|
|
}
|
|
})
|
|
}
|
|
|
|
func BenchmarkCreate(b *testing.B) {
|
|
storageNodes := []int{4, 10, 100}
|
|
for _, count := range storageNodes {
|
|
storageNodeCount := count
|
|
b.Run(strconv.Itoa(storageNodeCount), func(b *testing.B) {
|
|
ctx := context.Background()
|
|
for i := 0; i < b.N; i++ {
|
|
planet, err := testplanet.New(nil, 1, storageNodeCount, 1)
|
|
require.NoError(b, err)
|
|
|
|
planet.Start(ctx)
|
|
|
|
err = planet.Shutdown()
|
|
require.NoError(b, err)
|
|
}
|
|
})
|
|
}
|
|
}
|