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
20e9b767
Commit
20e9b767
authored
May 24, 2024
by
vicotor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update ticker and add more msg
parent
a396ec6b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
74 additions
and
3 deletions
+74
-3
workerManager.go
server/workerManager.go
+68
-3
workerstatu.go
server/workerstatu.go
+6
-0
No files found.
server/workerManager.go
View file @
20e9b767
...
...
@@ -240,7 +240,7 @@ func (wm *WorkerManager) manageWorker(worker *Worker) error {
heartBeatTicker
:=
time
.
NewTicker
(
initialHeartBeatInterval
)
defer
heartBeatTicker
.
Stop
()
nodeinfoTicker
:=
time
.
NewTicker
(
initialHeartBeatInterval
)
nodeinfoTicker
:=
time
.
NewTicker
(
initialHeartBeatInterval
*
10
)
defer
nodeinfoTicker
.
Stop
()
workerCheckTicker
:=
time
.
NewTicker
(
workerCheckDuration
)
...
...
@@ -249,7 +249,7 @@ func (wm *WorkerManager) manageWorker(worker *Worker) error {
deviceUsageTicker
:=
time
.
NewTicker
(
initialInterval
)
defer
deviceUsageTicker
.
Stop
()
gpuUsageTicker
:=
time
.
NewTicker
(
initialInterval
)
gpuUsageTicker
:=
time
.
NewTicker
(
initialInterval
*
5
)
defer
gpuUsageTicker
.
Stop
()
worker
.
status
=
"connected"
...
...
@@ -285,7 +285,7 @@ func (wm *WorkerManager) manageWorker(worker *Worker) error {
case
<-
workerCheckTicker
.
C
:
if
worker
.
info
.
nodeInfo
!=
nil
{
nodeinfoTicker
.
Reset
(
time
.
Hour
*
24
)
//
nodeinfoTicker.Reset(time.Hour * 24)
}
if
worker
.
usage
.
hwUsage
!=
nil
{
...
...
@@ -604,6 +604,71 @@ func (wm *WorkerManager) handleWorkerMsg(worker *Worker) {
"worker-addr"
:
worker
.
workerAddr
,
})
.
Debugf
(
"receive worker device usage:%v"
,
msg
.
DeviceUsage
.
Usage
)
case
*
omanager
.
WorkerMessage_AddModelRunning
:
if
!
worker
.
registed
{
continue
}
l
.
WithFields
(
log
.
Fields
{
"worker-addr"
:
worker
.
workerAddr
,
"model count"
:
len
(
msg
.
AddModelRunning
.
Models
),
})
.
Debugf
(
"receive worker add model running:%v"
,
msg
.
AddModelRunning
.
Models
)
case
*
omanager
.
WorkerMessage_DelModeRunning
:
if
!
worker
.
registed
{
continue
}
l
.
WithFields
(
log
.
Fields
{
"worker-addr"
:
worker
.
workerAddr
,
"model count"
:
len
(
msg
.
DelModeRunning
.
ModelIds
),
})
.
Debugf
(
"receive worker del model running:%v"
,
msg
.
DelModeRunning
.
ModelIds
)
case
*
omanager
.
WorkerMessage_AddModelInstalled
:
if
!
worker
.
registed
{
continue
}
l
.
WithFields
(
log
.
Fields
{
"worker-addr"
:
worker
.
workerAddr
,
"model count"
:
len
(
msg
.
AddModelInstalled
.
Models
),
})
.
Debugf
(
"receive worker add model installed:%v"
,
msg
.
AddModelInstalled
.
Models
)
case
*
omanager
.
WorkerMessage_DelModelInstalled
:
if
!
worker
.
registed
{
continue
}
l
.
WithFields
(
log
.
Fields
{
"worker-addr"
:
worker
.
workerAddr
,
"model count"
:
len
(
msg
.
DelModelInstalled
.
ModelIds
),
})
.
Debugf
(
"receive worker del model installed:%v"
,
msg
.
DelModelInstalled
.
ModelIds
)
case
*
omanager
.
WorkerMessage_InstalledModelStatus
:
if
!
worker
.
registed
{
continue
}
l
.
WithFields
(
log
.
Fields
{
"worker-addr"
:
worker
.
workerAddr
,
"model"
:
len
(
msg
.
InstalledModelStatus
.
ModelId
),
"type"
:
"status"
,
})
.
Debugf
(
"receive worker installed model status:%v"
,
msg
.
InstalledModelStatus
)
case
*
omanager
.
WorkerMessage_RunningModelStatus
:
if
!
worker
.
registed
{
continue
}
l
.
WithFields
(
log
.
Fields
{
"worker-addr"
:
worker
.
workerAddr
,
"model"
:
len
(
msg
.
RunningModelStatus
.
ModelId
),
"type"
:
"status"
,
})
.
Debugf
(
"receive worker running model status:%v"
,
msg
.
RunningModelStatus
)
case
*
omanager
.
WorkerMessage_GpuUsage
:
if
!
worker
.
registed
{
continue
}
l
.
WithFields
(
log
.
Fields
{
"worker-addr"
:
worker
.
workerAddr
,
"usage count"
:
len
(
msg
.
GpuUsage
.
Usages
),
})
.
Debugf
(
"receive worker gpu usage:%v"
,
msg
.
GpuUsage
.
Usages
)
case
*
omanager
.
WorkerMessage_RegisteMessage
:
if
worker
.
registed
{
continue
...
...
server/workerstatu.go
View file @
20e9b767
...
...
@@ -84,6 +84,12 @@ func (wm *WorkerManager) AddWorkerFirst(worker *Worker) error {
Models
:
types
.
PbToModelInfo
(
worker
.
info
.
nodeInfo
.
Models
),
Hardware
:
types
.
PbToHardwareInfo
(
worker
.
info
.
nodeInfo
.
Hardware
),
})
for
_
,
installed
:=
range
worker
.
info
.
nodeInfo
.
Models
.
InstalledModels
{
wm
.
workerInstalledOperator
.
Insert
(
context
.
Background
(),
&
operator
.
WorkerInstalledInfo
{
WorkerId
:
worker
.
WorkerAccount
()
.
String
(),
ModelId
:
installed
.
ModelId
,
})
}
if
err
!=
nil
{
log
.
WithError
(
err
)
.
Error
(
"insert worker info failed"
)
return
err
...
...
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