JointCloud
/
JCS-pub
Not watched
1
0
Fork 0
Code
Releases 0 Wiki evaluate Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain HPC
Browse Source

拆分和修复锁服务代码

gitlink
Sydonian 2 years ago
parent
ce637e8758
commit
2089e2f514
7 changed files with 9 additions and 9 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      internal/event/agent_check_cache.go
  2. +1
    -1
      internal/event/agent_check_state.go
  3. +1
    -1
      internal/event/agent_check_storage.go
  4. +1
    -1
      internal/event/check_cache.go
  5. +1
    -1
      internal/event/check_package.go
  6. +1
    -1
      internal/event/check_rep_count.go
  7. +3
    -3
      main.go

+ 1
- 1
internal/event/agent_check_cache.go View File

@@ -5,11 +5,11 @@ import (
"time" "time"


"github.com/samber/lo" "github.com/samber/lo"
"gitlink.org.cn/cloudream/common/pkgs/distlock/reqbuilder"
"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
"gitlink.org.cn/cloudream/common/pkgs/mq" "gitlink.org.cn/cloudream/common/pkgs/mq"
"gitlink.org.cn/cloudream/storage-common/globals" "gitlink.org.cn/cloudream/storage-common/globals"
"gitlink.org.cn/cloudream/storage-common/pkgs/db/model" "gitlink.org.cn/cloudream/storage-common/pkgs/db/model"
"gitlink.org.cn/cloudream/storage-common/pkgs/distlock/reqbuilder"


agtmq "gitlink.org.cn/cloudream/storage-common/pkgs/mq/agent" agtmq "gitlink.org.cn/cloudream/storage-common/pkgs/mq/agent"
scevt "gitlink.org.cn/cloudream/storage-common/pkgs/mq/scanner/event" scevt "gitlink.org.cn/cloudream/storage-common/pkgs/mq/scanner/event"


+ 1
- 1
internal/event/agent_check_state.go View File

@@ -5,12 +5,12 @@ import (
"time" "time"


"github.com/samber/lo" "github.com/samber/lo"
"gitlink.org.cn/cloudream/common/pkgs/distlock/reqbuilder"
"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
"gitlink.org.cn/cloudream/common/pkgs/mq" "gitlink.org.cn/cloudream/common/pkgs/mq"
"gitlink.org.cn/cloudream/storage-common/consts" "gitlink.org.cn/cloudream/storage-common/consts"
"gitlink.org.cn/cloudream/storage-common/globals" "gitlink.org.cn/cloudream/storage-common/globals"
"gitlink.org.cn/cloudream/storage-common/pkgs/db/model" "gitlink.org.cn/cloudream/storage-common/pkgs/db/model"
"gitlink.org.cn/cloudream/storage-common/pkgs/distlock/reqbuilder"
agtmq "gitlink.org.cn/cloudream/storage-common/pkgs/mq/agent" agtmq "gitlink.org.cn/cloudream/storage-common/pkgs/mq/agent"
scevt "gitlink.org.cn/cloudream/storage-common/pkgs/mq/scanner/event" scevt "gitlink.org.cn/cloudream/storage-common/pkgs/mq/scanner/event"
"gitlink.org.cn/cloudream/storage-scanner/internal/config" "gitlink.org.cn/cloudream/storage-scanner/internal/config"


+ 1
- 1
internal/event/agent_check_storage.go View File

@@ -5,12 +5,12 @@ import (
"time" "time"


"github.com/samber/lo" "github.com/samber/lo"
"gitlink.org.cn/cloudream/common/pkgs/distlock/reqbuilder"
"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
"gitlink.org.cn/cloudream/common/pkgs/mq" "gitlink.org.cn/cloudream/common/pkgs/mq"
"gitlink.org.cn/cloudream/storage-common/consts" "gitlink.org.cn/cloudream/storage-common/consts"
"gitlink.org.cn/cloudream/storage-common/globals" "gitlink.org.cn/cloudream/storage-common/globals"
"gitlink.org.cn/cloudream/storage-common/pkgs/db/model" "gitlink.org.cn/cloudream/storage-common/pkgs/db/model"
"gitlink.org.cn/cloudream/storage-common/pkgs/distlock/reqbuilder"
agtmq "gitlink.org.cn/cloudream/storage-common/pkgs/mq/agent" agtmq "gitlink.org.cn/cloudream/storage-common/pkgs/mq/agent"
scevt "gitlink.org.cn/cloudream/storage-common/pkgs/mq/scanner/event" scevt "gitlink.org.cn/cloudream/storage-common/pkgs/mq/scanner/event"
) )


+ 1
- 1
internal/event/check_cache.go View File

@@ -4,10 +4,10 @@ import (
"database/sql" "database/sql"


"github.com/samber/lo" "github.com/samber/lo"
"gitlink.org.cn/cloudream/common/pkgs/distlock/reqbuilder"
"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
"gitlink.org.cn/cloudream/storage-common/consts" "gitlink.org.cn/cloudream/storage-common/consts"
"gitlink.org.cn/cloudream/storage-common/pkgs/db/model" "gitlink.org.cn/cloudream/storage-common/pkgs/db/model"
"gitlink.org.cn/cloudream/storage-common/pkgs/distlock/reqbuilder"
scevt "gitlink.org.cn/cloudream/storage-common/pkgs/mq/scanner/event" scevt "gitlink.org.cn/cloudream/storage-common/pkgs/mq/scanner/event"
) )




+ 1
- 1
internal/event/check_package.go View File

@@ -2,8 +2,8 @@ package event


import ( import (
"github.com/samber/lo" "github.com/samber/lo"
"gitlink.org.cn/cloudream/common/pkgs/distlock/reqbuilder"
"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
"gitlink.org.cn/cloudream/storage-common/pkgs/distlock/reqbuilder"
scevt "gitlink.org.cn/cloudream/storage-common/pkgs/mq/scanner/event" scevt "gitlink.org.cn/cloudream/storage-common/pkgs/mq/scanner/event"
) )




+ 1
- 1
internal/event/check_rep_count.go View File

@@ -5,11 +5,11 @@ import (
"math" "math"


"github.com/samber/lo" "github.com/samber/lo"
"gitlink.org.cn/cloudream/common/pkgs/distlock/reqbuilder"
"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
mymath "gitlink.org.cn/cloudream/common/utils/math" mymath "gitlink.org.cn/cloudream/common/utils/math"
mysort "gitlink.org.cn/cloudream/common/utils/sort" mysort "gitlink.org.cn/cloudream/common/utils/sort"
"gitlink.org.cn/cloudream/storage-common/consts" "gitlink.org.cn/cloudream/storage-common/consts"
"gitlink.org.cn/cloudream/storage-common/pkgs/distlock/reqbuilder"
"gitlink.org.cn/cloudream/storage-scanner/internal/config" "gitlink.org.cn/cloudream/storage-scanner/internal/config"


"gitlink.org.cn/cloudream/storage-common/pkgs/db/model" "gitlink.org.cn/cloudream/storage-common/pkgs/db/model"


+ 3
- 3
main.go View File

@@ -5,10 +5,10 @@ import (
"os" "os"
"sync" "sync"


distlocksvc "gitlink.org.cn/cloudream/common/pkgs/distlock/service"
"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
"gitlink.org.cn/cloudream/storage-common/globals" "gitlink.org.cn/cloudream/storage-common/globals"
"gitlink.org.cn/cloudream/storage-common/pkgs/db" "gitlink.org.cn/cloudream/storage-common/pkgs/db"
"gitlink.org.cn/cloudream/storage-common/pkgs/distlock"
scmq "gitlink.org.cn/cloudream/storage-common/pkgs/mq/scanner" scmq "gitlink.org.cn/cloudream/storage-common/pkgs/mq/scanner"
"gitlink.org.cn/cloudream/storage-scanner/internal/config" "gitlink.org.cn/cloudream/storage-scanner/internal/config"
"gitlink.org.cn/cloudream/storage-scanner/internal/event" "gitlink.org.cn/cloudream/storage-scanner/internal/event"
@@ -39,7 +39,7 @@ func main() {
wg := sync.WaitGroup{} wg := sync.WaitGroup{}
wg.Add(3) wg.Add(3)


distlockSvc, err := distlocksvc.NewService(&config.Cfg().DistLock)
distlockSvc, err := distlock.NewService(&config.Cfg().DistLock)
if err != nil { if err != nil {
logger.Warnf("new distlock service failed, err: %s", err.Error()) logger.Warnf("new distlock service failed, err: %s", err.Error())
os.Exit(1) os.Exit(1)
@@ -95,7 +95,7 @@ func serveScannerServer(server *scmq.Server, wg *sync.WaitGroup) {
wg.Done() wg.Done()
} }


func serveDistLock(svc *distlocksvc.Service, wg *sync.WaitGroup) {
func serveDistLock(svc *distlock.Service, wg *sync.WaitGroup) {
logger.Info("start serving distlock") logger.Info("start serving distlock")


err := svc.Serve() err := svc.Serve()


Write Preview
Loading…
Cancel
Save