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).
143 lines
3.9 KiB
Go
143 lines
3.9 KiB
Go
// Copyright (C) 2019 Storj Labs, Inc.
|
|
// See LICENSE for copying information.
|
|
|
|
package storagenodedb_test
|
|
|
|
import (
|
|
"fmt"
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
"github.com/zeebo/errs"
|
|
"go.uber.org/zap/zaptest"
|
|
|
|
"storj.io/storj/internal/dbutil/dbschema"
|
|
"storj.io/storj/internal/dbutil/sqliteutil"
|
|
"storj.io/storj/internal/testcontext"
|
|
"storj.io/storj/storagenode/storagenodedb"
|
|
"storj.io/storj/storagenode/storagenodedb/testdata"
|
|
)
|
|
|
|
// insertNewData will insert any NewData from the MultiDBState into the
|
|
// appropriate rawDB. This prepares the rawDB for the test comparing schema and
|
|
// data.
|
|
func insertNewData(mdbs *testdata.MultiDBState, rawDBs map[string]storagenodedb.SQLDB) error {
|
|
for dbName, dbState := range mdbs.DBStates {
|
|
if dbState.NewData == "" {
|
|
continue
|
|
}
|
|
|
|
rawDB, ok := rawDBs[dbName]
|
|
if !ok {
|
|
return errs.New("Failed to find DB %s", dbName)
|
|
}
|
|
_, err := rawDB.Exec(dbState.NewData)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// getSchemas queries the schema of each rawDB and returns a map of each rawDB's
|
|
// schema keyed by dbName
|
|
func getSchemas(rawDBs map[string]storagenodedb.SQLDB) (map[string]*dbschema.Schema, error) {
|
|
schemas := make(map[string]*dbschema.Schema)
|
|
for dbName, rawDB := range rawDBs {
|
|
schema, err := sqliteutil.QuerySchema(rawDB)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// we don't care changes in versions table
|
|
schema.DropTable("versions")
|
|
|
|
schemas[dbName] = schema
|
|
}
|
|
return schemas, nil
|
|
}
|
|
|
|
// getSchemas queries the data of each rawDB and returns a map of each rawDB's
|
|
// data keyed by dbName
|
|
func getData(rawDBs map[string]storagenodedb.SQLDB, schemas map[string]*dbschema.Schema) (map[string]*dbschema.Data, error) {
|
|
data := make(map[string]*dbschema.Data)
|
|
for dbName, rawDB := range rawDBs {
|
|
datum, err := sqliteutil.QueryData(rawDB, schemas[dbName])
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
data[dbName] = datum
|
|
}
|
|
return data, nil
|
|
}
|
|
|
|
func TestMigrate(t *testing.T) {
|
|
ctx := testcontext.New(t)
|
|
|
|
log := zaptest.NewLogger(t)
|
|
|
|
storageDir := ctx.Dir("storage")
|
|
cfg := storagenodedb.Config{
|
|
Pieces: storageDir,
|
|
Storage: storageDir,
|
|
Info: filepath.Join(storageDir, "piecestore.db"),
|
|
Info2: filepath.Join(storageDir, "info.db"),
|
|
}
|
|
|
|
// create a new satellitedb connection
|
|
db, err := storagenodedb.New(log, cfg)
|
|
require.NoError(t, err)
|
|
defer func() { require.NoError(t, db.Close()) }()
|
|
|
|
rawDBs := db.RawDatabases()
|
|
|
|
// get migration for this database
|
|
migrations := db.Migration()
|
|
for i, step := range migrations.Steps {
|
|
// the schema is different when migration step is before the step, cannot test the layout
|
|
tag := fmt.Sprintf("#%d - v%d", i, step.Version)
|
|
|
|
// run migration up to a specific version
|
|
err := migrations.TargetVersion(step.Version).Run(log.Named("migrate"))
|
|
require.NoError(t, err, tag)
|
|
|
|
// find the matching expected version
|
|
expected, ok := testdata.States.FindVersion(step.Version)
|
|
require.True(t, ok)
|
|
|
|
// insert data for new tables
|
|
err = insertNewData(expected, rawDBs)
|
|
require.NoError(t, err, tag)
|
|
|
|
// load schema from database
|
|
schemas, err := getSchemas(rawDBs)
|
|
require.NoError(t, err, tag)
|
|
|
|
// load data from database
|
|
data, err := getData(rawDBs, schemas)
|
|
require.NoError(t, err, tag)
|
|
|
|
multiDBSnapshot, err := testdata.LoadMultiDBSnapshot(expected)
|
|
require.NoError(t, err, tag)
|
|
|
|
// verify schema and data for each db in the expected snapshot
|
|
for dbName, dbSnapshot := range multiDBSnapshot.DBSnapshots {
|
|
// If the tables and indexes of the schema are empty, that's
|
|
// semantically the same as nil. Set to nil explicitly to help with
|
|
// comparison to snapshot.
|
|
schema, ok := schemas[dbName]
|
|
if ok && len(schema.Tables) == 0 {
|
|
schema.Tables = nil
|
|
}
|
|
if ok && len(schema.Indexes) == 0 {
|
|
schema.Indexes = nil
|
|
}
|
|
|
|
require.Equal(t, dbSnapshot.Schema, schemas[dbName], tag)
|
|
require.Equal(t, dbSnapshot.Data, data[dbName], tag)
|
|
}
|
|
}
|
|
}
|