Skip to content

Commit a8e23c1

Browse files
committed
sync2: adjust settings again (#6629)
## Motivation Need proper defaults for mainnet. There were systest flakes with `syncv2` server mode enabled possibly due to increased resource usage.
1 parent 60b08da commit a8e23c1

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

config/mainnet.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,13 @@ func MainnetConfig() Config {
8080
hare4conf.Enable = false
8181

8282
oldAtxSyncCfg := sync2.DefaultConfig()
83-
oldAtxSyncCfg.MultiPeerReconcilerConfig.SyncInterval = time.Hour
8483
oldAtxSyncCfg.MaxDepth = 16
84+
oldAtxSyncCfg.MultiPeerReconcilerConfig.SyncInterval = 10 * time.Hour
85+
oldAtxSyncCfg.AdvanceInterval = time.Hour
8586
newAtxSyncCfg := sync2.DefaultConfig()
8687
newAtxSyncCfg.MaxDepth = 21
87-
newAtxSyncCfg.MultiPeerReconcilerConfig.SyncInterval = 5 * time.Minute
88+
newAtxSyncCfg.MultiPeerReconcilerConfig.SyncInterval = 30 * time.Minute
89+
newAtxSyncCfg.AdvanceInterval = 5 * time.Minute
8890

8991
return Config{
9092
BaseConfig: BaseConfig{

config/presets/fastnet.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ func fastnet() config.Config {
2222

2323
conf.BaseConfig.OptFilterThreshold = 90
2424
conf.BaseConfig.DatabasePruneInterval = time.Minute
25+
conf.BaseConfig.DatabaseConnections = 16
2526

2627
// set for systest TestEquivocation
2728
conf.BaseConfig.MinerGoodAtxsPercent = 50

config/presets/testnet.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ func testnet() config.Config {
6969

7070
oldAtxSyncCfg := sync2.DefaultConfig()
7171
oldAtxSyncCfg.MaxDepth = 16
72+
oldAtxSyncCfg.MultiPeerReconcilerConfig.SyncInterval = 10 * time.Minute
7273
newAtxSyncCfg := sync2.DefaultConfig()
7374
newAtxSyncCfg.MaxDepth = 21
7475
newAtxSyncCfg.MultiPeerReconcilerConfig.SyncInterval = 5 * time.Minute

syncer/syncer.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,11 @@ func DefaultConfig() Config {
6262
oldAtxSyncCfg := sync2.DefaultConfig()
6363
oldAtxSyncCfg.MaxDepth = 16
6464
oldAtxSyncCfg.MultiPeerReconcilerConfig.SyncInterval = 10 * time.Hour
65+
oldAtxSyncCfg.AdvanceInterval = time.Hour
6566
newAtxSyncCfg := sync2.DefaultConfig()
6667
newAtxSyncCfg.MaxDepth = 21
6768
newAtxSyncCfg.MultiPeerReconcilerConfig.SyncInterval = 30 * time.Minute
69+
newAtxSyncCfg.AdvanceInterval = 5 * time.Minute
6870
return Config{
6971
Interval: 10 * time.Second,
7072
EpochEndFraction: 0.5,

0 commit comments

Comments
 (0)