feat: task mutex replace sync kmutex (#1000)

* feat: trace https proxy request (#996) * feat: trace https proxy request Signed-off-by: Jim Ma <majinjing3@gmail.com> * fix: daemon test Signed-off-by: Jim Ma <majinjing3@gmail.com> Signed-off-by: Gaius <gaius.qi@gmail.com> * feat: remove sync kmutex and add task mutex Signed-off-by: Gaius <gaius.qi@gmail.com> Co-authored-by: Jim Ma <majinjing3@gmail.com>
dragonflyoss · Jan 18, 2022 · 43014df · 43014df
1 parent 71425c6
commit 43014df
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 361 deletions.
diff --git a/pkg/sync/kmutex.go b/pkg/sync/kmutex.go
diff --git a/pkg/sync/kmutex_test.go b/pkg/sync/kmutex_test.go
diff --git a/pkg/sync/krwmutex.go b/pkg/sync/krwmutex.go
diff --git a/pkg/sync/krwmutex_test.go b/pkg/sync/krwmutex_test.go
diff --git a/scheduler/service/service.go b/scheduler/service/service.go
@@ -24,7 +24,6 @@ import (
 	"d7y.io/dragonfly/v2/pkg/rpc/base"
 	"d7y.io/dragonfly/v2/pkg/rpc/base/common"
 	rpcscheduler "d7y.io/dragonfly/v2/pkg/rpc/scheduler"
-	pkgsync "d7y.io/dragonfly/v2/pkg/sync"
 	"d7y.io/dragonfly/v2/scheduler/config"
 	"d7y.io/dragonfly/v2/scheduler/metrics"
 	"d7y.io/dragonfly/v2/scheduler/resource"
@@ -58,9 +57,6 @@ type service struct {
 
 	// Dynamic config
 	dynconfig config.DynconfigInterface
-
-	// Key map mutex
-	kmu *pkgsync.Krwmutex
 }
 
 func New(
@@ -78,7 +74,6 @@ func New(
 		callback:  callback,
 		config:    cfg,
 		dynconfig: dynconfig,
-		kmu:       pkgsync.NewKrwmutex(),
 	}
 }
 
@@ -92,9 +87,6 @@ func (s *service) CDN() resource.CDN {
 
 func (s *service) RegisterTask(ctx context.Context, req *rpcscheduler.PeerTaskRequest) (*resource.Task, error) {
 	task := resource.NewTask(idgen.TaskID(req.Url, req.UrlMeta), req.Url, s.config.Scheduler.BackSourceCount, req.UrlMeta)
-
-	s.kmu.Lock(task.ID)
-	defer s.kmu.Unlock(task.ID)
 	task, ok := s.resource.TaskManager().LoadOrStore(task)
 	if ok && (task.FSM.Is(resource.TaskStateRunning) || task.FSM.Is(resource.TaskStateSucceeded)) {
 		// Task is healthy and can be reused