testplanet: remove brittle config
Change-Id: I032c6a53bf32d1fa3a3e4cd8f46bc38d2e38d73c
This commit is contained in:
JT Olio
Egon Elbre
parent
d987990c15
commit
9e2d837473
@ -1,218 +0,0 @@
|
||||
// Copyright (C) 2021 Storj Labs, Inc.
|
||||
// See LICENSE for copying information
|
||||
|
||||
// TODO: this whole file can be removed in a future PR.
|
||||
|
||||
package testplanet
|
||||
|
||||
import (
|
||||
"reflect"
|
||||
|
||||
"github.com/zeebo/errs"
|
||||
|
||||
"storj.io/storj/satellite/compensation"
|
||||
)
|
||||
|
||||
// showInequality can be removed in a future PR. This is a lightly edited version
|
||||
// of reflect.DeepEqual but made to show what is different.
|
||||
func showInequality(v1, v2 reflect.Value) error {
|
||||
if !v1.IsValid() || !v2.IsValid() {
|
||||
if v1.IsValid() != v2.IsValid() {
|
||||
return errs.New("mismatch on validity")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
if v1.Type() != v2.Type() {
|
||||
return errs.New("type mismatch")
|
||||
}
|
||||
|
||||
if v1.CanInterface() {
|
||||
if dv1, ok := v1.Interface().(compensation.Rate); ok {
|
||||
dv2 := v2.Interface().(compensation.Rate)
|
||||
if dv1.String() == dv2.String() {
|
||||
return nil
|
||||
}
|
||||
return errs.New("compensation.Rate mismatch: %q != %q", dv1.String(), dv2.String())
|
||||
}
|
||||
}
|
||||
|
||||
switch v1.Kind() {
|
||||
case reflect.Array:
|
||||
for i := 0; i < v1.Len(); i++ {
|
||||
if err := showInequality(v1.Index(i), v2.Index(i)); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
case reflect.Slice:
|
||||
if v1.IsNil() != v2.IsNil() {
|
||||
return errs.New("a slice is nil")
|
||||
}
|
||||
if v1.Len() != v2.Len() {
|
||||
return errs.New("slice length mismatch")
|
||||
}
|
||||
if v1.Pointer() == v2.Pointer() {
|
||||
return nil
|
||||
}
|
||||
for i := 0; i < v1.Len(); i++ {
|
||||
if err := showInequality(v1.Index(i), v2.Index(i)); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
case reflect.Interface:
|
||||
if v1.IsNil() || v2.IsNil() {
|
||||
if v1.IsNil() != v2.IsNil() {
|
||||
return errs.New("an interface is nil")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
return showInequality(v1.Elem(), v2.Elem())
|
||||
case reflect.Ptr:
|
||||
if v1.Pointer() == v2.Pointer() {
|
||||
return nil
|
||||
}
|
||||
return showInequality(v1.Elem(), v2.Elem())
|
||||
case reflect.Struct:
|
||||
for i, n := 0, v1.NumField(); i < n; i++ {
|
||||
if err := showInequality(v1.Field(i), v2.Field(i)); err != nil {
|
||||
return errs.New("struct field %q: %+v", v1.Type().Field(i).Name, err)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
case reflect.Map:
|
||||
if v1.IsNil() != v2.IsNil() {
|
||||
return errs.New("a map is nil")
|
||||
}
|
||||
if v1.Len() != v2.Len() {
|
||||
return errs.New("map len mismatch")
|
||||
}
|
||||
if v1.Pointer() == v2.Pointer() {
|
||||
return nil
|
||||
}
|
||||
for _, k := range v1.MapKeys() {
|
||||
val1 := v1.MapIndex(k)
|
||||
val2 := v2.MapIndex(k)
|
||||
if !val1.IsValid() || !val2.IsValid() {
|
||||
return errs.New("invalid map index")
|
||||
}
|
||||
if err := showInequality(val1, val2); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
case reflect.Func:
|
||||
if v1.IsNil() && v2.IsNil() {
|
||||
return nil
|
||||
}
|
||||
// Can't do better than this:
|
||||
return errs.New("funcs can't be equal")
|
||||
default:
|
||||
// Normal equality suffices
|
||||
if v1.Interface() != v2.Interface() {
|
||||
return errs.New("v1 %q != v2 %q", v1, v2)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
// deepEqual is simply reflect.DeepEqual but with special handling for
|
||||
// compensation.Rate.
|
||||
func deepEqual(x, y interface{}) bool {
|
||||
if x == nil || y == nil {
|
||||
return x == y
|
||||
}
|
||||
v1 := reflect.ValueOf(x)
|
||||
v2 := reflect.ValueOf(y)
|
||||
if v1.Type() != v2.Type() {
|
||||
return false
|
||||
}
|
||||
return deepValueEqual(v1, v2)
|
||||
}
|
||||
|
||||
// deepValueEqual is simply reflect.deepValueEqual but with special handling
|
||||
// for compensation.Rate.
|
||||
func deepValueEqual(v1, v2 reflect.Value) bool {
|
||||
if !v1.IsValid() || !v2.IsValid() {
|
||||
return v1.IsValid() == v2.IsValid()
|
||||
}
|
||||
if v1.Type() != v2.Type() {
|
||||
return false
|
||||
}
|
||||
|
||||
if v1.CanInterface() {
|
||||
if dv1, ok := v1.Interface().(compensation.Rate); ok {
|
||||
return dv1.String() == v2.Interface().(compensation.Rate).String()
|
||||
}
|
||||
}
|
||||
|
||||
switch v1.Kind() {
|
||||
case reflect.Array:
|
||||
for i := 0; i < v1.Len(); i++ {
|
||||
if !deepValueEqual(v1.Index(i), v2.Index(i)) {
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
case reflect.Slice:
|
||||
if v1.IsNil() != v2.IsNil() {
|
||||
return false
|
||||
}
|
||||
if v1.Len() != v2.Len() {
|
||||
return false
|
||||
}
|
||||
if v1.Pointer() == v2.Pointer() {
|
||||
return true
|
||||
}
|
||||
for i := 0; i < v1.Len(); i++ {
|
||||
if !deepValueEqual(v1.Index(i), v2.Index(i)) {
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
case reflect.Interface:
|
||||
if v1.IsNil() || v2.IsNil() {
|
||||
return v1.IsNil() == v2.IsNil()
|
||||
}
|
||||
return deepValueEqual(v1.Elem(), v2.Elem())
|
||||
case reflect.Ptr:
|
||||
if v1.Pointer() == v2.Pointer() {
|
||||
return true
|
||||
}
|
||||
return deepValueEqual(v1.Elem(), v2.Elem())
|
||||
case reflect.Struct:
|
||||
for i, n := 0, v1.NumField(); i < n; i++ {
|
||||
if !deepValueEqual(v1.Field(i), v2.Field(i)) {
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
case reflect.Map:
|
||||
if v1.IsNil() != v2.IsNil() {
|
||||
return false
|
||||
}
|
||||
if v1.Len() != v2.Len() {
|
||||
return false
|
||||
}
|
||||
if v1.Pointer() == v2.Pointer() {
|
||||
return true
|
||||
}
|
||||
for _, k := range v1.MapKeys() {
|
||||
val1 := v1.MapIndex(k)
|
||||
val2 := v2.MapIndex(k)
|
||||
if !val1.IsValid() || !val2.IsValid() || !deepValueEqual(val1, val2) {
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
case reflect.Func:
|
||||
if v1.IsNil() && v2.IsNil() {
|
||||
return true
|
||||
}
|
||||
// Can't do better than this:
|
||||
return false
|
||||
default:
|
||||
// Normal equality suffices
|
||||
return v1.Interface() == v2.Interface()
|
||||
}
|
||||
}
|
||||
@ -8,10 +8,8 @@ import (
|
||||
"net"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"reflect"
|
||||
"runtime/pprof"
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
"github.com/spf13/pflag"
|
||||
"github.com/zeebo/errs"
|
||||
@ -20,20 +18,15 @@ import (
|
||||
|
||||
"storj.io/common/errs2"
|
||||
"storj.io/common/identity"
|
||||
"storj.io/common/memory"
|
||||
"storj.io/common/peertls/extensions"
|
||||
"storj.io/common/peertls/tlsopts"
|
||||
"storj.io/common/rpc"
|
||||
"storj.io/common/storj"
|
||||
"storj.io/common/uuid"
|
||||
"storj.io/private/cfgstruct"
|
||||
"storj.io/private/debug"
|
||||
"storj.io/private/version"
|
||||
"storj.io/storj/private/revocation"
|
||||
"storj.io/storj/private/server"
|
||||
"storj.io/storj/private/testredis"
|
||||
versionchecker "storj.io/storj/private/version/checker"
|
||||
"storj.io/storj/private/web"
|
||||
"storj.io/storj/satellite"
|
||||
"storj.io/storj/satellite/accounting"
|
||||
"storj.io/storj/satellite/accounting/live"
|
||||
@ -41,7 +34,6 @@ import (
|
||||
"storj.io/storj/satellite/accounting/rollup"
|
||||
"storj.io/storj/satellite/accounting/rolluparchive"
|
||||
"storj.io/storj/satellite/accounting/tally"
|
||||
"storj.io/storj/satellite/admin"
|
||||
"storj.io/storj/satellite/audit"
|
||||
"storj.io/storj/satellite/compensation"
|
||||
"storj.io/storj/satellite/console"
|
||||
@ -57,14 +49,11 @@ import (
|
||||
"storj.io/storj/satellite/metabase/segmentloop"
|
||||
"storj.io/storj/satellite/metainfo"
|
||||
"storj.io/storj/satellite/metainfo/expireddeletion"
|
||||
"storj.io/storj/satellite/metainfo/piecedeletion"
|
||||
"storj.io/storj/satellite/metrics"
|
||||
"storj.io/storj/satellite/nodestats"
|
||||
"storj.io/storj/satellite/orders"
|
||||
"storj.io/storj/satellite/overlay"
|
||||
"storj.io/storj/satellite/overlay/straynodes"
|
||||
"storj.io/storj/satellite/payments/paymentsconfig"
|
||||
"storj.io/storj/satellite/payments/stripecoinpayments"
|
||||
"storj.io/storj/satellite/repair/checker"
|
||||
"storj.io/storj/satellite/repair/irreparable"
|
||||
"storj.io/storj/satellite/repair/repairer"
|
||||
@ -389,240 +378,6 @@ func (planet *Planet) newSatellite(ctx context.Context, prefix string, index int
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// TODO: in a future PR, remove config2 entirely.
|
||||
config2 := satellite.Config{
|
||||
Server: server.Config{
|
||||
Address: "127.0.0.1:0",
|
||||
PrivateAddress: "127.0.0.1:0",
|
||||
|
||||
Config: tlsopts.Config{
|
||||
RevocationDBURL: "bolt://" + filepath.Join(storageDir, "revocations.db"),
|
||||
UsePeerCAWhitelist: true,
|
||||
PeerCAWhitelistPath: planet.whitelistPath,
|
||||
PeerIDVersions: "latest",
|
||||
Extensions: extensions.Config{
|
||||
Revocation: false,
|
||||
WhitelistSignedLeaf: false,
|
||||
},
|
||||
},
|
||||
},
|
||||
Debug: debug.Config{
|
||||
Address: "",
|
||||
},
|
||||
Admin: admin.Config{
|
||||
Address: "127.0.0.1:0",
|
||||
},
|
||||
Contact: contact.Config{
|
||||
Timeout: 1 * time.Minute,
|
||||
RateLimitInterval: time.Nanosecond,
|
||||
RateLimitBurst: 1000,
|
||||
RateLimitCacheSize: 1000,
|
||||
},
|
||||
Overlay: overlay.Config{
|
||||
Node: overlay.NodeSelectionConfig{
|
||||
AuditCount: 0,
|
||||
NewNodeFraction: 1,
|
||||
OnlineWindow: time.Minute,
|
||||
DistinctIP: false,
|
||||
MinimumDiskSpace: 100 * memory.MB,
|
||||
|
||||
AuditReputationRepairWeight: 1,
|
||||
AuditReputationUplinkWeight: 1,
|
||||
AuditReputationLambda: 0.95,
|
||||
AuditReputationWeight: 1,
|
||||
AuditReputationDQ: 0.6,
|
||||
SuspensionGracePeriod: time.Hour,
|
||||
SuspensionDQEnabled: true,
|
||||
},
|
||||
NodeSelectionCache: overlay.UploadSelectionCacheConfig{
|
||||
Staleness: 3 * time.Minute,
|
||||
},
|
||||
UpdateStatsBatchSize: 100,
|
||||
AuditHistory: overlay.AuditHistoryConfig{
|
||||
WindowSize: 10 * time.Minute,
|
||||
TrackingPeriod: time.Hour,
|
||||
GracePeriod: time.Hour,
|
||||
OfflineThreshold: 0.6,
|
||||
OfflineSuspensionEnabled: true,
|
||||
},
|
||||
},
|
||||
StrayNodes: straynodes.Config{
|
||||
EnableDQ: true,
|
||||
Interval: time.Minute,
|
||||
MaxDurationWithoutContact: 30 * time.Second,
|
||||
Limit: 1000,
|
||||
},
|
||||
Metainfo: metainfo.Config{
|
||||
DatabaseURL: "", // not used
|
||||
MinRemoteSegmentSize: 0, // TODO: fix tests to work with 1024
|
||||
MaxInlineSegmentSize: 4 * memory.KiB,
|
||||
MaxSegmentSize: 64 * memory.MiB,
|
||||
MaxMetadataSize: 2 * memory.KiB,
|
||||
MaxCommitInterval: 1 * time.Hour,
|
||||
Overlay: true,
|
||||
RS: metainfo.RSConfig{
|
||||
ErasureShareSize: memory.Size(256),
|
||||
Min: atLeastOne(planet.config.StorageNodeCount * 1 / 5),
|
||||
Repair: atLeastOne(planet.config.StorageNodeCount * 2 / 5),
|
||||
Success: atLeastOne(planet.config.StorageNodeCount * 3 / 5),
|
||||
Total: atLeastOne(planet.config.StorageNodeCount * 4 / 5),
|
||||
},
|
||||
Loop: metaloop.Config{
|
||||
CoalesceDuration: 1 * time.Second,
|
||||
ListLimit: 10000,
|
||||
},
|
||||
SegmentLoop: segmentloop.Config{
|
||||
CoalesceDuration: 1 * time.Second,
|
||||
},
|
||||
RateLimiter: metainfo.RateLimiterConfig{
|
||||
Enabled: true,
|
||||
Rate: 1000,
|
||||
CacheCapacity: 100,
|
||||
CacheExpiration: 10 * time.Second,
|
||||
},
|
||||
ProjectLimits: metainfo.ProjectLimitConfig{
|
||||
MaxBuckets: 10,
|
||||
},
|
||||
PieceDeletion: piecedeletion.Config{
|
||||
MaxConcurrency: 100,
|
||||
MaxConcurrentPieces: 1000,
|
||||
|
||||
MaxPiecesPerBatch: 4000,
|
||||
MaxPiecesPerRequest: 2000,
|
||||
|
||||
DialTimeout: 2 * time.Second,
|
||||
RequestTimeout: 2 * time.Second,
|
||||
FailThreshold: 2 * time.Second,
|
||||
},
|
||||
},
|
||||
Orders: orders.Config{
|
||||
Expiration: 7 * 24 * time.Hour,
|
||||
FlushBatchSize: 10,
|
||||
FlushInterval: defaultInterval,
|
||||
NodeStatusLogging: true,
|
||||
EncryptionKeys: *encryptionKeys,
|
||||
},
|
||||
Checker: checker.Config{
|
||||
Interval: defaultInterval,
|
||||
IrreparableInterval: defaultInterval,
|
||||
ReliabilityCacheStaleness: 1 * time.Minute,
|
||||
},
|
||||
Payments: paymentsconfig.Config{
|
||||
StorageTBPrice: "10",
|
||||
EgressTBPrice: "45",
|
||||
ObjectPrice: "0.0000022",
|
||||
StripeCoinPayments: stripecoinpayments.Config{
|
||||
TransactionUpdateInterval: defaultInterval,
|
||||
AccountBalanceUpdateInterval: defaultInterval,
|
||||
ConversionRatesCycleInterval: defaultInterval,
|
||||
ListingLimit: 100,
|
||||
},
|
||||
CouponDuration: paymentsconfig.CouponDuration{
|
||||
Enabled: true,
|
||||
BillingPeriods: 2,
|
||||
},
|
||||
CouponValue: 275,
|
||||
PaywallProportion: 1,
|
||||
},
|
||||
Repairer: repairer.Config{
|
||||
MaxRepair: 10,
|
||||
Interval: defaultInterval,
|
||||
Timeout: 1 * time.Minute, // Repairs can take up to 10 seconds. Leaving room for outliers
|
||||
DownloadTimeout: 1 * time.Minute,
|
||||
TotalTimeout: 10 * time.Minute,
|
||||
MaxBufferMem: 4 * memory.MiB,
|
||||
MaxExcessRateOptimalThreshold: 0.05,
|
||||
InMemoryRepair: false,
|
||||
},
|
||||
Audit: audit.Config{
|
||||
MaxRetriesStatDB: 0,
|
||||
MinBytesPerSecond: 1 * memory.KB,
|
||||
MinDownloadTimeout: 5 * time.Second,
|
||||
MaxReverifyCount: 3,
|
||||
ChoreInterval: defaultInterval,
|
||||
QueueInterval: defaultInterval,
|
||||
Slots: 3,
|
||||
WorkerConcurrency: 2,
|
||||
},
|
||||
GarbageCollection: gc.Config{
|
||||
Interval: defaultInterval,
|
||||
Enabled: true,
|
||||
InitialPieces: 10,
|
||||
FalsePositiveRate: 0.1,
|
||||
ConcurrentSends: 1,
|
||||
RunInCore: false,
|
||||
},
|
||||
ExpiredDeletion: expireddeletion.Config{
|
||||
Interval: defaultInterval,
|
||||
Enabled: true,
|
||||
},
|
||||
Tally: tally.Config{
|
||||
Interval: defaultInterval,
|
||||
},
|
||||
Rollup: rollup.Config{
|
||||
Interval: defaultInterval,
|
||||
DeleteTallies: false,
|
||||
},
|
||||
RollupArchive: rolluparchive.Config{
|
||||
Interval: defaultInterval,
|
||||
ArchiveAge: time.Hour * 24,
|
||||
BatchSize: 1000,
|
||||
Enabled: true,
|
||||
},
|
||||
ProjectBWCleanup: projectbwcleanup.Config{
|
||||
Interval: defaultInterval,
|
||||
RetainMonths: 1,
|
||||
},
|
||||
LiveAccounting: live.Config{
|
||||
StorageBackend: "redis://" + redis.Addr() + "?db=0",
|
||||
BandwidthCacheTTL: 5 * time.Minute,
|
||||
},
|
||||
Mail: mailservice.Config{
|
||||
SMTPServerAddress: "smtp.mail.test:587",
|
||||
From: "Labs <storj@mail.test>",
|
||||
AuthType: "simulate",
|
||||
TemplatePath: filepath.Join(developmentRoot, "web/satellite/static/emails"),
|
||||
},
|
||||
Console: consoleweb.Config{
|
||||
Address: "127.0.0.1:0",
|
||||
StaticDir: filepath.Join(developmentRoot, "web/satellite"),
|
||||
AuthToken: "very-secret-token",
|
||||
AuthTokenSecret: "my-suppa-secret-key",
|
||||
Config: console.Config{
|
||||
PasswordCost: console.TestPasswordCost,
|
||||
DefaultProjectLimit: 5,
|
||||
UsageLimits: console.UsageLimitsConfig{
|
||||
DefaultStorageLimit: 25 * memory.GB,
|
||||
DefaultBandwidthLimit: 25 * memory.GB,
|
||||
},
|
||||
},
|
||||
RateLimit: web.IPRateLimiterConfig{
|
||||
Duration: 5 * time.Minute,
|
||||
Burst: 3,
|
||||
NumLimits: 10,
|
||||
},
|
||||
},
|
||||
Version: planet.NewVersionConfig(),
|
||||
GracefulExit: gracefulexit.Config{
|
||||
Enabled: true,
|
||||
|
||||
ChoreBatchSize: 10,
|
||||
ChoreInterval: defaultInterval,
|
||||
|
||||
EndpointBatchSize: 100,
|
||||
MaxFailuresPerPiece: 5,
|
||||
MaxInactiveTimeFrame: time.Second * 10,
|
||||
OverallMaxFailuresPercentage: 10,
|
||||
RecvTimeout: time.Minute * 1,
|
||||
MaxOrderLimitSendCount: 3,
|
||||
NodeMinAgeInMonths: 0,
|
||||
|
||||
AsOfSystemTimeInterval: 0,
|
||||
TransferQueueBatchSize: 1000,
|
||||
},
|
||||
Metrics: metrics.Config{},
|
||||
}
|
||||
|
||||
var config satellite.Config
|
||||
cfgstruct.Bind(pflag.NewFlagSet("", pflag.PanicOnError), &config,
|
||||
cfgstruct.UseTestDefaults(),
|
||||
@ -699,14 +454,6 @@ func (planet *Planet) newSatellite(ctx context.Context, prefix string, index int
|
||||
config.Mail.TemplatePath = filepath.Join(developmentRoot, "web/satellite/static/emails")
|
||||
config.Console.StaticDir = filepath.Join(developmentRoot, "web/satellite")
|
||||
|
||||
// TODO: remove the following equality check in a future PR.
|
||||
if !deepEqual(config, config2) {
|
||||
if err := showInequality(reflect.ValueOf(config), reflect.ValueOf(config2)); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return nil, errs.New("show inequality error")
|
||||
}
|
||||
|
||||
if planet.config.Reconfigure.Satellite != nil {
|
||||
planet.config.Reconfigure.Satellite(log, index, &config)
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user