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
d44cb4db
Commit
d44cb4db
authored
Mar 11, 2024
by
vicotor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add whitelist check
parent
c5d968b5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
65 additions
and
0 deletions
+65
-0
main.go
cmd/demoworker/main.go
+1
-0
constant.go
config/constant.go
+1
-0
workerManager.go
server/workerManager.go
+12
-0
workerstatu.go
server/workerstatu.go
+51
-0
No files found.
cmd/demoworker/main.go
View file @
d44cb4db
...
@@ -191,6 +191,7 @@ func withManager(idx int, endpoint string) {
...
@@ -191,6 +191,7 @@ func withManager(idx int, endpoint string) {
func
main
()
{
func
main
()
{
flag
.
Parse
()
flag
.
Parse
()
log
.
SetFormatter
(
&
log
.
TextFormatter
{
FullTimestamp
:
true
,
TimestampFormat
:
"2006-01-02 15:04:05.000"
})
seed
,
err
:=
newManagerClient
(
*
manager
)
seed
,
err
:=
newManagerClient
(
*
manager
)
if
err
!=
nil
{
if
err
!=
nil
{
log
.
Fatal
(
"connect seed manager failed"
,
"err"
,
err
)
log
.
Fatal
(
"connect seed manager failed"
,
"err"
,
err
)
...
...
config/constant.go
View file @
d44cb4db
...
@@ -2,6 +2,7 @@ package config
...
@@ -2,6 +2,7 @@ package config
const
(
const
(
NODE_MANAGER_SET
=
"node_manager_set"
NODE_MANAGER_SET
=
"node_manager_set"
WORKER_SETS_PREFIX
=
"worker_sets_"
WORKER_STATUS_PREFIX
=
"worker_status_"
WORKER_STATUS_PREFIX
=
"worker_status_"
WORKER_NONCE_KEY_PREFIX
=
"worker_nonce_"
WORKER_NONCE_KEY_PREFIX
=
"worker_nonce_"
WORKER_QUEUE_PREFIX
=
"worker_queue_"
WORKER_QUEUE_PREFIX
=
"worker_queue_"
...
...
server/workerManager.go
View file @
d44cb4db
...
@@ -621,8 +621,20 @@ func (wm *WorkerManager) handleWorkerMsg(worker *Worker) {
...
@@ -621,8 +621,20 @@ func (wm *WorkerManager) handleWorkerMsg(worker *Worker) {
worker
.
workerAddr
=
addr
worker
.
workerAddr
=
addr
}
}
worker
.
registed
=
true
worker
.
registed
=
true
worker
.
info
.
nodeInfo
=
&
omanager
.
NodeInfoResponse
{
MinerPubkey
:
msg
.
RegisteMessage
.
MinerPubkey
,
BenefitAddress
:
msg
.
RegisteMessage
.
BenefitAddress
,
DeviceIp
:
msg
.
RegisteMessage
.
DeviceIp
,
}
wm
.
SetWorkerAddr
(
worker
,
worker
.
workerAddr
)
wm
.
SetWorkerAddr
(
worker
,
worker
.
workerAddr
)
if
err
:=
wm
.
checkWhiteList
(
worker
,
worker
.
info
.
nodeInfo
.
BenefitAddress
);
err
!=
nil
{
worker
.
quit
<-
err
return
}
else
{
wm
.
addWorkerToSets
(
worker
,
worker
.
info
.
nodeInfo
.
BenefitAddress
)
}
wreg
:=
workerRegistry
{
wreg
:=
workerRegistry
{
worker
:
worker
,
worker
:
worker
,
wm
:
wm
,
wm
:
wm
,
...
...
server/workerstatu.go
View file @
d44cb4db
...
@@ -174,6 +174,53 @@ func (wm *WorkerManager) InActiveWorker(worker *Worker) {
...
@@ -174,6 +174,53 @@ func (wm *WorkerManager) InActiveWorker(worker *Worker) {
wm
.
rdb
.
Del
(
context
.
Background
(),
workerUsageInfoKey
(
worker
))
wm
.
rdb
.
Del
(
context
.
Background
(),
workerUsageInfoKey
(
worker
))
wm
.
rdb
.
Del
(
context
.
Background
(),
workerDeviceInfoKey
(
worker
))
wm
.
rdb
.
Del
(
context
.
Background
(),
workerDeviceInfoKey
(
worker
))
wm
.
rdb
.
Del
(
context
.
Background
(),
workerResourceInfoKey
(
worker
))
wm
.
rdb
.
Del
(
context
.
Background
(),
workerResourceInfoKey
(
worker
))
if
worker
.
info
.
nodeInfo
!=
nil
{
wm
.
rmWorkerFromSets
(
worker
,
worker
.
info
.
nodeInfo
.
BenefitAddress
)
}
}
}
func
(
wm
*
WorkerManager
)
addWorkerToSets
(
worker
*
Worker
,
benefit
string
)
{
wm
.
rdb
.
SAdd
(
context
.
Background
(),
workerSetsKey
(
benefit
),
worker
.
workerAddr
)
}
func
(
wm
*
WorkerManager
)
rmWorkerFromSets
(
worker
*
Worker
,
benefit
string
)
{
wm
.
rdb
.
SRem
(
context
.
Background
(),
workerSetsKey
(
benefit
),
worker
.
workerAddr
)
}
func
(
wm
*
WorkerManager
)
getWorkerSets
(
benefit
string
)
([]
string
,
error
)
{
list
,
err
:=
wm
.
rdb
.
SMembers
(
context
.
Background
(),
workerSetsKey
(
benefit
))
.
Result
()
if
err
==
redis
.
ErrNil
{
return
[]
string
{},
nil
}
return
list
,
err
}
func
(
wm
*
WorkerManager
)
checkWhiteList
(
worker
*
Worker
,
benefit
string
)
error
{
wh
,
err
:=
wm
.
node
.
cache
.
GetWhWithAddr
(
benefit
)
if
err
!=
nil
{
log
.
WithFields
(
log
.
Fields
{
"worker"
:
worker
.
uuid
,
"benefit"
:
benefit
,
})
.
Error
(
"worker not in white list"
)
return
errors
.
New
(
"not in white list"
)
}
maxNodeCount
:=
wh
.
NodeNum
nodeList
,
err
:=
wm
.
getWorkerSets
(
benefit
)
if
err
!=
nil
{
return
errors
.
New
(
"check worker white list failed"
)
}
nodeInSet
:=
false
for
_
,
node
:=
range
nodeList
{
if
strings
.
Compare
(
strings
.
ToLower
(
worker
.
workerAddr
),
strings
.
ToLower
(
node
))
==
0
{
nodeInSet
=
true
break
}
}
if
nodeInSet
||
len
(
nodeList
)
<
int
(
maxNodeCount
)
{
return
nil
}
else
{
return
errors
.
New
(
"reach max nodenum with the benefit"
)
}
}
}
}
...
@@ -197,6 +244,10 @@ func workerNonceKey(w *Worker) string {
...
@@ -197,6 +244,10 @@ func workerNonceKey(w *Worker) string {
return
config
.
WORKER_NONCE_KEY_PREFIX
+
w
.
workerAddr
return
config
.
WORKER_NONCE_KEY_PREFIX
+
w
.
workerAddr
}
}
func
workerSetsKey
(
benefit
string
)
string
{
return
config
.
WORKER_SETS_PREFIX
+
benefit
}
func
workerStatusKey
(
w
*
Worker
)
string
{
func
workerStatusKey
(
w
*
Worker
)
string
{
id
:=
workerId
(
w
)
id
:=
workerId
(
w
)
return
fmt
.
Sprintf
(
"%s_%s"
,
config
.
WORKER_STATUS_PREFIX
,
id
)
return
fmt
.
Sprintf
(
"%s_%s"
,
config
.
WORKER_STATUS_PREFIX
,
id
)
...
...
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