vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

implement state api command

Browse source
This commit is contained in:
Michael Crosby 2015-11-10 11:38:26 -08:00
parent cb7ab16427
commit a2ddcc2232
5 changed files with 66 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

32
runtime_linux.go
View file

@ -163,12 +163,17 @@ type libcontainerContainer struct {
initProcess *libcontainer.Process
exitStatus int
exited bool
path string
}
func (c *libcontainerContainer) ID() string {
return c.c.ID()
}
func (c *libcontainerContainer) Path() string {
return c.path
}
func (c *libcontainerContainer) Pid() (int, error) {
return c.initProcess.Pid()
}
@ -187,6 +192,10 @@ func (c *libcontainerContainer) Delete() error {
return c.c.Destroy()
}
func (c *libcontainerContainer) Processes() ([]int, error) {
return c.c.Processes()
}
func NewRuntime(stateDir string) (Runtime, error) {
f, err := libcontainer.New(stateDir, libcontainer.Cgroupfs, func(l *libcontainer.LinuxFactory) error {
//l.CriuPath = context.GlobalString("criu")
@ -225,6 +234,7 @@ func (r *libcontainerRuntime) Create(id, bundlePath string) (Container, error) {
c := &libcontainerContainer{
c: container,
initProcess: process,
path: bundlePath,
}
return c, nil
}
@ -380,16 +390,16 @@ func (rt *libcontainerRuntime) createCgroupConfig(name string, spec *specs.Linux
AllowedDevices: append(devices, allowedDevices...),
}
r := spec.Linux.Resources
c.Memory = r.Memory.Limit
c.MemoryReservation = r.Memory.Reservation
c.MemorySwap = r.Memory.Swap
c.KernelMemory = r.Memory.Kernel
c.MemorySwappiness = r.Memory.Swappiness
c.CpuShares = r.CPU.Shares
c.CpuQuota = r.CPU.Quota
c.CpuPeriod = r.CPU.Period
c.CpuRtRuntime = r.CPU.RealtimeRuntime
c.CpuRtPeriod = r.CPU.RealtimePeriod
c.Memory = int64(r.Memory.Limit)
c.MemoryReservation = int64(r.Memory.Reservation)
c.MemorySwap = int64(r.Memory.Swap)
c.KernelMemory = int64(r.Memory.Kernel)
c.MemorySwappiness = int64(r.Memory.Swappiness)
c.CpuShares = int64(r.CPU.Shares)
c.CpuQuota = int64(r.CPU.Quota)
c.CpuPeriod = int64(r.CPU.Period)
c.CpuRtRuntime = int64(r.CPU.RealtimeRuntime)
c.CpuRtPeriod = int64(r.CPU.RealtimePeriod)
c.CpusetCpus = r.CPU.Cpus
c.CpusetMems = r.CPU.Mems
c.BlkioWeight = r.BlockIO.Weight
@ -425,7 +435,7 @@ func (rt *libcontainerRuntime) createCgroupConfig(name string, spec *specs.Linux
for _, m := range r.Network.Priorities {
c.NetPrioIfpriomap = append(c.NetPrioIfpriomap, &configs.IfPrioMap{
Interface: m.Name,
Priority: m.Priority,
Priority: int64(m.Priority),
})
}
return c, nil