Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Nomad
Commits
6878134a
Commit
6878134a
authored
5 years ago
by
Mahmood Ali
Browse files
Options
Download
Email Patches
Plain Diff
always destroy
parent
a15bdc13
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
drivers/exec/driver.go
+2
-4
drivers/exec/driver.go
drivers/java/driver.go
+2
-4
drivers/java/driver.go
drivers/qemu/driver.go
+2
-4
drivers/qemu/driver.go
drivers/rawexec/driver.go
+2
-4
drivers/rawexec/driver.go
drivers/rkt/driver.go
+2
-4
drivers/rkt/driver.go
with
10 additions
and
20 deletions
+10
-20
drivers/exec/driver.go
+
2
-
4
View file @
6878134a
...
...
@@ -458,10 +458,8 @@ func (d *Driver) DestroyTask(taskID string, force bool) error {
}
if
!
handle
.
pluginClient
.
Exited
()
{
if
handle
.
IsRunning
()
{
if
err
:=
handle
.
exec
.
Shutdown
(
""
,
0
);
err
!=
nil
{
handle
.
logger
.
Error
(
"destroying executor failed"
,
"err"
,
err
)
}
if
err
:=
handle
.
exec
.
Shutdown
(
""
,
0
);
err
!=
nil
{
handle
.
logger
.
Error
(
"destroying executor failed"
,
"err"
,
err
)
}
handle
.
pluginClient
.
Kill
()
...
...
This diff is collapsed.
Click to expand it.
drivers/java/driver.go
+
2
-
4
View file @
6878134a
...
...
@@ -486,10 +486,8 @@ func (d *Driver) DestroyTask(taskID string, force bool) error {
}
if
!
handle
.
pluginClient
.
Exited
()
{
if
handle
.
IsRunning
()
{
if
err
:=
handle
.
exec
.
Shutdown
(
""
,
0
);
err
!=
nil
{
handle
.
logger
.
Error
(
"destroying executor failed"
,
"err"
,
err
)
}
if
err
:=
handle
.
exec
.
Shutdown
(
""
,
0
);
err
!=
nil
{
handle
.
logger
.
Error
(
"destroying executor failed"
,
"err"
,
err
)
}
handle
.
pluginClient
.
Kill
()
...
...
This diff is collapsed.
Click to expand it.
drivers/qemu/driver.go
+
2
-
4
View file @
6878134a
...
...
@@ -534,10 +534,8 @@ func (d *Driver) DestroyTask(taskID string, force bool) error {
}
if
!
handle
.
pluginClient
.
Exited
()
{
if
handle
.
IsRunning
()
{
if
err
:=
handle
.
exec
.
Shutdown
(
""
,
0
);
err
!=
nil
{
handle
.
logger
.
Error
(
"destroying executor failed"
,
"err"
,
err
)
}
if
err
:=
handle
.
exec
.
Shutdown
(
""
,
0
);
err
!=
nil
{
handle
.
logger
.
Error
(
"destroying executor failed"
,
"err"
,
err
)
}
handle
.
pluginClient
.
Kill
()
...
...
This diff is collapsed.
Click to expand it.
drivers/rawexec/driver.go
+
2
-
4
View file @
6878134a
...
...
@@ -460,10 +460,8 @@ func (d *Driver) DestroyTask(taskID string, force bool) error {
}
if
!
handle
.
pluginClient
.
Exited
()
{
if
handle
.
IsRunning
()
{
if
err
:=
handle
.
exec
.
Shutdown
(
""
,
0
);
err
!=
nil
{
handle
.
logger
.
Error
(
"destroying executor failed"
,
"err"
,
err
)
}
if
err
:=
handle
.
exec
.
Shutdown
(
""
,
0
);
err
!=
nil
{
handle
.
logger
.
Error
(
"destroying executor failed"
,
"err"
,
err
)
}
handle
.
pluginClient
.
Kill
()
...
...
This diff is collapsed.
Click to expand it.
drivers/rkt/driver.go
+
2
-
4
View file @
6878134a
...
...
@@ -810,10 +810,8 @@ func (d *Driver) DestroyTask(taskID string, force bool) error {
}
if
!
handle
.
pluginClient
.
Exited
()
{
if
handle
.
IsRunning
()
{
if
err
:=
handle
.
exec
.
Shutdown
(
""
,
0
);
err
!=
nil
{
handle
.
logger
.
Error
(
"destroying executor failed"
,
"err"
,
err
)
}
if
err
:=
handle
.
exec
.
Shutdown
(
""
,
0
);
err
!=
nil
{
handle
.
logger
.
Error
(
"destroying executor failed"
,
"err"
,
err
)
}
handle
.
pluginClient
.
Kill
()
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
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
Menu
Projects
Groups
Snippets
Help