cerc-io/lotus
15
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

rpcenc: Add timeout for readers

Browse Source
This commit is contained in:
Łukasz Magiera 2020-08-14 23:12:37 +02:00
parent 0377d6952b
commit aa611e49fd
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/rpcenc/reader.go
View File

@ -11,6 +11,7 @@ import (
"reflect"
"strconv"
"sync"
"time"
"github.com/google/uuid"
logging "github.com/ipfs/go-log/v2"
@ -21,7 +22,9 @@ import (
sealing "github.com/filecoin-project/storage-fsm"
)
var log = logging.Logger("rpc")
var log = logging.Logger("rpcenc")
var Timeout = 30 * time.Second
type StreamType string
const (
@ -111,10 +114,14 @@ func ReaderParamDecoder() (http.HandlerFunc, jsonrpc.ServerOption) {
wait: make(chan struct{}),
}
tctx, cancel := context.WithTimeout(req.Context(), Timeout)
defer cancel()
select {
case ch <- wr:
case <-req.Context().Done():
log.Error("context error in reader stream handler (1): %v", req.Context().Err())
case <-tctx.Done():
close(ch)
log.Error("context error in reader stream handler (1): %v", tctx.Err())
resp.WriteHeader(500)
return
}
@ -158,8 +165,15 @@ func ReaderParamDecoder() (http.HandlerFunc, jsonrpc.ServerOption) {
}
readersLk.Unlock()
ctx, cancel := context.WithTimeout(ctx, Timeout)
defer cancel()
select {
case wr := <-ch:
case wr, ok := <-ch:
if !ok {
return reflect.Value{}, xerrors.Errorf("handler timed out")
}
return reflect.ValueOf(wr), nil
case <-ctx.Done():
return reflect.Value{}, ctx.Err()