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.
spacemeshos · Jan 20, 2025 · a8e23c1 · a8e23c1
1 parent 60b08da
commit a8e23c1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/config/mainnet.go b/config/mainnet.go
@@ -80,11 +80,13 @@ func MainnetConfig() Config {
 	hare4conf.Enable = false
 
 	oldAtxSyncCfg := sync2.DefaultConfig()
-	oldAtxSyncCfg.MultiPeerReconcilerConfig.SyncInterval = time.Hour
 	oldAtxSyncCfg.MaxDepth = 16
+	oldAtxSyncCfg.MultiPeerReconcilerConfig.SyncInterval = 10 * time.Hour
+	oldAtxSyncCfg.AdvanceInterval = time.Hour
 	newAtxSyncCfg := sync2.DefaultConfig()
 	newAtxSyncCfg.MaxDepth = 21
-	newAtxSyncCfg.MultiPeerReconcilerConfig.SyncInterval = 5 * time.Minute
+	newAtxSyncCfg.MultiPeerReconcilerConfig.SyncInterval = 30 * time.Minute
+	newAtxSyncCfg.AdvanceInterval = 5 * time.Minute
 
 	return Config{
 		BaseConfig: BaseConfig{

diff --git a/config/presets/fastnet.go b/config/presets/fastnet.go
@@ -22,6 +22,7 @@ func fastnet() config.Config {
 
 	conf.BaseConfig.OptFilterThreshold = 90
 	conf.BaseConfig.DatabasePruneInterval = time.Minute
+	conf.BaseConfig.DatabaseConnections = 16
 
 	// set for systest TestEquivocation
 	conf.BaseConfig.MinerGoodAtxsPercent = 50

diff --git a/config/presets/testnet.go b/config/presets/testnet.go
@@ -69,6 +69,7 @@ func testnet() config.Config {
 
 	oldAtxSyncCfg := sync2.DefaultConfig()
 	oldAtxSyncCfg.MaxDepth = 16
+	oldAtxSyncCfg.MultiPeerReconcilerConfig.SyncInterval = 10 * time.Minute
 	newAtxSyncCfg := sync2.DefaultConfig()
 	newAtxSyncCfg.MaxDepth = 21
 	newAtxSyncCfg.MultiPeerReconcilerConfig.SyncInterval = 5 * time.Minute

diff --git a/syncer/syncer.go b/syncer/syncer.go
@@ -62,9 +62,11 @@ func DefaultConfig() Config {
 	oldAtxSyncCfg := sync2.DefaultConfig()
 	oldAtxSyncCfg.MaxDepth = 16
 	oldAtxSyncCfg.MultiPeerReconcilerConfig.SyncInterval = 10 * time.Hour
+	oldAtxSyncCfg.AdvanceInterval = time.Hour
 	newAtxSyncCfg := sync2.DefaultConfig()
 	newAtxSyncCfg.MaxDepth = 21
 	newAtxSyncCfg.MultiPeerReconcilerConfig.SyncInterval = 30 * time.Minute
+	newAtxSyncCfg.AdvanceInterval = 5 * time.Minute
 	return Config{
 		Interval:                 10 * time.Second,
 		EpochEndFraction:         0.5,