cascade/ipfs-cluster
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Issue #1350: Ensure CID status and Peers do not take too long

Browse Source 
StatusCID() and Peers() are calls that should return relatively quickly.

If they don't, it means they are hanging for some reason. We cannot let the
whole Multicall request hang waiting on a single peer, therefore, set a
hardcoded 15 second deadline for both.
This commit is contained in:
Hector Sanjuan 2021-05-03 17:37:04 +02:00
parent 8cd9e7928d
commit 5419d0ff7c
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cluster.go
View File

@ -1630,7 +1630,10 @@ func (c *Cluster) Peers(ctx context.Context) []*api.ID {
peers := make([]*api.ID, lenMembers)
ctxs, cancels := rpcutil.CtxsWithCancel(ctx, lenMembers)
// We should be done relatively quickly with this call. Otherwise
// report errors.
timeout := 15 * time.Second
ctxs, cancels := rpcutil.CtxsWithTimeout(ctx, lenMembers, timeout)
defer rpcutil.MultiCancel(cancels)
errs := c.rpcClient.MultiCall(
@ -1773,7 +1776,11 @@ func (c *Cluster) globalPinInfoCid(ctx context.Context, comp, method string, h c
lenDests := len(dests)
replies := make([]*api.PinInfo, lenDests)
ctxs, cancels := rpcutil.CtxsWithCancel(ctx, lenDests)
// a globalPinInfo type of request should be relatively fast. We
// cannot block response indefinitely due to an unresponsive node.
timeout := 15 * time.Second
ctxs, cancels := rpcutil.CtxsWithTimeout(ctx, lenDests, timeout)
defer rpcutil.MultiCancel(cancels)
errs := c.rpcClient.MultiCall(
@ -1839,6 +1846,9 @@ func (c *Cluster) globalPinInfoSlice(ctx context.Context, comp, method string) (
replies := make([][]*api.PinInfo, lenMembers)
// We don't have a good timeout proposal for this. Depending on the
// size of the state and the peformance of IPFS and the network, this
// may take moderately long.
ctxs, cancels := rpcutil.CtxsWithCancel(ctx, lenMembers)
defer rpcutil.MultiCancel(cancels)