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
0d4e0aaf
Commit
0d4e0aaf
authored
Mar 23, 2024
by
duanjinfei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
handlercontainer resp status code is 409
parent
39a1f7e0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
task_msg.go
nm/task_msg.go
+6
-1
docker.go
operate/docker.go
+2
-0
No files found.
nm/task_msg.go
View file @
0d4e0aaf
...
...
@@ -445,7 +445,11 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
t
.
ExecTaskIdIsSuccess
.
Store
(
taskMsg
.
TaskId
,
true
)
return
}
if
taskExecResult
.
TaskHttpStatusCode
==
http
.
StatusConflict
{
taskExecResult
.
TaskExecError
=
fmt
.
Sprintf
(
"%s,Container Http Code:%d,body:%s"
,
"Container is initializing"
,
post
.
StatusCode
,
string
(
all
))
}
else
{
taskExecResult
.
TaskExecError
=
fmt
.
Sprintf
(
"%s,Container Http Code:%d,body:%s"
,
"Container is exec failed"
,
post
.
StatusCode
,
string
(
all
))
}
}
else
{
taskExecResult
.
TaskExecError
=
fmt
.
Sprintf
(
"%s,Container Http Code:%d,body:%s"
,
"Container resp body is nil"
,
post
.
StatusCode
,
""
)
}
...
...
@@ -689,6 +693,7 @@ func (t *TaskHandler) checkIsStopContainer(taskCmd *models.TaskCmd) {
if
container
.
Image
==
oldTaskImageName
&&
container
.
State
==
"running"
{
t
.
DockerOp
.
StopContainer
(
container
.
ID
)
log
.
WithField
(
"Image name"
,
container
.
Image
)
.
Info
(
"Stopping container"
)
//t.DockerOp.RunningImages[oldTaskImageName] = false
break
}
}
...
...
operate/docker.go
View file @
0d4e0aaf
...
...
@@ -30,6 +30,7 @@ type DockerOp struct {
ModelsInfo
[]
*
models
.
ModelInfo
ModelTaskIdIndexesChan
chan
[]
uint64
ReportTaskIds
[]
uint64
//RunningImages map[string]bool
}
func
init
()
{
...
...
@@ -53,6 +54,7 @@ func NewDockerOp() *DockerOp {
UsedExternalPort
:
make
(
map
[
int64
]
bool
,
0
),
ModelTaskIdIndexesChan
:
make
(
chan
[]
uint64
,
0
),
ReportTaskIds
:
make
([]
uint64
,
0
),
//RunningImages: make(map[string]bool, 0),
}
}
...
...
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