jhnine
/
JCC-CSScheduler
forked from JointCloud/JCC-CSScheduler
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整模块名

This commit is contained in:
Sydonian 2023-08-29 16:33:05 +08:00
parent bf9f3b926b
commit 50b5f07e55
25 changed files with 255 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
build

3
collector/go.mod
View File

@ -1,3 +0,0 @@
module gitlink.org.cn/cloudream/scheduler-collector
go 1.20

2
collector/internal/config/config.go
View File

@ -5,7 +5,7 @@ import (
uniops "gitlink.org.cn/cloudream/common/api/unifyops"
log "gitlink.org.cn/cloudream/common/pkgs/logger"
c "gitlink.org.cn/cloudream/common/utils/config"
mymq "gitlink.org.cn/cloudream/scheduler-common/pkgs/mq"
mymq "gitlink.org.cn/cloudream/scheduler/common/pkgs/mq"
)
type Config struct {

4
collector/internal/services/storage.go
View File

@ -5,8 +5,8 @@ import (
"gitlink.org.cn/cloudream/common/consts/errorcode"
"gitlink.org.cn/cloudream/common/pkgs/logger"
"gitlink.org.cn/cloudream/common/pkgs/mq"
"gitlink.org.cn/cloudream/scheduler-common/globals"
colmq "gitlink.org.cn/cloudream/scheduler-common/pkgs/mq/collector"
"gitlink.org.cn/cloudream/scheduler/common/globals"
colmq "gitlink.org.cn/cloudream/scheduler/common/pkgs/mq/collector"
)
func (svc *Service) PackageGetCachedNodes(msg *colmq.PackageGetCachedNodes) (*colmq.PackageGetCachedNodesResp, *mq.CodeMessage) {

4
collector/internal/services/unifyops.go
View File

@ -7,8 +7,8 @@ import (
"gitlink.org.cn/cloudream/common/pkgs/logger"
"gitlink.org.cn/cloudream/common/pkgs/mq"
"gitlink.org.cn/cloudream/common/utils/serder"
"gitlink.org.cn/cloudream/scheduler-common/globals"
colmq "gitlink.org.cn/cloudream/scheduler-common/pkgs/mq/collector"
"gitlink.org.cn/cloudream/scheduler/common/globals"
colmq "gitlink.org.cn/cloudream/scheduler/common/pkgs/mq/collector"
)
func (svc *Service) GetSlwNodeInfo(msg *colmq.GetSlwNodeInfo) (*colmq.GetSlwNodeInfoResp, *mq.CodeMessage) {

8
collector/main.go
View File

@ -5,10 +5,10 @@ import (
"os"
"gitlink.org.cn/cloudream/common/pkgs/logger"
"gitlink.org.cn/cloudream/scheduler-collector/internal/config"
"gitlink.org.cn/cloudream/scheduler-collector/internal/services"
"gitlink.org.cn/cloudream/scheduler-common/globals"
colmq "gitlink.org.cn/cloudream/scheduler-common/pkgs/mq/collector"
"gitlink.org.cn/cloudream/scheduler/collector/internal/config"
"gitlink.org.cn/cloudream/scheduler/collector/internal/services"
"gitlink.org.cn/cloudream/scheduler/common/globals"
colmq "gitlink.org.cn/cloudream/scheduler/common/pkgs/mq/collector"
)
func main() {

3
common/go.mod
View File

@ -1,3 +0,0 @@
module gitlink.org.cn/cloudream/scheduler-common
go 1.20

2
common/pkgs/mq/collector/client.go
View File

@ -2,7 +2,7 @@ package collector
import (
"gitlink.org.cn/cloudream/common/pkgs/mq"
mymq "gitlink.org.cn/cloudream/scheduler-common/pkgs/mq"
mymq "gitlink.org.cn/cloudream/scheduler/common/pkgs/mq"
)
type Client struct {

2
common/pkgs/mq/collector/server.go
View File

@ -2,7 +2,7 @@ package collector
import (
"gitlink.org.cn/cloudream/common/pkgs/mq"
mymq "gitlink.org.cn/cloudream/scheduler-common/pkgs/mq"
mymq "gitlink.org.cn/cloudream/scheduler/common/pkgs/mq"
)
const (

2
common/pkgs/mq/dcontroller/client.go
View File

@ -2,7 +2,7 @@ package dcontroller
import (
"gitlink.org.cn/cloudream/common/pkgs/mq"
mymq "gitlink.org.cn/cloudream/scheduler-common/pkgs/mq"
mymq "gitlink.org.cn/cloudream/scheduler/common/pkgs/mq"
)
type Client struct {

2
common/pkgs/mq/dcontroller/server.go
View File

@ -2,7 +2,7 @@ package dcontroller
import (
"gitlink.org.cn/cloudream/common/pkgs/mq"
mymq "gitlink.org.cn/cloudream/scheduler-common/pkgs/mq"
mymq "gitlink.org.cn/cloudream/scheduler/common/pkgs/mq"
)
const (

3
executor/go.mod
View File

@ -1,3 +0,0 @@
module gitlink.org.cn/cloudream/scheduler-dcontroller
go 1.20

2
executor/internal/config/config.go
View File

@ -4,7 +4,7 @@ import (
cldstg "gitlink.org.cn/cloudream/common/api/storage"
log "gitlink.org.cn/cloudream/common/pkgs/logger"
c "gitlink.org.cn/cloudream/common/utils/config"
mymq "gitlink.org.cn/cloudream/scheduler-common/pkgs/mq"
mymq "gitlink.org.cn/cloudream/scheduler/common/pkgs/mq"
)
type Config struct {

4
executor/internal/services/apis.go
View File

@ -4,8 +4,8 @@ import (
"time"
"gitlink.org.cn/cloudream/common/pkgs/mq"
dctrlmq "gitlink.org.cn/cloudream/scheduler-common/pkgs/mq/dcontroller"
schtsk "gitlink.org.cn/cloudream/scheduler-dcontroller/internal/task"
dctrlmq "gitlink.org.cn/cloudream/scheduler/common/pkgs/mq/dcontroller"
schtsk "gitlink.org.cn/cloudream/scheduler/executor/internal/task"
)
func (svc *Service) StartStorageLoadPackage(msg *dctrlmq.StartStorageLoadPackage) (*dctrlmq.StartStorageLoadPackageResp, *mq.CodeMessage) {

2
executor/internal/services/service.go
View File

@ -1,7 +1,7 @@
package services
import (
"gitlink.org.cn/cloudream/scheduler-dcontroller/internal/task"
"gitlink.org.cn/cloudream/scheduler/executor/internal/task"
)
type Service struct {

2
executor/internal/task/cache_move_package.go
View File

@ -6,7 +6,7 @@ import (
"gitlink.org.cn/cloudream/common/api/storage"
"gitlink.org.cn/cloudream/common/pkgs/logger"
"gitlink.org.cn/cloudream/scheduler-common/globals"
"gitlink.org.cn/cloudream/scheduler/common/globals"
)
type CacheMovePackage struct {

2
executor/internal/task/storage_create_package.go
View File

@ -7,7 +7,7 @@ import (
"gitlink.org.cn/cloudream/common/api/storage"
"gitlink.org.cn/cloudream/common/models"
"gitlink.org.cn/cloudream/common/pkgs/logger"
"gitlink.org.cn/cloudream/scheduler-common/globals"
"gitlink.org.cn/cloudream/scheduler/common/globals"
)
type StorageCreatePackage struct {

2
executor/internal/task/storage_load_package.go
View File

@ -6,7 +6,7 @@ import (
"gitlink.org.cn/cloudream/common/api/storage"
"gitlink.org.cn/cloudream/common/pkgs/logger"
"gitlink.org.cn/cloudream/scheduler-common/globals"
"gitlink.org.cn/cloudream/scheduler/common/globals"
)
type StorageLoadPackage struct {

20
executor/magefiles/magefile.go
View File

@ -1,20 +0,0 @@
//go:build mage
package main
import (
"gitlink.org.cn/cloudream/common/magefiles"
//mage:import
_ "gitlink.org.cn/cloudream/common/magefiles/targets"
)
var Default = Build
func Build() error {
return magefiles.Build(magefiles.BuildArgs{
OutputName: "dcontroller",
OutputDir: "dcontroller",
AssetsDir: "assets",
})
}

10
executor/main.go
View File

@ -5,11 +5,11 @@ import (
"os"
"gitlink.org.cn/cloudream/common/pkgs/logger"
"gitlink.org.cn/cloudream/scheduler-common/globals"
dctrlmq "gitlink.org.cn/cloudream/scheduler-common/pkgs/mq/dcontroller"
"gitlink.org.cn/cloudream/scheduler-dcontroller/internal/config"
"gitlink.org.cn/cloudream/scheduler-dcontroller/internal/services"
"gitlink.org.cn/cloudream/scheduler-dcontroller/internal/task"
"gitlink.org.cn/cloudream/scheduler/common/globals"
dctrlmq "gitlink.org.cn/cloudream/scheduler/common/pkgs/mq/dcontroller"
"gitlink.org.cn/cloudream/scheduler/executor/internal/config"
"gitlink.org.cn/cloudream/scheduler/executor/internal/services"
"gitlink.org.cn/cloudream/scheduler/executor/internal/task"
)
func main() {

25
go.mod Normal file
View File

@ -0,0 +1,25 @@
module gitlink.org.cn/cloudream/scheduler
go 1.20
replace gitlink.org.cn/cloudream/common v0.0.0 => ../common
require gitlink.org.cn/cloudream/common v0.0.0
require (
github.com/antonfisher/nested-logrus-formatter v1.3.1 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/imdario/mergo v0.3.15 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/samber/lo v1.36.0 // indirect
github.com/sirupsen/logrus v1.9.2 // indirect
github.com/streadway/amqp v1.1.0 // indirect
github.com/zyedidia/generic v1.2.1 // indirect
golang.org/x/exp v0.0.0-20230519143937-03e91628a987 // indirect
golang.org/x/sys v0.6.0 // indirect
)

51
go.sum Normal file
View File

@ -0,0 +1,51 @@
github.com/antonfisher/nested-logrus-formatter v1.3.1 h1:NFJIr+pzwv5QLHTPyKz9UMEoHck02Q9L0FP13b/xSbQ=
github.com/antonfisher/nested-logrus-formatter v1.3.1/go.mod h1:6WTfyWFkBc9+zyBaKIqRrg/KwMqBbodBjgbHjDz7zjA=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
github.com/imdario/mergo v0.3.15 h1:M8XP7IuFNsqUx6VPK2P9OSmsYsI/YFaGil0uD21V3dM=
github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/samber/lo v1.36.0 h1:4LaOxH1mHnbDGhTVE0i1z8v/lWaQW8AIfOD3HU4mSaw=
github.com/samber/lo v1.36.0/go.mod h1:HLeWcJRRyLKp3+/XBJvOrerCQn9mhdKMHyd7IRlgeQ8=
github.com/sirupsen/logrus v1.9.2 h1:oxx1eChJGI6Uks2ZC4W1zpLlVgqB8ner4EuQwV4Ik1Y=
github.com/sirupsen/logrus v1.9.2/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/smartystreets/assertions v1.13.1 h1:Ef7KhSmjZcK6AVf9YbJdvPYG9avaF0ZxudX+ThRdWfU=
github.com/smartystreets/goconvey v1.8.0 h1:Oi49ha/2MURE0WexF052Z0m+BNSGirfjg5RL+JXWq3w=
github.com/streadway/amqp v1.1.0 h1:py12iX8XSyI7aN/3dUT8DFIDJazNJsVJdxNVEpnQTZM=
github.com/streadway/amqp v1.1.0/go.mod h1:WYSrTEYHOXHd0nwFeUXAe2G2hRnQT+deZJJf88uS9Bg=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
github.com/thoas/go-funk v0.9.1 h1:O549iLZqPpTUQ10ykd26sZhzD+rmR5pWhuElrhbC20M=
github.com/zyedidia/generic v1.2.1 h1:Zv5KS/N2m0XZZiuLS82qheRG4X1o5gsWreGb0hR7XDc=
github.com/zyedidia/generic v1.2.1/go.mod h1:ly2RBz4mnz1yeuVbQA/VFwGjK3mnHGRj1JuoG336Bis=
golang.org/x/exp v0.0.0-20230519143937-03e91628a987 h1:3xJIFvzUFbu4ls0BTBYcgbCGhA63eAOEMxIHugyXJqA=
golang.org/x/exp v0.0.0-20230519143937-03e91628a987/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

15
magefiles/go.mod Normal file
View File

@ -0,0 +1,15 @@
module magefiles
go 1.20
replace gitlink.org.cn/cloudream/common v0.0.0 => ../../common
require (
github.com/otiai10/copy v1.12.0
gitlink.org.cn/cloudream/common v0.0.0
)
require (
github.com/magefile/mage v1.15.0 // indirect
golang.org/x/sys v0.6.0 // indirect
)

7
magefiles/go.sum Normal file
View File

@ -0,0 +1,7 @@
github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg=
github.com/magefile/mage v1.15.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
github.com/otiai10/copy v1.12.0 h1:cLMgSQnXBs1eehF0Wy/FAGsgDTDmAqFR7rQylBb1nDY=
github.com/otiai10/copy v1.12.0/go.mod h1:rSaLseMUsZFFbsFGc7wCJnnkTAvdc5L6VWxPE4308Ww=
github.com/otiai10/mint v1.5.1 h1:XaPLeE+9vGbuyEHem1JNk3bYc7KKqyI/na0/mLd/Kks=
golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

131
magefiles/main.go Normal file
View File

@ -0,0 +1,131 @@
//go:build mage
package main
import (
"errors"
"fmt"
"os"
"path/filepath"
"gitlink.org.cn/cloudream/common/magefiles"
cp "github.com/otiai10/copy"
)
const (
BuildDir = "./build"
)
var Global = struct {
OS string
Arch string
}{}
// [配置项]设置编译平台为windows
func Win() {
Global.OS = "win"
}
// [配置项]设置编译平台为linux
func Linux() {
Global.OS = "linux"
}
// [配置项]设置编译架构为amd64
func AMD64() {
Global.Arch = "amd64"
}
func All() error {
if err := Bin(); err != nil {
return err
}
if err := Scripts(); err != nil {
return err
}
if err := Confs(); err != nil {
return err
}
return nil
}
func Bin() error {
//if err := Client(); err != nil {
// return err
//}
if err := Collector(); err != nil {
return err
}
if err := Executor(); err != nil {
return err
}
return nil
}
func Scripts() error {
scriptsDir := "./common/assets/scripts"
info, err := os.Stat(scriptsDir)
if errors.Is(err, os.ErrNotExist) || !info.IsDir() {
return fmt.Errorf("script directory not exists or is not a directory")
}
fullDirPath, err := filepath.Abs(filepath.Join(BuildDir, "scripts"))
if err != nil {
return err
}
fmt.Printf("copying scripts to %s\n", fullDirPath)
return cp.Copy(scriptsDir, fullDirPath)
}
func Confs() error {
confDir := "./common/assets/confs"
info, err := os.Stat(confDir)
if errors.Is(err, os.ErrNotExist) || !info.IsDir() {
return fmt.Errorf("conf directory not exists or is not a directory")
}
fullDirPath, err := filepath.Abs(filepath.Join(BuildDir, "confs"))
if err != nil {
return err
}
fmt.Printf("copying confs to %s\n", fullDirPath)
return cp.Copy(confDir, fullDirPath)
}
func Client() error {
return magefiles.Build(magefiles.BuildArgs{
OutputName: "client",
OutputDir: "client",
AssetsDir: "assets",
EntryFile: "client/main.go",
})
}
func Collector() error {
return magefiles.Build(magefiles.BuildArgs{
OutputName: "collector",
OutputDir: "collector",
AssetsDir: "assets",
EntryFile: "collector/main.go",
})
}
func Executor() error {
return magefiles.Build(magefiles.BuildArgs{
OutputName: "executor",
OutputDir: "executor",
AssetsDir: "assets",
EntryFile: "executor/main.go",
})
}