Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nodemanager
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Odysseus
nodemanager
Commits
5083c77d
Commit
5083c77d
authored
May 20, 2024
by
vicotor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update nm
parent
9b00464f
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
125 additions
and
117 deletions
+125
-117
dispatchTask.go
server/dispatchTask.go
+1
-1
node.go
server/node.go
+23
-15
service.go
server/service.go
+1
-1
taskresult.go
server/taskresult.go
+3
-3
worker.go
server/worker.go
+27
-7
workerManager.go
server/workerManager.go
+61
-71
worker_registry.go
server/worker_registry.go
+5
-12
workerstatu.go
server/workerstatu.go
+4
-7
No files found.
server/dispatchTask.go
View file @
5083c77d
...
@@ -3,7 +3,7 @@ package server
...
@@ -3,7 +3,7 @@ package server
import
(
import
(
"errors"
"errors"
odysseus
"github.com/odysseus/odysseus-protocol/gen/proto/go/base/v1"
odysseus
"github.com/odysseus/odysseus-protocol/gen/proto/go/base/v1"
omanager
"github.com/odysseus/odysseus-protocol/gen/proto/go/nodemanager/v
1
"
omanager
"github.com/odysseus/odysseus-protocol/gen/proto/go/nodemanager/v
2
"
log
"github.com/sirupsen/logrus"
log
"github.com/sirupsen/logrus"
"sync"
"sync"
"time"
"time"
...
...
server/node.go
View file @
5083c77d
...
@@ -11,7 +11,7 @@ import (
...
@@ -11,7 +11,7 @@ import (
"github.com/odysseus/nodemanager/nmregister"
"github.com/odysseus/nodemanager/nmregister"
"github.com/odysseus/nodemanager/utils"
"github.com/odysseus/nodemanager/utils"
basev1
"github.com/odysseus/odysseus-protocol/gen/proto/go/base/v1"
basev1
"github.com/odysseus/odysseus-protocol/gen/proto/go/base/v1"
omanager
"github.com/odysseus/odysseus-protocol/gen/proto/go/nodemanager/v
1
"
omanager
"github.com/odysseus/odysseus-protocol/gen/proto/go/nodemanager/v
2
"
"github.com/odysseus/service-registry/query"
"github.com/odysseus/service-registry/query"
"github.com/odysseus/service-registry/registry"
"github.com/odysseus/service-registry/registry"
"github.com/redis/go-redis/v9"
"github.com/redis/go-redis/v9"
...
@@ -139,18 +139,6 @@ func (n *Node) PostProof(proof *basev1.TaskProof) {
...
@@ -139,18 +139,6 @@ func (n *Node) PostProof(proof *basev1.TaskProof) {
n
.
taskProofCh
<-
proof
n
.
taskProofCh
<-
proof
}
}
func
(
n
*
Node
)
Start
()
error
{
go
n
.
registry
.
Start
()
go
n
.
register
.
Start
()
go
n
.
postLoop
()
n
.
SetStatus
(
"running"
)
if
err
:=
n
.
apiStart
();
err
!=
nil
{
return
err
}
return
nil
}
func
(
n
*
Node
)
postLoop
()
{
func
(
n
*
Node
)
postLoop
()
{
for
{
for
{
select
{
select
{
...
@@ -172,6 +160,22 @@ func (n *Node) postLoop() {
...
@@ -172,6 +160,22 @@ func (n *Node) postLoop() {
}
}
}
}
func
(
n
*
Node
)
SetStatus
(
status
string
)
{
n
.
register
.
SetStatus
(
status
)
}
func
(
n
*
Node
)
Start
()
error
{
go
n
.
registry
.
Start
()
go
n
.
register
.
Start
()
go
n
.
postLoop
()
n
.
SetStatus
(
"running"
)
if
err
:=
n
.
apiStart
();
err
!=
nil
{
return
err
}
return
nil
}
func
(
n
*
Node
)
Stop
()
{
func
(
n
*
Node
)
Stop
()
{
n
.
registry
.
Clear
()
n
.
registry
.
Clear
()
n
.
registry
.
Stop
()
n
.
registry
.
Stop
()
...
@@ -181,6 +185,10 @@ func (n *Node) Stop() {
...
@@ -181,6 +185,10 @@ func (n *Node) Stop() {
close
(
n
.
taskProofCh
)
close
(
n
.
taskProofCh
)
}
}
func
(
n
*
Node
)
SetStatus
(
status
string
)
{
func
(
n
*
Node
)
PayForFee
(
uid
int64
,
fee
int64
)
error
{
n
.
register
.
SetStatus
(
status
)
return
n
.
cache
.
PayforFee
(
uid
,
fee
)
}
func
(
n
*
Node
)
Cache
()
*
cachedata
.
CacheData
{
return
n
.
cache
}
}
server/service.go
View file @
5083c77d
...
@@ -4,7 +4,7 @@ import (
...
@@ -4,7 +4,7 @@ import (
"context"
"context"
"errors"
"errors"
"github.com/odysseus/nodemanager/utils"
"github.com/odysseus/nodemanager/utils"
omanager
"github.com/odysseus/odysseus-protocol/gen/proto/go/nodemanager/v
1
"
omanager
"github.com/odysseus/odysseus-protocol/gen/proto/go/nodemanager/v
2
"
log
"github.com/sirupsen/logrus"
log
"github.com/sirupsen/logrus"
"strconv"
"strconv"
"strings"
"strings"
...
...
server/taskresult.go
View file @
5083c77d
...
@@ -5,7 +5,7 @@ import (
...
@@ -5,7 +5,7 @@ import (
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/crypto"
"github.com/odysseus/nodemanager/utils"
"github.com/odysseus/nodemanager/utils"
odysseus
"github.com/odysseus/odysseus-protocol/gen/proto/go/base/v1"
odysseus
"github.com/odysseus/odysseus-protocol/gen/proto/go/base/v1"
omanager
"github.com/odysseus/odysseus-protocol/gen/proto/go/nodemanager/v
1
"
omanager
"github.com/odysseus/odysseus-protocol/gen/proto/go/nodemanager/v
2
"
log
"github.com/sirupsen/logrus"
log
"github.com/sirupsen/logrus"
"math/big"
"math/big"
"time"
"time"
...
@@ -89,7 +89,7 @@ func (wm *WorkerManager) computeTaskResult(worker *Worker, task *odysseus.TaskCo
...
@@ -89,7 +89,7 @@ func (wm *WorkerManager) computeTaskResult(worker *Worker, task *odysseus.TaskCo
// verify miner_signature
// verify miner_signature
// miner_signature = sign(hash((task_id+hash(task_param)+hash(task_result)))
// miner_signature = sign(hash((task_id+hash(task_param)+hash(task_result)))
verified
:=
utils
.
VerifySignature
(
utils
.
CombineBytes
([]
byte
(
result
.
TaskId
),
paramHash
[
:
],
resultHash
[
:
]),
verified
:=
utils
.
VerifySignature
(
utils
.
CombineBytes
([]
byte
(
result
.
TaskId
),
paramHash
[
:
],
resultHash
[
:
]),
result
.
MinerSignature
,
utils
.
FromHex
(
worker
.
info
.
nodeInfo
.
MinerPubkey
))
result
.
MinerSignature
,
utils
.
FromHex
(
worker
.
info
.
nodeInfo
.
Info
.
MinerPubkey
))
log
.
WithFields
(
log
.
Fields
{
log
.
WithFields
(
log
.
Fields
{
"task-id"
:
task
.
TaskId
,
"task-id"
:
task
.
TaskId
,
"minerSignatureVerify"
:
verified
,
"minerSignatureVerify"
:
verified
,
...
@@ -181,7 +181,7 @@ func (wm *WorkerManager) standardTaskResult(worker *Worker, task *odysseus.TaskC
...
@@ -181,7 +181,7 @@ func (wm *WorkerManager) standardTaskResult(worker *Worker, task *odysseus.TaskC
// verify miner_signature
// verify miner_signature
// miner_signature = sign(hash((task_id+hash(task_param)+hash(task_result)))
// miner_signature = sign(hash((task_id+hash(task_param)+hash(task_result)))
verified
:=
utils
.
VerifySignature
(
utils
.
CombineBytes
([]
byte
(
result
.
TaskId
),
paramHash
[
:
],
resultHash
[
:
]),
verified
:=
utils
.
VerifySignature
(
utils
.
CombineBytes
([]
byte
(
result
.
TaskId
),
paramHash
[
:
],
resultHash
[
:
]),
result
.
MinerSignature
,
utils
.
FromHex
(
worker
.
info
.
nodeInfo
.
MinerPubkey
))
result
.
MinerSignature
,
utils
.
FromHex
(
worker
.
info
.
nodeInfo
.
Info
.
MinerPubkey
))
log
.
WithFields
(
log
.
Fields
{
log
.
WithFields
(
log
.
Fields
{
"task-id"
:
task
.
TaskId
,
"task-id"
:
task
.
TaskId
,
"minerSignatureVerify"
:
verified
,
"minerSignatureVerify"
:
verified
,
...
...
server/worker.go
View file @
5083c77d
...
@@ -4,17 +4,17 @@ import (
...
@@ -4,17 +4,17 @@ import (
"errors"
"errors"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common"
lru
"github.com/hashicorp/golang-lru"
lru
"github.com/hashicorp/golang-lru"
omanager
"github.com/odysseus/odysseus-protocol/gen/proto/go/nodemanager/v
1
"
omanager
"github.com/odysseus/odysseus-protocol/gen/proto/go/nodemanager/v
2
"
log
"github.com/sirupsen/logrus"
log
"github.com/sirupsen/logrus"
"time"
"time"
)
)
type
workerInfo
struct
{
type
workerInfo
struct
{
nodeInfo
*
omanager
.
NodeInfoResponse
nodeInfo
*
omanager
.
NodeInfoResponse
deviceUsageInfo
[]
*
omanager
.
DeviceUsage
}
deviceInfo
*
omanager
.
DeviceInfoMessage
deviceStatusInfo
*
omanager
.
StatusResponse
type
workerUsageInfo
struct
{
resourceInfo
*
omanager
.
SubmitResourceMap
hwUsage
*
omanager
.
HardwareUsage
}
}
type
sendMsgCallback
struct
{
type
sendMsgCallback
struct
{
...
@@ -37,6 +37,7 @@ type Worker struct {
...
@@ -37,6 +37,7 @@ type Worker struct {
addFirstSucceed
bool
addFirstSucceed
bool
info
workerInfo
info
workerInfo
usage
workerUsageInfo
workerAddr
string
// worker address from public-key
workerAddr
string
// worker address from public-key
deviceInfoHash
[]
byte
deviceInfoHash
[]
byte
recentTask
*
lru
.
ARCCache
recentTask
*
lru
.
ARCCache
...
@@ -48,7 +49,7 @@ type Worker struct {
...
@@ -48,7 +49,7 @@ type Worker struct {
func
(
w
*
Worker
)
ProfitAccount
()
common
.
Address
{
func
(
w
*
Worker
)
ProfitAccount
()
common
.
Address
{
if
w
.
info
.
nodeInfo
!=
nil
{
if
w
.
info
.
nodeInfo
!=
nil
{
return
common
.
HexToAddress
(
w
.
info
.
nodeInfo
.
BenefitAddress
)
return
common
.
HexToAddress
(
w
.
info
.
nodeInfo
.
Info
.
BenefitAddress
)
}
}
return
common
.
Address
{}
return
common
.
Address
{}
}
}
...
@@ -121,3 +122,22 @@ func (w *Worker) RecvMessage() {
...
@@ -121,3 +122,22 @@ func (w *Worker) RecvMessage() {
w
.
msgCh
<-
wmsg
w
.
msgCh
<-
wmsg
}
}
}
}
func
(
w
*
Worker
)
ModelOperate
(
info
interface
{},
operate
omanager
.
ModelOperateType
)
*
omanager
.
ManagerMessage_ModelOperateRequest
{
request
:=
&
omanager
.
ManagerMessage_ModelOperateRequest
{
ModelOperateRequest
:
&
omanager
.
ModelOperateRequest
{
ModelOperates
:
[]
*
omanager
.
ModelOperate
{
{
ModelId
:
""
,
ImageName
:
""
,
Username
:
""
,
Password
:
""
,
Cmd
:
""
,
Operate
:
operate
,
},
},
},
}
return
request
}
server/workerManager.go
View file @
5083c77d
...
@@ -9,11 +9,12 @@ import (
...
@@ -9,11 +9,12 @@ import (
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/proto"
"github.com/google/uuid"
"github.com/google/uuid"
lru
"github.com/hashicorp/golang-lru"
lru
"github.com/hashicorp/golang-lru"
"github.com/odysseus/cache/cachedata"
"github.com/odysseus/nodemanager/config"
"github.com/odysseus/nodemanager/config"
"github.com/odysseus/nodemanager/standardlib"
"github.com/odysseus/nodemanager/standardlib"
"github.com/odysseus/nodemanager/utils"
"github.com/odysseus/nodemanager/utils"
odysseus
"github.com/odysseus/odysseus-protocol/gen/proto/go/base/v1"
odysseus
"github.com/odysseus/odysseus-protocol/gen/proto/go/base/v1"
omanager
"github.com/odysseus/odysseus-protocol/gen/proto/go/nodemanager/v
1
"
omanager
"github.com/odysseus/odysseus-protocol/gen/proto/go/nodemanager/v
2
"
"github.com/odysseus/service-registry/registry"
"github.com/odysseus/service-registry/registry"
"github.com/redis/go-redis/v9"
"github.com/redis/go-redis/v9"
log
"github.com/sirupsen/logrus"
log
"github.com/sirupsen/logrus"
...
@@ -46,6 +47,14 @@ const (
...
@@ -46,6 +47,14 @@ const (
TASK_TIMEOUT
TASK_TIMEOUT
)
)
type
NodeInterface
interface
{
PostResult
(
*
odysseus
.
TaskReceipt
)
PostProof
(
*
odysseus
.
TaskProof
)
Sign
(
hash
[]
byte
)
([]
byte
,
error
)
Cache
()
*
cachedata
.
CacheData
PayForFee
(
uid
int64
,
fee
int64
)
error
}
type
WorkerManager
struct
{
type
WorkerManager
struct
{
rdb
*
redis
.
Client
rdb
*
redis
.
Client
heartBeat
map
[
int64
]
int64
heartBeat
map
[
int64
]
int64
...
@@ -58,11 +67,11 @@ type WorkerManager struct {
...
@@ -58,11 +67,11 @@ type WorkerManager struct {
wkRwLock
sync
.
RWMutex
wkRwLock
sync
.
RWMutex
quit
chan
struct
{}
quit
chan
struct
{}
node
*
Nod
e
node
NodeInterfac
e
std
*
standardlib
.
StandardTasks
std
*
standardlib
.
StandardTasks
}
}
func
NewWorkerManager
(
rdb
*
redis
.
Client
,
node
*
Nod
e
)
*
WorkerManager
{
func
NewWorkerManager
(
rdb
*
redis
.
Client
,
node
NodeInterfac
e
)
*
WorkerManager
{
return
&
WorkerManager
{
return
&
WorkerManager
{
heartBeat
:
make
(
map
[
int64
]
int64
),
heartBeat
:
make
(
map
[
int64
]
int64
),
workerReg
:
make
(
map
[
int64
]
*
registry
.
Registry
),
workerReg
:
make
(
map
[
int64
]
*
registry
.
Registry
),
...
@@ -228,12 +237,12 @@ func (wm *WorkerManager) manageWorker(worker *Worker) error {
...
@@ -228,12 +237,12 @@ func (wm *WorkerManager) manageWorker(worker *Worker) error {
workerCheckTicker
:=
time
.
NewTicker
(
workerCheckDuration
)
workerCheckTicker
:=
time
.
NewTicker
(
workerCheckDuration
)
defer
workerCheckTicker
.
Stop
()
defer
workerCheckTicker
.
Stop
()
statusTicker
:=
time
.
NewTicker
(
initialInterval
)
defer
statusTicker
.
Stop
()
deviceUsageTicker
:=
time
.
NewTicker
(
initialInterval
)
deviceUsageTicker
:=
time
.
NewTicker
(
initialInterval
)
defer
deviceUsageTicker
.
Stop
()
defer
deviceUsageTicker
.
Stop
()
gpuUsageTicker
:=
time
.
NewTicker
(
initialInterval
)
defer
gpuUsageTicker
.
Stop
()
worker
.
status
=
"connected"
worker
.
status
=
"connected"
defer
func
()
{
defer
func
()
{
...
@@ -270,11 +279,7 @@ func (wm *WorkerManager) manageWorker(worker *Worker) error {
...
@@ -270,11 +279,7 @@ func (wm *WorkerManager) manageWorker(worker *Worker) error {
nodeinfoTicker
.
Reset
(
time
.
Hour
*
24
)
nodeinfoTicker
.
Reset
(
time
.
Hour
*
24
)
}
}
if
worker
.
info
.
deviceStatusInfo
!=
nil
{
if
worker
.
usage
.
hwUsage
!=
nil
{
statusTicker
.
Reset
(
time
.
Second
*
time
.
Duration
(
tickerConf
.
StatusTicker
))
}
if
worker
.
info
.
deviceUsageInfo
!=
nil
{
deviceUsageTicker
.
Reset
(
time
.
Second
*
time
.
Duration
(
tickerConf
.
DeviceUsageTicker
))
deviceUsageTicker
.
Reset
(
time
.
Second
*
time
.
Duration
(
tickerConf
.
DeviceUsageTicker
))
}
}
...
@@ -309,22 +314,20 @@ func (wm *WorkerManager) manageWorker(worker *Worker) error {
...
@@ -309,22 +314,20 @@ func (wm *WorkerManager) manageWorker(worker *Worker) error {
if
!
worker
.
registed
{
if
!
worker
.
registed
{
continue
continue
}
}
deviceUsage
:=
new
(
omanager
.
ManagerMessage_DeviceUsage
)
deviceUsage
:=
new
(
omanager
.
ManagerMessage_DeviceUsage
Request
)
deviceUsage
.
DeviceUsage
=
&
omanager
.
DeviceUsageRequest
{}
deviceUsage
.
DeviceUsage
Request
=
&
omanager
.
DeviceUsageRequest
{}
msg
.
Message
=
deviceUsage
msg
.
Message
=
deviceUsage
callback
=
func
(
err
error
)
bool
{
callback
=
func
(
err
error
)
bool
{
return
true
return
true
}
}
case
<-
statusTicker
.
C
:
case
<-
gpuUsageTicker
.
C
:
// if worker is not registed to me, ignore device status info.
gpu
:=
new
(
omanager
.
ManagerMessage_GpuUsageRequest
)
if
!
worker
.
registed
{
gpu
.
GpuUsageRequest
=
&
omanager
.
GPUUsageRequest
{}
continue
}
msg
.
Message
=
gpu
status
:=
new
(
omanager
.
ManagerMessage_StatusRequest
)
status
.
StatusRequest
=
&
omanager
.
StatusRequest
{}
msg
.
Message
=
status
callback
=
func
(
err
error
)
bool
{
callback
=
func
(
err
error
)
bool
{
log
.
WithField
(
"worker"
,
worker
.
uuid
)
.
Debug
(
"send heart beat to worker"
)
return
true
return
true
}
}
...
@@ -333,8 +336,8 @@ func (wm *WorkerManager) manageWorker(worker *Worker) error {
...
@@ -333,8 +336,8 @@ func (wm *WorkerManager) manageWorker(worker *Worker) error {
return
nil
return
nil
}
}
task
:=
dtask
.
task
task
:=
dtask
.
task
taskMsg
:=
new
(
omanager
.
ManagerMessage_PushTask
Message
)
taskMsg
:=
new
(
omanager
.
ManagerMessage_PushTask
)
taskMsg
.
PushTask
Message
=
&
omanager
.
PushTaskMessage
{
taskMsg
.
PushTask
=
&
omanager
.
PushTaskMessage
{
TaskId
:
task
.
TaskId
,
TaskId
:
task
.
TaskId
,
TaskType
:
task
.
TaskType
,
TaskType
:
task
.
TaskType
,
TaskKind
:
task
.
TaskKind
,
TaskKind
:
task
.
TaskKind
,
...
@@ -465,18 +468,23 @@ func (wm *WorkerManager) handleWorkerMsg(worker *Worker) {
...
@@ -465,18 +468,23 @@ func (wm *WorkerManager) handleWorkerMsg(worker *Worker) {
"heartBeat"
:
time
.
Now
()
.
Unix
()
-
int64
(
msg
.
HeartbeatResponse
.
Timestamp
),
"heartBeat"
:
time
.
Now
()
.
Unix
()
-
int64
(
msg
.
HeartbeatResponse
.
Timestamp
),
})
.
Debug
(
"receive worker heartbeat"
)
})
.
Debug
(
"receive worker heartbeat"
)
case
*
omanager
.
WorkerMessage_NodeInfo
:
case
*
omanager
.
WorkerMessage_NodeInfo
:
matched
,
err
:=
regexp
.
MatchString
(
"((2(5[0-5]|[0-4]
\\
d))|[0-1]?
\\
d{1,2})(
\\
.((2(5[0-5]|[0-4]
\\
d))|[0-1]?
\\
d{1,2})){3}"
,
msg
.
NodeInfo
.
DeviceIp
)
nodeinfo
:=
msg
.
NodeInfo
if
nodeinfo
.
Hardware
!=
nil
&&
nodeinfo
.
Hardware
.
NET
!=
nil
{
matched
,
err
:=
regexp
.
MatchString
(
"((2(5[0-5]|[0-4]
\\
d))|[0-1]?
\\
d{1,2})(
\\
.((2(5[0-5]|[0-4]
\\
d))|[0-1]?
\\
d{1,2})){3}"
,
nodeinfo
.
Hardware
.
NET
.
Ip
)
if
err
!=
nil
{
if
err
!=
nil
{
l
.
WithField
(
"nodeinfo.ip"
,
msg
.
NodeInfo
.
Device
Ip
)
.
Error
(
"ip匹配出现错误"
)
l
.
WithField
(
"nodeinfo.ip"
,
nodeinfo
.
Hardware
.
NET
.
Ip
)
.
Error
(
"ip匹配出现错误"
)
//return
//return
}
}
if
!
matched
{
if
!
matched
{
msg
.
NodeInfo
.
DeviceIp
=
""
// clean ip content if not match.
nodeinfo
.
Hardware
.
NET
.
Ip
=
""
}
}
}
worker
.
info
.
nodeInfo
=
msg
.
NodeInfo
worker
.
info
.
nodeInfo
=
msg
.
NodeInfo
var
addr
=
""
var
addr
=
""
if
pubkey
,
err
:=
utils
.
HexToPubkey
(
msg
.
Node
Info
.
MinerPubkey
);
err
!=
nil
{
if
pubkey
,
err
:=
utils
.
HexToPubkey
(
nodeinfo
.
Info
.
MinerPubkey
);
err
!=
nil
{
l
.
WithFields
(
log
.
Fields
{
l
.
WithFields
(
log
.
Fields
{
"worker-addr"
:
worker
.
workerAddr
,
"worker-addr"
:
worker
.
workerAddr
,
"error"
:
err
,
"error"
:
err
,
...
@@ -505,29 +513,6 @@ func (wm *WorkerManager) handleWorkerMsg(worker *Worker) {
...
@@ -505,29 +513,6 @@ func (wm *WorkerManager) handleWorkerMsg(worker *Worker) {
// update new worker.
// update new worker.
wm
.
SetWorkerAddr
(
worker
,
addr
)
wm
.
SetWorkerAddr
(
worker
,
addr
)
case
*
omanager
.
WorkerMessage_Status
:
if
!
worker
.
registed
{
continue
}
worker
.
info
.
deviceStatusInfo
=
msg
.
Status
l
.
WithFields
(
log
.
Fields
{
"worker-addr"
:
worker
.
workerAddr
,
})
.
Debugf
(
"receive worker status:0x%x"
,
msg
.
Status
.
DeviceStatus
)
wm
.
UpdateWorkerDeviceStatusInfo
(
worker
,
msg
.
Status
.
DeviceStatus
)
case
*
omanager
.
WorkerMessage_ResourceMap
:
l
.
WithFields
(
log
.
Fields
{
"registed"
:
worker
.
registed
,
"worker-addr"
:
worker
.
workerAddr
,
})
.
Infof
(
"receive worker resource map:%v"
,
msg
.
ResourceMap
)
if
!
worker
.
registed
{
continue
}
worker
.
info
.
resourceInfo
=
msg
.
ResourceMap
wm
.
UpdateWorkerResourceInfo
(
worker
,
msg
.
ResourceMap
.
ResourceMap
)
wm
.
UpdateWorkerBootedResourceInfo
(
worker
,
msg
.
ResourceMap
.
BootupMap
)
case
*
omanager
.
WorkerMessage_FetchStandardTask
:
case
*
omanager
.
WorkerMessage_FetchStandardTask
:
if
worker
.
info
.
nodeInfo
==
nil
{
if
worker
.
info
.
nodeInfo
==
nil
{
continue
continue
...
@@ -586,7 +571,7 @@ func (wm *WorkerManager) handleWorkerMsg(worker *Worker) {
...
@@ -586,7 +571,7 @@ func (wm *WorkerManager) handleWorkerMsg(worker *Worker) {
}
}
infoHash
=
sha3
.
Sum256
(
infoData
)
infoHash
=
sha3
.
Sum256
(
infoData
)
worker
.
info
.
deviceInfo
=
msg
.
DeviceInfo
worker
.
info
.
nodeInfo
.
Hardware
=
msg
.
DeviceInfo
.
Hardware
if
worker
.
registed
&&
worker
.
addFirstSucceed
==
false
{
if
worker
.
registed
&&
worker
.
addFirstSucceed
==
false
{
wm
.
AddWorkerToQueue
(
worker
)
wm
.
AddWorkerToQueue
(
worker
)
...
@@ -605,10 +590,11 @@ func (wm *WorkerManager) handleWorkerMsg(worker *Worker) {
...
@@ -605,10 +590,11 @@ func (wm *WorkerManager) handleWorkerMsg(worker *Worker) {
usageData
,
_
:=
json
.
Marshal
(
msg
.
DeviceUsage
)
usageData
,
_
:=
json
.
Marshal
(
msg
.
DeviceUsage
)
wm
.
UpdateWorkerUsageInfo
(
worker
,
string
(
usageData
))
wm
.
UpdateWorkerUsageInfo
(
worker
,
string
(
usageData
))
worker
.
info
.
deviceUsageInfo
=
msg
.
DeviceUsage
.
Usage
worker
.
usage
.
hwUsage
=
msg
.
DeviceUsage
.
Usage
l
.
WithFields
(
log
.
Fields
{
l
.
WithFields
(
log
.
Fields
{
"worker-addr"
:
worker
.
workerAddr
,
"worker-addr"
:
worker
.
workerAddr
,
})
.
Debugf
(
"receive worker device usage:%v"
,
msg
.
DeviceUsage
.
Usage
)
})
.
Debugf
(
"receive worker device usage:%v"
,
msg
.
DeviceUsage
.
Usage
)
case
*
omanager
.
WorkerMessage_RegisteMessage
:
case
*
omanager
.
WorkerMessage_RegisteMessage
:
if
worker
.
registed
{
if
worker
.
registed
{
continue
continue
...
@@ -617,14 +603,17 @@ func (wm *WorkerManager) handleWorkerMsg(worker *Worker) {
...
@@ -617,14 +603,17 @@ func (wm *WorkerManager) handleWorkerMsg(worker *Worker) {
"worker-addr"
:
worker
.
workerAddr
,
"worker-addr"
:
worker
.
workerAddr
,
})
.
Debug
(
"receive registed message"
)
})
.
Debug
(
"receive registed message"
)
// todo: verify signature
// todo: verify signature
info
:=
msg
.
RegisteMessage
.
Info
{
{
hardware
:=
msg
.
RegisteMessage
.
Hardware
sig
:=
msg
.
RegisteMessage
.
DeviceSignature
sig
:=
msg
.
RegisteMessage
.
DeviceSignature
data
:=
utils
.
CombineBytes
(
bytes
.
NewBufferString
(
msg
.
RegisteMessage
.
DeviceIp
)
.
Bytes
(
),
data
:=
utils
.
CombineBytes
(
[]
byte
(
info
.
String
()
),
bytes
.
NewBufferString
(
msg
.
RegisteMessage
.
MinerPubkey
)
.
Bytes
(
),
[]
byte
(
hardware
.
String
()
),
bytes
.
NewBufferString
(
msg
.
RegisteMessage
.
BenefitAddress
)
.
Bytes
(
),
[]
byte
(
msg
.
RegisteMessage
.
Models
.
String
()
),
big
.
NewInt
(
int64
(
msg
.
RegisteMessage
.
Timestamp
))
.
Bytes
())
big
.
NewInt
(
int64
(
msg
.
RegisteMessage
.
Timestamp
))
.
Bytes
())
if
!
utils
.
VerifySignature
(
data
,
sig
,
utils
.
FromHex
(
msg
.
RegisteMessage
.
MinerPubkey
))
{
if
!
utils
.
VerifySignature
(
data
,
sig
,
utils
.
FromHex
(
info
.
MinerPubkey
))
{
l
.
WithFields
(
log
.
Fields
{
l
.
WithFields
(
log
.
Fields
{
"worker-addr"
:
worker
.
workerAddr
,
"worker-addr"
:
worker
.
workerAddr
,
})
.
Error
(
"verify device signature failed"
)
})
.
Error
(
"verify device signature failed"
)
...
@@ -640,7 +629,7 @@ func (wm *WorkerManager) handleWorkerMsg(worker *Worker) {
...
@@ -640,7 +629,7 @@ func (wm *WorkerManager) handleWorkerMsg(worker *Worker) {
}
}
}
}
if
pubkey
,
err
:=
utils
.
HexToPubkey
(
msg
.
RegisteMessage
.
MinerPubkey
);
err
!=
nil
{
if
pubkey
,
err
:=
utils
.
HexToPubkey
(
info
.
MinerPubkey
);
err
!=
nil
{
l
.
WithFields
(
log
.
Fields
{
l
.
WithFields
(
log
.
Fields
{
"worker-addr"
:
worker
.
workerAddr
,
"worker-addr"
:
worker
.
workerAddr
,
"error"
:
err
,
"error"
:
err
,
...
@@ -657,25 +646,26 @@ func (wm *WorkerManager) handleWorkerMsg(worker *Worker) {
...
@@ -657,25 +646,26 @@ func (wm *WorkerManager) handleWorkerMsg(worker *Worker) {
worker
.
workerAddr
=
addr
worker
.
workerAddr
=
addr
}
}
worker
.
registed
=
true
worker
.
registed
=
true
matched
,
err
:=
regexp
.
MatchString
(
"((2(5[0-5]|[0-4]
\\
d))|[0-1]?
\\
d{1,2})(
\\
.((2(5[0-5]|[0-4]
\\
d))|[0-1]?
\\
d{1,2})){3}"
,
msg
.
RegisteMessage
.
DeviceIp
)
matched
,
err
:=
regexp
.
MatchString
(
"((2(5[0-5]|[0-4]
\\
d))|[0-1]?
\\
d{1,2})(
\\
.((2(5[0-5]|[0-4]
\\
d))|[0-1]?
\\
d{1,2})){3}"
,
msg
.
RegisteMessage
.
Hardware
.
NET
.
Ip
)
if
err
!=
nil
{
if
err
!=
nil
{
log
.
WithField
(
"registed.ip"
,
msg
.
RegisteMessage
.
Device
Ip
)
.
Error
(
"ip匹配出现错误"
)
log
.
WithField
(
"registed.ip"
,
msg
.
RegisteMessage
.
Hardware
.
NET
.
Ip
)
.
Error
(
"ip匹配出现错误"
)
}
}
if
!
matched
{
if
!
matched
{
msg
.
RegisteMessage
.
Device
Ip
=
""
msg
.
RegisteMessage
.
Hardware
.
NET
.
Ip
=
""
}
}
worker
.
info
.
nodeInfo
=
&
omanager
.
NodeInfoResponse
{
worker
.
info
.
nodeInfo
=
&
omanager
.
NodeInfoResponse
{
MinerPubkey
:
msg
.
RegisteMessage
.
MinerPubkey
,
Info
:
msg
.
RegisteMessage
.
Info
,
BenefitAddress
:
msg
.
RegisteMessage
.
BenefitAddress
,
Hardware
:
msg
.
RegisteMessage
.
Hardware
,
DeviceIp
:
msg
.
RegisteMessage
.
DeviceIp
,
Models
:
msg
.
RegisteMessage
.
Models
,
}
}
wm
.
SetWorkerAddr
(
worker
,
worker
.
workerAddr
)
wm
.
SetWorkerAddr
(
worker
,
worker
.
workerAddr
)
if
err
:=
wm
.
checkWhiteList
(
worker
,
worker
.
info
.
nodeI
nfo
.
BenefitAddress
);
err
!=
nil
{
if
err
:=
wm
.
checkWhiteList
(
worker
,
i
nfo
.
BenefitAddress
);
err
!=
nil
{
worker
.
quit
<-
err
worker
.
quit
<-
err
return
return
}
else
{
}
else
{
wm
.
addWorkerToSets
(
worker
,
worker
.
info
.
nodeI
nfo
.
BenefitAddress
)
wm
.
addWorkerToSets
(
worker
,
i
nfo
.
BenefitAddress
)
}
}
wreg
:=
workerRegistry
{
wreg
:=
workerRegistry
{
...
@@ -708,7 +698,7 @@ func (wm *WorkerManager) Payment(task *odysseus.TaskContent) error {
...
@@ -708,7 +698,7 @@ func (wm *WorkerManager) Payment(task *odysseus.TaskContent) error {
fee
,
_
:=
strconv
.
ParseInt
(
task
.
TaskFee
,
10
,
64
)
fee
,
_
:=
strconv
.
ParseInt
(
task
.
TaskFee
,
10
,
64
)
uid
,
_
:=
strconv
.
ParseInt
(
task
.
TaskUid
,
10
,
64
)
uid
,
_
:=
strconv
.
ParseInt
(
task
.
TaskUid
,
10
,
64
)
err
:=
wm
.
node
.
cache
.
Payf
orFee
(
uid
,
fee
)
err
:=
wm
.
node
.
PayF
orFee
(
uid
,
fee
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
...
@@ -762,7 +752,7 @@ func (wm *WorkerManager) makeTaskProof(worker *Worker, task *odysseus.TaskConten
...
@@ -762,7 +752,7 @@ func (wm *WorkerManager) makeTaskProof(worker *Worker, task *odysseus.TaskConten
TaskContainerSignature
:
hex
.
EncodeToString
(
t
.
containerSignature
),
TaskContainerSignature
:
hex
.
EncodeToString
(
t
.
containerSignature
),
TaskMinerSignature
:
hex
.
EncodeToString
(
t
.
minerSignature
),
TaskMinerSignature
:
hex
.
EncodeToString
(
t
.
minerSignature
),
TaskWorkerAccount
:
worker
.
workerAddr
,
TaskWorkerAccount
:
worker
.
workerAddr
,
TaskProfitAccount
:
worker
.
info
.
nodeInfo
.
BenefitAddress
,
TaskProfitAccount
:
worker
.
info
.
nodeInfo
.
Info
.
BenefitAddress
,
}
}
return
proof
return
proof
}
}
server/worker_registry.go
View file @
5083c77d
...
@@ -7,7 +7,6 @@ import (
...
@@ -7,7 +7,6 @@ import (
"github.com/odysseus/service-registry/query"
"github.com/odysseus/service-registry/query"
"github.com/odysseus/service-registry/registry"
"github.com/odysseus/service-registry/registry"
"math/rand"
"math/rand"
"strings"
"time"
"time"
)
)
...
@@ -75,8 +74,8 @@ func (w workerRegistry) DetailInfo() (json.RawMessage, error) {
...
@@ -75,8 +74,8 @@ func (w workerRegistry) DetailInfo() (json.RawMessage, error) {
TaskList
:
taskList
,
TaskList
:
taskList
,
}
}
if
w
.
worker
.
info
.
nodeInfo
!=
nil
{
if
w
.
worker
.
info
.
nodeInfo
!=
nil
{
info
.
BenefitAddress
=
w
.
worker
.
info
.
nodeInfo
.
BenefitAddress
info
.
BenefitAddress
=
w
.
worker
.
info
.
nodeInfo
.
Info
.
BenefitAddress
info
.
IP
=
w
.
worker
.
info
.
nodeInfo
.
Device
Ip
info
.
IP
=
w
.
worker
.
info
.
nodeInfo
.
Hardware
.
NET
.
Ip
}
}
nmList
,
_
:=
w
.
wm
.
WorkerNmList
(
w
.
worker
)
nmList
,
_
:=
w
.
wm
.
WorkerNmList
(
w
.
worker
)
...
@@ -89,15 +88,9 @@ func (w workerRegistry) DetailInfo() (json.RawMessage, error) {
...
@@ -89,15 +88,9 @@ func (w workerRegistry) DetailInfo() (json.RawMessage, error) {
info
.
HearBeat
=
w
.
wm
.
GetHeartBeat
(
w
.
worker
.
uuid
)
*
1000
// to ms
info
.
HearBeat
=
w
.
wm
.
GetHeartBeat
(
w
.
worker
.
uuid
)
*
1000
// to ms
info
.
MinerAddress
=
w
.
worker
.
workerAddr
info
.
MinerAddress
=
w
.
worker
.
workerAddr
info
.
Nonce
=
int64
(
w
.
worker
.
nonce
)
info
.
Nonce
=
int64
(
w
.
worker
.
nonce
)
if
w
.
worker
.
info
.
deviceInfo
!=
nil
{
if
w
.
worker
.
info
.
nodeInfo
!=
nil
{
for
i
:=
0
;
i
<
len
(
w
.
worker
.
info
.
deviceInfo
.
Devices
);
i
++
{
info
.
CpuModel
=
w
.
worker
.
info
.
nodeInfo
.
Hardware
.
CPU
.
Model
if
strings
.
HasPrefix
(
w
.
worker
.
info
.
deviceInfo
.
Devices
[
i
]
.
DeviceType
,
"cpu"
)
{
info
.
CpuCore
=
int
(
w
.
worker
.
info
.
nodeInfo
.
Hardware
.
CPU
.
Cores
)
if
info
.
CpuModel
==
""
{
info
.
CpuModel
=
w
.
worker
.
info
.
deviceInfo
.
Devices
[
i
]
.
DeviceModel
}
info
.
CpuCore
++
}
}
if
info
.
CpuCore
==
0
{
if
info
.
CpuCore
==
0
{
info
.
CpuModel
=
"Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz"
info
.
CpuModel
=
"Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz"
info
.
CpuCore
=
8
info
.
CpuCore
=
8
...
...
server/workerstatu.go
View file @
5083c77d
...
@@ -65,13 +65,10 @@ func (wm *WorkerManager) IncrWorkerNonce(worker *Worker) (int, error) {
...
@@ -65,13 +65,10 @@ func (wm *WorkerManager) IncrWorkerNonce(worker *Worker) (int, error) {
func
(
wm
*
WorkerManager
)
AddWorkerFirst
(
worker
*
Worker
)
error
{
func
(
wm
*
WorkerManager
)
AddWorkerFirst
(
worker
*
Worker
)
error
{
log
.
WithField
(
"worker"
,
worker
.
workerAddr
)
.
Info
(
"add worker first time."
)
log
.
WithField
(
"worker"
,
worker
.
workerAddr
)
.
Info
(
"add worker first time."
)
wm
.
UpdateWorkerActive
(
worker
)
wm
.
UpdateWorkerActive
(
worker
)
for
_
,
device
:=
range
worker
.
info
.
deviceInfo
.
Devices
{
for
_
,
gpu
:=
range
worker
.
info
.
nodeInfo
.
Hardware
.
GPU
{
if
!
strings
.
HasPrefix
(
device
.
DeviceType
,
"gpu"
)
{
continue
}
// add device to redis
// add device to redis
priority
:=
0
priority
:=
0
_
=
device
// todo: set priority with device info.
_
=
gpu
// todo: set priority with device info.
for
m
:=
0
;
m
<
config
.
GetConfig
()
.
GetWorkerMultiple
();
m
++
{
for
m
:=
0
;
m
<
config
.
GetConfig
()
.
GetWorkerMultiple
();
m
++
{
// add worker to redis queue
// add worker to redis queue
if
err
:=
wm
.
rdb
.
RPush
(
context
.
Background
(),
config
.
WORKER_QUEUE_PREFIX
+
strconv
.
Itoa
(
priority
),
workerUid
(
worker
))
.
Err
();
err
!=
nil
{
if
err
:=
wm
.
rdb
.
RPush
(
context
.
Background
(),
config
.
WORKER_QUEUE_PREFIX
+
strconv
.
Itoa
(
priority
),
workerUid
(
worker
))
.
Err
();
err
!=
nil
{
...
@@ -187,7 +184,7 @@ func (wm *WorkerManager) InActiveWorker(worker *Worker) {
...
@@ -187,7 +184,7 @@ func (wm *WorkerManager) InActiveWorker(worker *Worker) {
wm
.
rdb
.
Del
(
context
.
Background
(),
workerResourceInfoKey
(
worker
))
wm
.
rdb
.
Del
(
context
.
Background
(),
workerResourceInfoKey
(
worker
))
wm
.
rdb
.
Del
(
context
.
Background
(),
workerBootedResourceInfoKey
(
worker
))
wm
.
rdb
.
Del
(
context
.
Background
(),
workerBootedResourceInfoKey
(
worker
))
if
worker
.
info
.
nodeInfo
!=
nil
{
if
worker
.
info
.
nodeInfo
!=
nil
{
wm
.
rmWorkerFromSets
(
worker
,
worker
.
info
.
nodeInfo
.
BenefitAddress
)
wm
.
rmWorkerFromSets
(
worker
,
worker
.
info
.
nodeInfo
.
Info
.
BenefitAddress
)
}
}
}
}
}
}
...
@@ -217,7 +214,7 @@ func (wm *WorkerManager) setWorkerLastTaskTime(worker *Worker, tm int64) error {
...
@@ -217,7 +214,7 @@ func (wm *WorkerManager) setWorkerLastTaskTime(worker *Worker, tm int64) error {
}
}
func
(
wm
*
WorkerManager
)
checkWhiteList
(
worker
*
Worker
,
benefit
string
)
error
{
func
(
wm
*
WorkerManager
)
checkWhiteList
(
worker
*
Worker
,
benefit
string
)
error
{
wh
,
err
:=
wm
.
node
.
cache
.
GetWhWithAddr
(
benefit
)
wh
,
err
:=
wm
.
node
.
Cache
()
.
GetWhWithAddr
(
benefit
)
if
err
!=
nil
{
if
err
!=
nil
{
log
.
WithFields
(
log
.
Fields
{
log
.
WithFields
(
log
.
Fields
{
"worker"
:
worker
.
uuid
,
"worker"
:
worker
.
uuid
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment