Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
1bdde620
Commit
1bdde620
authored
Feb 19, 2018
by
Felföldi Zsolt
Committed by
Péter Szilágyi
Feb 19, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
les: fix light fetcher database race (#16103)
* les: fix light fetcher database race * les: lightFetcher comments
parent
06c5cae3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
9 deletions
+21
-9
fetcher.go
les/fetcher.go
+21
-9
No files found.
les/fetcher.go
View file @
1bdde620
...
...
@@ -36,24 +36,26 @@ const (
maxNodeCount
=
20
// maximum number of fetcherTreeNode entries remembered for each peer
)
// lightFetcher
// lightFetcher implements retrieval of newly announced headers. It also provides a peerHasBlock function for the
// ODR system to ensure that we only request data related to a certain block from peers who have already processed
// and announced that block.
type
lightFetcher
struct
{
pm
*
ProtocolManager
odr
*
LesOdr
chain
*
light
.
LightChain
lock
sync
.
Mutex
// lock protects access to the fetcher's internal state variables except sent requests
maxConfirmedTd
*
big
.
Int
peers
map
[
*
peer
]
*
fetcherPeerInfo
lastUpdateStats
*
updateStatsEntry
syncing
bool
syncDone
chan
*
peer
lock
sync
.
Mutex
// qwerqwerqwe
deliverChn
chan
fetchResponse
reqMu
sync
.
RWMutex
reqMu
sync
.
RWMutex
// reqMu protects access to sent header fetch requests
requested
map
[
uint64
]
fetchRequest
deliverChn
chan
fetchResponse
timeoutChn
chan
uint64
requestChn
chan
bool
// true if initiated from outside
syncing
bool
syncDone
chan
*
peer
}
// fetcherPeerInfo holds fetcher-specific information about each active peer
...
...
@@ -560,8 +562,13 @@ func (f *lightFetcher) checkAnnouncedHeaders(fp *fetcherPeerInfo, headers []*typ
return
true
}
// we ran out of recently delivered headers but have not reached a node known by this peer yet, continue matching
td
=
f
.
chain
.
GetTd
(
header
.
ParentHash
,
header
.
Number
.
Uint64
()
-
1
)
header
=
f
.
chain
.
GetHeader
(
header
.
ParentHash
,
header
.
Number
.
Uint64
()
-
1
)
hash
,
number
:=
header
.
ParentHash
,
header
.
Number
.
Uint64
()
-
1
td
=
f
.
chain
.
GetTd
(
hash
,
number
)
header
=
f
.
chain
.
GetHeader
(
hash
,
number
)
if
header
==
nil
||
td
==
nil
{
log
.
Error
(
"Missing parent of validated header"
,
"hash"
,
hash
,
"number"
,
number
)
return
false
}
}
else
{
header
=
headers
[
i
]
td
=
tds
[
i
]
...
...
@@ -645,13 +652,18 @@ func (f *lightFetcher) checkKnownNode(p *peer, n *fetcherTreeNode) bool {
if
td
==
nil
{
return
false
}
header
:=
f
.
chain
.
GetHeader
(
n
.
hash
,
n
.
number
)
// check the availability of both header and td because reads are not protected by chain db mutex
// Note: returning false is always safe here
if
header
==
nil
{
return
false
}
fp
:=
f
.
peers
[
p
]
if
fp
==
nil
{
p
.
Log
()
.
Debug
(
"Unknown peer to check known nodes"
)
return
false
}
header
:=
f
.
chain
.
GetHeader
(
n
.
hash
,
n
.
number
)
if
!
f
.
checkAnnouncedHeaders
(
fp
,
[]
*
types
.
Header
{
header
},
[]
*
big
.
Int
{
td
})
{
p
.
Log
()
.
Debug
(
"Inconsistent announcement"
)
go
f
.
pm
.
removePeer
(
p
.
id
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment