Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
power-node
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
power-node
Commits
cb5836ef
Commit
cb5836ef
authored
Mar 21, 2024
by
duanjinfei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add task ack resp and serial exec task
parent
381dcbb6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
2 deletions
+16
-2
msg_resp.go
nm/msg_resp.go
+13
-0
start.go
nm/start.go
+3
-2
No files found.
nm/msg_resp.go
View file @
cb5836ef
...
@@ -269,3 +269,16 @@ func FetchStandardTaskResp(params ...interface{}) *nodemanagerV1.WorkerMessage {
...
@@ -269,3 +269,16 @@ func FetchStandardTaskResp(params ...interface{}) *nodemanagerV1.WorkerMessage {
log
.
Info
(
"---------------------------------------Send fetch standard task msg ------------------------------------"
)
log
.
Info
(
"---------------------------------------Send fetch standard task msg ------------------------------------"
)
return
fetchStandardTaskMsgRes
return
fetchStandardTaskMsgRes
}
}
func
RespTaskAck
(
params
...
interface
{})
*
nodemanagerV1
.
WorkerMessage
{
taskId
:=
params
[
0
]
.
(
string
)
taskAckMsgRes
:=
&
nodemanagerV1
.
WorkerMessage
{
Message
:
&
nodemanagerV1
.
WorkerMessage_SubmitTaskAck
{
SubmitTaskAck
:
&
nodemanagerV1
.
SubmitTaskAck
{
TaskId
:
taskId
,
},
},
}
log
.
WithField
(
"taskId"
,
taskId
)
.
Info
(
"---------------------------------------Send task ack msg ------------------------------------"
)
return
taskAckMsgRes
}
nm/start.go
View file @
cb5836ef
...
@@ -277,6 +277,8 @@ func handlerMsg(nodeManager *models.NodeManagerClient,
...
@@ -277,6 +277,8 @@ func handlerMsg(nodeManager *models.NodeManagerClient,
taskMsg
:=
rev
.
GetPushTaskMessage
()
taskMsg
:=
rev
.
GetPushTaskMessage
()
if
taskMsg
!=
nil
{
if
taskMsg
!=
nil
{
params
:=
buildParams
(
taskMsg
.
TaskId
)
msgRespWorker
.
RegisterMsgResp
(
nodeManager
,
worker
,
RespTaskAck
,
params
)
go
func
(
msgRespWorker
*
RespMsgWorker
,
go
func
(
msgRespWorker
*
RespMsgWorker
,
taskMsgWorker
*
TaskHandler
,
taskMsg
*
nodeManagerV1
.
PushTaskMessage
)
{
taskMsgWorker
*
TaskHandler
,
taskMsg
*
nodeManagerV1
.
PushTaskMessage
)
{
if
!
taskMsgWorker
.
DockerOp
.
IsHealthy
{
if
!
taskMsgWorker
.
DockerOp
.
IsHealthy
{
...
@@ -284,12 +286,11 @@ func handlerMsg(nodeManager *models.NodeManagerClient,
...
@@ -284,12 +286,11 @@ func handlerMsg(nodeManager *models.NodeManagerClient,
//msgRespWorker.RegisterMsgResp(nodeManager, worker, GoodbyeResp, params)
//msgRespWorker.RegisterMsgResp(nodeManager, worker, GoodbyeResp, params)
return
return
}
}
taskMsgWorker
.
Wg
.
Wait
()
taskMsgWorker
.
Wg
.
Add
(
1
)
taskMsgWorker
.
Wg
.
Add
(
1
)
taskMsgWorker
.
TaskMsg
<-
taskMsg
taskMsgWorker
.
TaskMsg
<-
taskMsg
taskMsgWorker
.
Wg
.
Wait
()
taskMsgWorker
.
Wg
.
Wait
()
taskMsgWorker
.
Mutex
.
Lock
()
taskExecResInterface
,
_
:=
taskMsgWorker
.
LruCache
.
Get
(
taskMsg
.
TaskId
)
taskExecResInterface
,
_
:=
taskMsgWorker
.
LruCache
.
Get
(
taskMsg
.
TaskId
)
taskMsgWorker
.
Mutex
.
Unlock
()
//log.WithField("result", taskExecResInterface).Info("lru cache get task result")
//log.WithField("result", taskExecResInterface).Info("lru cache get task result")
taskExecRes
:=
&
models
.
TaskResult
{
taskExecRes
:=
&
models
.
TaskResult
{
TaskHttpStatusCode
:
200
,
TaskHttpStatusCode
:
200
,
...
...
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