chore: optimize defer and test

Signed-off-by: Jim Ma <[email protected]>
dragonflyoss · Jan 19, 2022 · c71dd02 · c71dd02
1 parent 5083963
commit c71dd02
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/client/daemon/peer/peertask_conductor.go b/client/daemon/peer/peertask_conductor.go
@@ -1132,8 +1132,10 @@ func (pt *peerTaskConductor) Done() {
 }
 
 func (pt *peerTaskConductor) done() {
-	defer pt.span.End()
-	defer pt.broker.Stop()
+	defer func() {
+		pt.broker.Stop()
+		pt.span.End()
+	}()
 	var (
 		cost    = time.Now().Sub(pt.start).Milliseconds()
 		success = true
@@ -1213,9 +1215,11 @@ func (pt *peerTaskConductor) Fail() {
 
 func (pt *peerTaskConductor) fail() {
 	metrics.PeerTaskFailedCount.Add(1)
-	defer pt.span.End()
-	defer pt.broker.Stop()
-	defer close(pt.failCh)
+	defer func() {
+		close(pt.failCh)
+		pt.broker.Stop()
+		pt.span.End()
+	}()
 	pt.peerTaskManager.PeerTaskDone(pt.taskID)
 	var end = time.Now()
 	pt.Log().Errorf("stream peer task failed, code: %d, reason: %s", pt.failedCode, pt.failedReason)

diff --git a/client/daemon/peer/peertask_manager.go b/client/daemon/peer/peertask_manager.go
@@ -167,6 +167,7 @@ func (ptm *peerTaskManager) getOrCreatePeerTaskConductor(
 		logger.Debugf("peer task found: %s/%s", ptc.taskID, ptc.peerID)
 		return ptc, nil
 	}
+	// FIXME merge register peer tasks
 	ptc, err := ptm.newPeerTaskConductor(ctx, request, limit)
 	if err != nil {
 		return nil, err

diff --git a/client/daemon/peer/peertask_manager_test.go b/client/daemon/peer/peertask_manager_test.go
@@ -402,7 +402,7 @@ func TestPeerTaskManager_TaskSuite(t *testing.T) {
 			},
 		},
 		{
-			name:                "normal size scope - back source - content length - aligning",
+			name:                "normal size scope - back source - no content length - aligning",
 			taskData:            testBytes[:8192],
 			pieceParallelCount:  4,
 			pieceSize:           1024,
@@ -675,6 +675,7 @@ func (ts *testSpec) runConductorTest(assert *testifyassert.Assertions, require *
 		if noRunningTask {
 			break
 		}
+		noRunningTask = true
 		time.Sleep(100 * time.Millisecond)
 	}
 	assert.True(noRunningTask, "no running tasks")

diff --git a/client/daemon/storage/storage_manager.go b/client/daemon/storage/storage_manager.go
@@ -95,7 +95,7 @@ var (
 	ErrTaskNotFound     = errors.New("task not found")
 	ErrPieceNotFound    = errors.New("piece not found")
 	ErrPieceCountNotSet = errors.New("total piece count not set")
-	ErrDigestNotSet     = errors.New("piece digest not set")
+	ErrDigestNotSet     = errors.New("digest not set")
 	ErrInvalidDigest    = errors.New("invalid digest")
 )