forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-17 17:33:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

cmd: maxpeers calculation algorithm

Browse source
This commit is contained in:
Zsolt Felfoldi 2018-01-23 16:12:23 +01:00
parent 4933496fb2
commit 7e5f7f0b6e
2 changed files with 65 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/geth/config.go
View file

@ -131,7 +131,7 @@ func makeConfigNode(ctx *cli.Context) (*node.Node, gethConfig) {
if err != nil {
utils.Fatalf("Failed to create the protocol stack: %v", err)
}
utils.SetEthConfig(ctx, stack, &cfg.Eth)
utils.SetEthConfig(ctx, stack, &cfg.Eth, &cfg.Node.P2P)
if ctx.GlobalIsSet(utils.EthStatsURLFlag.Name) {
cfg.Ethstats.URL = ctx.GlobalString(utils.EthStatsURLFlag.Name)
}

79
cmd/utils/flags.go
View file

@ -794,23 +794,21 @@ func SetP2PConfig(ctx *cli.Context, cfg *p2p.Config) {
setBootstrapNodes(ctx, cfg)
setBootstrapNodesV5(ctx, cfg)
if ctx.GlobalIsSet(MaxPeersFlag.Name) {
cfg.MaxPeers = ctx.GlobalInt(MaxPeersFlag.Name)
} else if ctx.GlobalIsSet(EthPeersFlag.Name) || ctx.GlobalIsSet(LightPeersFlag.Name) {
cfg.MaxPeers = ctx.GlobalInt(EthPeersFlag.Name) + ctx.GlobalInt(LightPeersFlag.Name)
}
// note: cfg.MaxPeers is calculated in SetEthConfig
if ctx.GlobalIsSet(MaxPendingPeersFlag.Name) {
cfg.MaxPendingPeers = ctx.GlobalInt(MaxPendingPeersFlag.Name)
}
if ctx.GlobalIsSet(NoDiscoverFlag.Name) || ctx.GlobalBool(LightModeFlag.Name) {
lightClient := ctx.GlobalBool(LightModeFlag.Name) || ctx.GlobalString(SyncModeFlag.Name) == "light"
lightServer := ctx.GlobalInt(LightServFlag.Name) != 0
if ctx.GlobalIsSet(NoDiscoverFlag.Name) || lightClient {
cfg.NoDiscovery = true
}
// if we're running a light client or server, force enable the v5 peer discovery
// unless it is explicitly disabled with --nodiscover note that explicitly specifying
// --v5disc overrides --nodiscover, in which case the later only disables v4 discovery
forceV5Discovery := (ctx.GlobalBool(LightModeFlag.Name) || ctx.GlobalInt(LightServFlag.Name) > 0) && !ctx.GlobalBool(NoDiscoverFlag.Name)
forceV5Discovery := (lightClient || lightServer) && !ctx.GlobalBool(NoDiscoverFlag.Name)
if ctx.GlobalIsSet(DiscoveryV5Flag.Name) {
cfg.DiscoveryV5 = ctx.GlobalBool(DiscoveryV5Flag.Name)
} else if forceV5Discovery {
@ -976,7 +974,7 @@ func SetShhConfig(ctx *cli.Context, stack *node.Node, cfg *whisper.Config) {
}
// SetEthConfig applies eth-related command line flags to the config.
func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config) {
func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config, p2pcfg *p2p.Config) {
// Avoid conflicting network flags
checkExclusive(ctx, DeveloperFlag, TestnetFlag, RinkebyFlag)
checkExclusive(ctx, FastSyncFlag, LightModeFlag, SyncModeFlag)
@ -997,19 +995,70 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config) {
case ctx.GlobalBool(LightModeFlag.Name):
cfg.SyncMode = downloader.LightSync
}
if ctx.GlobalIsSet(EthPeersFlag.Name) {
cfg.EthPeers = ctx.GlobalInt(EthPeersFlag.Name)
}
if ctx.GlobalIsSet(LightServFlag.Name) {
cfg.LightServ = ctx.GlobalInt(LightServFlag.Name)
}
if ctx.GlobalIsSet(LightPeersFlag.Name) {
cfg.LightPeers = ctx.GlobalInt(LightPeersFlag.Name)
}
if ctx.GlobalIsSet(NetworkIdFlag.Name) {
cfg.NetworkId = ctx.GlobalUint64(NetworkIdFlag.Name)
}
ethPeers := cfg.EthPeers
if ctx.GlobalIsSet(EthPeersFlag.Name) {
ethPeers = ctx.GlobalInt(EthPeersFlag.Name)
}
ethPeersFixed := ctx.GlobalIsSet(EthPeersFlag.Name)
lightPeers := cfg.LightPeers
if ctx.GlobalIsSet(LightPeersFlag.Name) {
lightPeers = ctx.GlobalInt(LightPeersFlag.Name)
}
lightPeersFixed := ctx.GlobalIsSet(LightPeersFlag.Name)
if cfg.SyncMode == downloader.LightSync {
// ETH is not used
ethPeers = 0
ethPeersFixed = true
} else if cfg.LightServ == 0 {
// LES is not used
lightPeers = 0
lightPeersFixed = true
}
// if maxpeers is specified, adjust ethpeers and/or lightpeers if possible
if ctx.GlobalIsSet(MaxPeersFlag.Name) {
maxPeersDiff := ctx.GlobalInt(MaxPeersFlag.Name) - ethPeers - lightPeers
if maxPeersDiff > 0 {
// when adjusting upwards, ETH has priority
if !ethPeersFixed {
ethPeers += maxPeersDiff
} else if !lightPeersFixed {
lightPeers += maxPeersDiff
}
} else if maxPeersDiff < 0 {
// when adjusting downwards, LES has priority
if !lightPeersFixed {
if lightPeers >= -maxPeersDiff {
lightPeers += maxPeersDiff
maxPeersDiff = 0
} else {
maxPeersDiff += lightPeers
lightPeers = 0
}
}
if !ethPeersFixed {
if ethPeers >= -maxPeersDiff {
ethPeers += maxPeersDiff
maxPeersDiff = 0
} else {
maxPeersDiff += ethPeers
ethPeers = 0
}
}
}
}
cfg.EthPeers = ethPeers
cfg.LightPeers = lightPeers
p2pcfg.MaxPeers = ethPeers + lightPeers
if ctx.GlobalIsSet(CacheFlag.Name) {
cfg.DatabaseCache = ctx.GlobalInt(CacheFlag.Name)
}