diff --git a/weed/wdclient/filer_client.go b/weed/wdclient/filer_client.go index b09bc303fc..98f1150144 100644 --- a/weed/wdclient/filer_client.go +++ b/weed/wdclient/filer_client.go @@ -788,8 +788,16 @@ func (p *filerVolumeProvider) LookupVolumeIds(ctx context.Context, volumeIds []s }() if err != nil { - // a caller that gave up says nothing about this filer - if ctxErr := ctx.Err(); ctxErr != nil { + // a caller that gave up says nothing about this filer; gRPC can + // surface its own DeadlineExceeded a tick before ctx.Err() + // becomes visible, so reinterpret only deadline errors this way + ctxErr := ctx.Err() + if ctxErr == nil && status.Code(err) == codes.DeadlineExceeded { + if dl, ok := ctx.Deadline(); ok && !dl.After(time.Now()) { + ctxErr = context.DeadlineExceeded + } + } + if ctxErr != nil { if lastErr != nil { return nil, fmt.Errorf("%w (earlier filer error: %v)", ctxErr, lastErr) }