Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
whqwjb
go-ethereum
提交
bc0666fb
G
go-ethereum
项目概览
whqwjb
/
go-ethereum
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
go-ethereum
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
bc0666fb
编写于
2月 05, 2018
作者:
M
Martin Holst Swende
提交者:
Péter Szilágyi
2月 05, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
eth/downloader: fix #15858 by checking if downloader dropPeer function is set (#15992)
上级
0662384d
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
20 addition
and
3 deletion
+20
-3
eth/downloader/downloader.go
eth/downloader/downloader.go
+20
-3
未找到文件。
eth/downloader/downloader.go
浏览文件 @
bc0666fb
...
...
@@ -324,8 +324,13 @@ func (d *Downloader) Synchronise(id string, head common.Hash, td *big.Int, mode
errEmptyHeaderSet
,
errPeersUnavailable
,
errTooOld
,
errInvalidAncestor
,
errInvalidChain
:
log
.
Warn
(
"Synchronisation failed, dropping peer"
,
"peer"
,
id
,
"err"
,
err
)
d
.
dropPeer
(
id
)
if
d
.
dropPeer
==
nil
{
// The dropPeer method is nil when `--copydb` is used for a local copy.
// Timeouts can occur if e.g. compaction hits at the wrong time, and can be ignored
log
.
Warn
(
"Downloader wants to drop peer, but peerdrop-function is not set"
,
"peer"
,
id
)
}
else
{
d
.
dropPeer
(
id
)
}
default
:
log
.
Warn
(
"Synchronisation failed, retrying"
,
"err"
,
err
)
}
...
...
@@ -853,6 +858,12 @@ func (d *Downloader) fetchHeaders(p *peerConnection, from uint64) error {
getHeaders
(
from
)
case
<-
timeout
.
C
:
if
d
.
dropPeer
==
nil
{
// The dropPeer method is nil when `--copydb` is used for a local copy.
// Timeouts can occur if e.g. compaction hits at the wrong time, and can be ignored
p
.
log
.
Warn
(
"Downloader wants to drop peer, but peerdrop-function is not set"
,
"peer"
,
p
.
id
)
break
}
// Header retrieval timed out, consider the peer bad and drop
p
.
log
.
Debug
(
"Header request timed out"
,
"elapsed"
,
ttl
)
headerTimeoutMeter
.
Mark
(
1
)
...
...
@@ -1071,7 +1082,13 @@ func (d *Downloader) fetchParts(errCancel error, deliveryCh chan dataPack, deliv
setIdle
(
peer
,
0
)
}
else
{
peer
.
log
.
Debug
(
"Stalling delivery, dropping"
,
"type"
,
kind
)
d
.
dropPeer
(
pid
)
if
d
.
dropPeer
==
nil
{
// The dropPeer method is nil when `--copydb` is used for a local copy.
// Timeouts can occur if e.g. compaction hits at the wrong time, and can be ignored
peer
.
log
.
Warn
(
"Downloader wants to drop peer, but peerdrop-function is not set"
,
"peer"
,
pid
)
}
else
{
d
.
dropPeer
(
pid
)
}
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录