From 1f79e76a4ba5b5041fabac2489cbc96b34e12a9f Mon Sep 17 00:00:00 2001 From: Jim Ma Date: Mon, 11 Apr 2022 18:17:29 +0800 Subject: [PATCH] fix: client unexpected timeout (#1239) * fix: client unexpected timeout Signed-off-by: Jim Ma --- client/daemon/peer/peertask_conductor.go | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/client/daemon/peer/peertask_conductor.go b/client/daemon/peer/peertask_conductor.go index d7d536b82..71df14f26 100644 --- a/client/daemon/peer/peertask_conductor.go +++ b/client/daemon/peer/peertask_conductor.go @@ -45,9 +45,10 @@ import ( ) const ( - //reasonContextCanceled = "context canceled" + // TODO implement peer task health check + // reasonContextCanceled = "context canceled" + // reasonReScheduleTimeout = "wait more available peers from scheduler timeout" reasonScheduleTimeout = "wait first peer packet from scheduler timeout" - reasonReScheduleTimeout = "wait more available peers from scheduler timeout" reasonPeerGoneFromScheduler = "scheduler says client should disconnect" reasonBackSourceDisabled = "download from source disabled" @@ -925,18 +926,6 @@ func (pt *peerTaskConductor) waitAvailablePeerPacket() (int32, bool) { pt.span.AddEvent("back source due to scheduler says need back source ") // TODO optimize back source when already downloaded some pieces pt.backSource() - case <-time.After(pt.schedulerOption.ScheduleTimeout.Duration): - if pt.schedulerOption.DisableAutoBackSource { - pt.cancel(base.Code_ClientScheduleTimeout, reasonBackSourceDisabled) - err := fmt.Errorf("%s, auto back source disabled", pt.failedReason) - pt.span.RecordError(err) - pt.Errorf(err.Error()) - } else { - pt.Warnf("start download from source due to %s", reasonReScheduleTimeout) - pt.span.AddEvent("back source due to schedule timeout") - pt.needBackSource.Store(true) - pt.backSource() - } } return -1, false }