kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-09 03:45:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

Move the wait result to bottom of methods

Browse Source
This commit is contained in:
Alex Dadgar
2016-11-04 14:58:55 -07:00
parent 16d1fede7d
commit 12c033ab81
6 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/driver/java.go
View File

@@ -404,9 +404,9 @@ func (h *javaHandle) Stats() (*cstructs.TaskResourceUsage, error) {
}
func (h *javaHandle) run() {
ps, err := h.executor.Wait()
ps, werr := h.executor.Wait()
close(h.doneCh)
if ps.ExitCode == 0 && err != nil {
if ps.ExitCode == 0 && werr != nil {
if h.isolationConfig != nil {
ePid := h.pluginClient.ReattachConfig().Pid
if e := executor.ClientCleanup(h.isolationConfig, ePid); e != nil {
@@ -421,14 +421,17 @@ func (h *javaHandle) run() {
h.logger.Printf("[ERR] driver.java: unmounting dev,proc and alloc dirs failed: %v", e)
}
}
h.waitCh <- &dstructs.WaitResult{ExitCode: ps.ExitCode, Signal: ps.Signal, Err: err}
close(h.waitCh)
// Remove services
if err := h.executor.DeregisterServices(); err != nil {
h.logger.Printf("[ERR] driver.java: failed to kill the deregister services: %v", err)
}
// Exit the executor
h.executor.Exit()
h.pluginClient.Kill()
// Send the results
h.waitCh <- &dstructs.WaitResult{ExitCode: ps.ExitCode, Signal: ps.Signal, Err: werr}
close(h.waitCh)
}