diff --git a/agent/internal/task/task.go b/agent/internal/task/task.go index 3653981..7f0a27a 100644 --- a/agent/internal/task/task.go +++ b/agent/internal/task/task.go @@ -1,12 +1,12 @@ package task import ( - distsvc "gitlink.org.cn/cloudream/common/pkgs/distlock/service" + "gitlink.org.cn/cloudream/common/pkgs/distlock" "gitlink.org.cn/cloudream/common/pkgs/task" ) type TaskContext struct { - distlock *distsvc.Service + distlock *distlock.Service } // 需要在Task结束后主动调用,completing函数将在Manager加锁期间被调用, @@ -21,7 +21,7 @@ type Task = task.Task[TaskContext] type CompleteOption = task.CompleteOption -func NewManager(distlock *distsvc.Service) Manager { +func NewManager(distlock *distlock.Service) Manager { return task.NewManager(TaskContext{ distlock: distlock, }) diff --git a/client/internal/cmdline/distlock.go b/client/internal/cmdline/distlock.go index eae07bc..59a103c 100644 --- a/client/internal/cmdline/distlock.go +++ b/client/internal/cmdline/distlock.go @@ -59,7 +59,8 @@ func parseOneLock(lockData string) (distlock.Lock, error) { } func DistLockUnlock(ctx CommandContext, reqID string) error { - return ctx.Cmdline.Svc.DistLock.Release(reqID) + ctx.Cmdline.Svc.DistLock.Release(reqID) + return nil } func init() { diff --git a/client/internal/services/service.go b/client/internal/services/service.go index 33e5ff3..226a616 100644 --- a/client/internal/services/service.go +++ b/client/internal/services/service.go @@ -1,7 +1,7 @@ package services import ( - distlock "gitlink.org.cn/cloudream/common/pkgs/distlock/service" + "gitlink.org.cn/cloudream/common/pkgs/distlock" "gitlink.org.cn/cloudream/storage/client/internal/task" ) diff --git a/client/internal/task/task.go b/client/internal/task/task.go index 3653981..7f0a27a 100644 --- a/client/internal/task/task.go +++ b/client/internal/task/task.go @@ -1,12 +1,12 @@ package task import ( - distsvc "gitlink.org.cn/cloudream/common/pkgs/distlock/service" + "gitlink.org.cn/cloudream/common/pkgs/distlock" "gitlink.org.cn/cloudream/common/pkgs/task" ) type TaskContext struct { - distlock *distsvc.Service + distlock *distlock.Service } // 需要在Task结束后主动调用,completing函数将在Manager加锁期间被调用, @@ -21,7 +21,7 @@ type Task = task.Task[TaskContext] type CompleteOption = task.CompleteOption -func NewManager(distlock *distsvc.Service) Manager { +func NewManager(distlock *distlock.Service) Manager { return task.NewManager(TaskContext{ distlock: distlock, }) diff --git a/common/pkgs/cmd/create_rep_package.go b/common/pkgs/cmd/create_rep_package.go index c75a79f..1993921 100644 --- a/common/pkgs/cmd/create_rep_package.go +++ b/common/pkgs/cmd/create_rep_package.go @@ -7,7 +7,7 @@ import ( "time" "github.com/samber/lo" - distsvc "gitlink.org.cn/cloudream/common/pkgs/distlock/service" + "gitlink.org.cn/cloudream/common/pkgs/distlock" "gitlink.org.cn/cloudream/common/pkgs/logger" stgsdk "gitlink.org.cn/cloudream/common/sdks/storage" @@ -34,7 +34,7 @@ type CreateRepPackage struct { } type UpdatePackageContext struct { - Distlock *distsvc.Service + Distlock *distlock.Service } type CreateRepPackageResult struct { diff --git a/common/pkgs/cmd/download_package.go b/common/pkgs/cmd/download_package.go index 2b7d557..b53c21e 100644 --- a/common/pkgs/cmd/download_package.go +++ b/common/pkgs/cmd/download_package.go @@ -8,7 +8,7 @@ import ( stgsdk "gitlink.org.cn/cloudream/common/sdks/storage" - distsvc "gitlink.org.cn/cloudream/common/pkgs/distlock/service" + "gitlink.org.cn/cloudream/common/pkgs/distlock" stgglb "gitlink.org.cn/cloudream/storage/common/globals" "gitlink.org.cn/cloudream/storage/common/pkgs/db/model" "gitlink.org.cn/cloudream/storage/common/pkgs/iterator" @@ -22,7 +22,7 @@ type DownloadPackage struct { } type DownloadPackageContext struct { - Distlock *distsvc.Service + Distlock *distlock.Service } func NewDownloadPackage(userID int64, packageID int64, outputPath string) *DownloadPackage { diff --git a/common/pkgs/distlock/reqbuilder/lock_request_builder.go b/common/pkgs/distlock/reqbuilder/lock_request_builder.go index a6af4ed..4afb577 100644 --- a/common/pkgs/distlock/reqbuilder/lock_request_builder.go +++ b/common/pkgs/distlock/reqbuilder/lock_request_builder.go @@ -2,7 +2,6 @@ package reqbuilder import ( "gitlink.org.cn/cloudream/common/pkgs/distlock" - "gitlink.org.cn/cloudream/common/pkgs/distlock/service" mylo "gitlink.org.cn/cloudream/common/utils/lo" ) @@ -20,8 +19,8 @@ func (b *LockRequestBuilder) Build() distlock.LockRequest { } } -func (b *LockRequestBuilder) MutexLock(svc *service.Service) (*service.Mutex, error) { - mutex := service.NewMutex(svc, b.Build()) +func (b *LockRequestBuilder) MutexLock(svc *distlock.Service) (*distlock.Mutex, error) { + mutex := distlock.NewMutex(svc, b.Build()) err := mutex.Lock() if err != nil { return nil, err diff --git a/common/pkgs/distlock/service.go b/common/pkgs/distlock/service.go index cc68468..a6af649 100644 --- a/common/pkgs/distlock/service.go +++ b/common/pkgs/distlock/service.go @@ -2,15 +2,14 @@ package distlock import ( "gitlink.org.cn/cloudream/common/pkgs/distlock" - "gitlink.org.cn/cloudream/common/pkgs/distlock/service" "gitlink.org.cn/cloudream/common/pkgs/trie" "gitlink.org.cn/cloudream/storage/common/pkgs/distlock/lockprovider" ) -type Service = service.Service +type Service = distlock.Service -func NewService(cfg *distlock.Config) (*service.Service, error) { - srv, err := service.NewService(cfg, initProviders()) +func NewService(cfg *distlock.Config) (*distlock.Service, error) { + srv, err := distlock.NewService(cfg, initProviders()) if err != nil { return nil, err } @@ -18,8 +17,8 @@ func NewService(cfg *distlock.Config) (*service.Service, error) { return srv, nil } -func initProviders() []service.PathProvider { - var provs []service.PathProvider +func initProviders() []distlock.PathProvider { + var provs []distlock.PathProvider provs = append(provs, initMetadataLockProviders()...) @@ -30,33 +29,33 @@ func initProviders() []service.PathProvider { return provs } -func initMetadataLockProviders() []service.PathProvider { - return []service.PathProvider{ - service.NewPathProvider(lockprovider.NewMetadataLock(), lockprovider.MetadataLockPathPrefix, "Node"), - service.NewPathProvider(lockprovider.NewMetadataLock(), lockprovider.MetadataLockPathPrefix, "Storage"), - service.NewPathProvider(lockprovider.NewMetadataLock(), lockprovider.MetadataLockPathPrefix, "User"), - service.NewPathProvider(lockprovider.NewMetadataLock(), lockprovider.MetadataLockPathPrefix, "UserBucket"), - service.NewPathProvider(lockprovider.NewMetadataLock(), lockprovider.MetadataLockPathPrefix, "UserNode"), - service.NewPathProvider(lockprovider.NewMetadataLock(), lockprovider.MetadataLockPathPrefix, "UserStorage"), - service.NewPathProvider(lockprovider.NewMetadataLock(), lockprovider.MetadataLockPathPrefix, "Bucket"), - service.NewPathProvider(lockprovider.NewMetadataLock(), lockprovider.MetadataLockPathPrefix, "Object"), - service.NewPathProvider(lockprovider.NewMetadataLock(), lockprovider.MetadataLockPathPrefix, "Package"), - service.NewPathProvider(lockprovider.NewMetadataLock(), lockprovider.MetadataLockPathPrefix, "ObjectRep"), - service.NewPathProvider(lockprovider.NewMetadataLock(), lockprovider.MetadataLockPathPrefix, "ObjectBlock"), - service.NewPathProvider(lockprovider.NewMetadataLock(), lockprovider.MetadataLockPathPrefix, "Cache"), - service.NewPathProvider(lockprovider.NewMetadataLock(), lockprovider.MetadataLockPathPrefix, "StoragePackage"), - service.NewPathProvider(lockprovider.NewMetadataLock(), lockprovider.MetadataLockPathPrefix, "Location"), +func initMetadataLockProviders() []distlock.PathProvider { + return []distlock.PathProvider{ + distlock.NewPathProvider(lockprovider.NewMetadataLock(), lockprovider.MetadataLockPathPrefix, "Node"), + distlock.NewPathProvider(lockprovider.NewMetadataLock(), lockprovider.MetadataLockPathPrefix, "Storage"), + distlock.NewPathProvider(lockprovider.NewMetadataLock(), lockprovider.MetadataLockPathPrefix, "User"), + distlock.NewPathProvider(lockprovider.NewMetadataLock(), lockprovider.MetadataLockPathPrefix, "UserBucket"), + distlock.NewPathProvider(lockprovider.NewMetadataLock(), lockprovider.MetadataLockPathPrefix, "UserNode"), + distlock.NewPathProvider(lockprovider.NewMetadataLock(), lockprovider.MetadataLockPathPrefix, "UserStorage"), + distlock.NewPathProvider(lockprovider.NewMetadataLock(), lockprovider.MetadataLockPathPrefix, "Bucket"), + distlock.NewPathProvider(lockprovider.NewMetadataLock(), lockprovider.MetadataLockPathPrefix, "Object"), + distlock.NewPathProvider(lockprovider.NewMetadataLock(), lockprovider.MetadataLockPathPrefix, "Package"), + distlock.NewPathProvider(lockprovider.NewMetadataLock(), lockprovider.MetadataLockPathPrefix, "ObjectRep"), + distlock.NewPathProvider(lockprovider.NewMetadataLock(), lockprovider.MetadataLockPathPrefix, "ObjectBlock"), + distlock.NewPathProvider(lockprovider.NewMetadataLock(), lockprovider.MetadataLockPathPrefix, "Cache"), + distlock.NewPathProvider(lockprovider.NewMetadataLock(), lockprovider.MetadataLockPathPrefix, "StoragePackage"), + distlock.NewPathProvider(lockprovider.NewMetadataLock(), lockprovider.MetadataLockPathPrefix, "Location"), } } -func initIPFSLockProviders() []service.PathProvider { - return []service.PathProvider{ - service.NewPathProvider(lockprovider.NewIPFSLock(), lockprovider.IPFSLockPathPrefix, trie.WORD_ANY), +func initIPFSLockProviders() []distlock.PathProvider { + return []distlock.PathProvider{ + distlock.NewPathProvider(lockprovider.NewIPFSLock(), lockprovider.IPFSLockPathPrefix, trie.WORD_ANY), } } -func initStorageLockProviders() []service.PathProvider { - return []service.PathProvider{ - service.NewPathProvider(lockprovider.NewStorageLock(), lockprovider.StorageLockPathPrefix, trie.WORD_ANY), +func initStorageLockProviders() []distlock.PathProvider { + return []distlock.PathProvider{ + distlock.NewPathProvider(lockprovider.NewStorageLock(), lockprovider.StorageLockPathPrefix, trie.WORD_ANY), } } diff --git a/common/pkgs/iterator/rep_object_iterator.go b/common/pkgs/iterator/rep_object_iterator.go index ef111bd..f1ac0b2 100644 --- a/common/pkgs/iterator/rep_object_iterator.go +++ b/common/pkgs/iterator/rep_object_iterator.go @@ -7,7 +7,7 @@ import ( "github.com/samber/lo" - distsvc "gitlink.org.cn/cloudream/common/pkgs/distlock/service" + "gitlink.org.cn/cloudream/common/pkgs/distlock" "gitlink.org.cn/cloudream/common/pkgs/logger" myio "gitlink.org.cn/cloudream/common/utils/io" @@ -43,7 +43,7 @@ type DownloadNodeInfo struct { } type DownloadContext struct { - Distlock *distsvc.Service + Distlock *distlock.Service } func NewRepObjectIterator(objects []model.Object, objectRepData []stgmod.ObjectRepData, downloadCtx *DownloadContext) *RepObjectIterator { diff --git a/scanner/internal/event/event.go b/scanner/internal/event/event.go index 2533ade..d32a3d5 100644 --- a/scanner/internal/event/event.go +++ b/scanner/internal/event/event.go @@ -4,7 +4,7 @@ import ( "fmt" "reflect" - distlocksvc "gitlink.org.cn/cloudream/common/pkgs/distlock/service" + "gitlink.org.cn/cloudream/common/pkgs/distlock" event "gitlink.org.cn/cloudream/common/pkgs/event" "gitlink.org.cn/cloudream/common/pkgs/typedispatcher" mydb "gitlink.org.cn/cloudream/storage/common/pkgs/db" @@ -13,7 +13,7 @@ import ( type ExecuteArgs struct { DB *mydb.DB - DistLock *distlocksvc.Service + DistLock *distlock.Service } type Executor = event.Executor[ExecuteArgs] @@ -24,7 +24,7 @@ type Event = event.Event[ExecuteArgs] type ExecuteOption = event.ExecuteOption -func NewExecutor(db *mydb.DB, distLock *distlocksvc.Service) Executor { +func NewExecutor(db *mydb.DB, distLock *distlock.Service) Executor { return event.NewExecutor(ExecuteArgs{ DB: db, DistLock: distLock,