luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #656 from hashicorp/b-qemu-bugs 

Qemu driver uses BasicExecutor
This commit is contained in:
Alex Dadgar 2016-01-06 16:15:05 -08:00
parent 68a5877c91 ef36ae0168
commit b19631bf5c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/driver/qemu.go
View File

@ -184,7 +184,8 @@ func (d *QemuDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle,
}
// Setup the command
cmd := executor.Command(args[0], args[1:]...)
cmd := executor.NewBasicExecutor()
executor.SetCommand(cmd, args[0], args[1:])
if err := cmd.Limit(task.Resources); err != nil {
return nil, fmt.Errorf("failed to constrain resources: %s", err)
}
@ -224,8 +225,8 @@ func (d *QemuDriver) Open(ctx *ExecContext, handleID string) (DriverHandle, erro
}
// Find the process
cmd, err := executor.OpenId(id.ExecutorId)
if err != nil {
cmd := executor.NewBasicExecutor()
if err := cmd.Open(id.ExecutorId); err != nil {
return nil, fmt.Errorf("failed to open ID %v: %v", id.ExecutorId, err)
}