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

driver.rkt: Remove unnecessary job validation

This commit is contained in:
Kenjiro Nakayama 2016-08-16 23:30:08 +09:00
parent f5c38de579
commit c97beb8deb
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
client/driver/rkt.go
View File

@ -175,11 +175,9 @@ func (d *RktDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle, e
if err := mapstructure.WeakDecode(task.Config, &driverConfig); err != nil { if err := mapstructure.WeakDecode(task.Config, &driverConfig); err != nil {
return nil, err return nil, err
} }
// Validate that the config is valid.
// ACI image
img := driverConfig.ImageName img := driverConfig.ImageName
if img == "" {
return nil, fmt.Errorf("Missing ACI image for rkt")
}
// Get the tasks local directory. // Get the tasks local directory.
taskName := d.DriverContext.taskName taskName := d.DriverContext.taskName
@ -230,13 +228,6 @@ func (d *RktDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle, e
cmdArgs = append(cmdArgs, fmt.Sprintf("--exec=%v", driverConfig.Command)) cmdArgs = append(cmdArgs, fmt.Sprintf("--exec=%v", driverConfig.Command))
} }
if task.Resources.MemoryMB == 0 {
return nil, fmt.Errorf("Memory limit cannot be zero")
}
if task.Resources.CPU == 0 {
return nil, fmt.Errorf("CPU limit cannot be zero")
}
// Add memory isolator // Add memory isolator
cmdArgs = append(cmdArgs, fmt.Sprintf("--memory=%vM", int64(task.Resources.MemoryMB))) cmdArgs = append(cmdArgs, fmt.Sprintf("--memory=%vM", int64(task.Resources.MemoryMB)))