Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mybee
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
vicotor
mybee
Commits
435a12ff
Unverified
Commit
435a12ff
authored
Jul 08, 2020
by
Petar Radovic
Committed by
GitHub
Jul 08, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Retreival - stream reset (#421)
* retreival zombie threads
parent
2af9c6a9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
3 deletions
+15
-3
retrieval.go
pkg/retrieval/retrieval.go
+15
-3
No files found.
pkg/retrieval/retrieval.go
View file @
435a12ff
...
...
@@ -123,7 +123,13 @@ func (s *Service) retrieveChunk(ctx context.Context, addr swarm.Address, skipPee
if
err
!=
nil
{
return
nil
,
peer
,
fmt
.
Errorf
(
"new stream: %w"
,
err
)
}
defer
stream
.
Close
()
defer
func
()
{
if
err
!=
nil
{
_
=
stream
.
Reset
()
}
else
{
go
stream
.
FullClose
()
}
}()
w
,
r
:=
protobuf
.
NewWriterAndReader
(
stream
)
...
...
@@ -181,9 +187,15 @@ func (s *Service) closestPeer(addr swarm.Address, skipPeers []swarm.Address) (sw
return
closest
,
nil
}
func
(
s
*
Service
)
handler
(
ctx
context
.
Context
,
p
p2p
.
Peer
,
stream
p2p
.
Stream
)
error
{
func
(
s
*
Service
)
handler
(
ctx
context
.
Context
,
p
p2p
.
Peer
,
stream
p2p
.
Stream
)
(
err
error
)
{
w
,
r
:=
protobuf
.
NewWriterAndReader
(
stream
)
defer
stream
.
Close
()
defer
func
()
{
if
err
!=
nil
{
_
=
stream
.
Reset
()
}
else
{
_
=
stream
.
FullClose
()
}
}()
var
req
pb
.
Request
if
err
:=
r
.
ReadMsg
(
&
req
);
err
!=
nil
{
return
fmt
.
Errorf
(
"read request: %w peer %s"
,
err
,
p
.
Address
.
String
())
...
...
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