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
ee8beadb
Commit
ee8beadb
authored
Jun 04, 2024
by
duanjinfei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update image name
parent
78aea6ca
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
task_handler.go
nm/task_handler.go
+2
-1
No files found.
nm/task_handler.go
View file @
ee8beadb
...
...
@@ -155,6 +155,7 @@ func (t *TaskWorker) ComputeTaskHandler(taskMsg *nodemanagerV2.PushTaskMessage)
t
.
ExecTaskIdIsFinished
.
Store
(
taskMsg
.
TaskId
,
true
)
return
}
taskOp
.
taskCmd
.
ImageName
=
fmt
.
Sprintf
(
"%s-%s"
,
taskOp
.
taskCmd
.
ImageName
,
conf
.
GetConfig
()
.
OpSys
)
model
,
err
:=
db
.
GetModel
(
taskOp
.
taskCmd
.
ImageName
)
if
err
!=
nil
{
log
.
Errorf
(
"failed to unmarshal task cmd: %s"
,
err
.
Error
())
...
...
@@ -164,7 +165,6 @@ func (t *TaskWorker) ComputeTaskHandler(taskMsg *nodemanagerV2.PushTaskMessage)
}
model
.
LastWorkTime
=
time
.
Now
()
.
Unix
()
model
.
TotalRunCount
++
taskOp
.
taskCmd
.
ImageName
=
fmt
.
Sprintf
(
"%s-%s"
,
taskOp
.
taskCmd
.
ImageName
,
conf
.
GetConfig
()
.
OpSys
)
log
.
Info
(
"received task cmd :"
,
taskOp
.
taskCmd
)
log
.
WithField
(
"t.lastExecTaskImageName"
,
t
.
lastExecTaskImageName
)
.
WithField
(
"newTaskImageName"
,
taskOp
.
taskCmd
.
ImageName
)
.
Info
(
"task image info"
)
if
taskMsg
.
TaskKind
!=
baseV1
.
TaskKind_StandardTask
&&
conf
.
GetConfig
()
.
IsStopLastContainer
{
...
...
@@ -236,6 +236,7 @@ func (t *TaskWorker) GetAckResp(taskMsg *nodemanagerV2.PushTaskMessage) (isCanEx
log
.
Errorf
(
"failed to unmarshal task cmd: %s"
,
err
.
Error
())
return
}
taskCmd
.
ImageName
=
fmt
.
Sprintf
(
"%s-%s"
,
taskCmd
.
ImageName
,
conf
.
GetConfig
()
.
OpSys
)
value
,
ok
:=
t
.
ExecTaskIdIsFinished
.
Load
(
t
.
lastExecTaskId
)
if
!
ok
{
log
.
WithField
(
"task id"
,
t
.
lastExecTaskId
)
.
Warn
(
"task exec is not finished"
)
...
...
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