mirror of https://github.com/containers/podman.git
Display correct value for unlimited ulimit
When doing a container inspect on a container with unlimited ulimits, the value should be -1. But because the OCI spec requires the ulimit value to be uint64, we were displaying the inspect values as a uint64 as well. Simple change to display as an int64. Fixes: #9303 Signed-off-by: baude <bbaude@redhat.com>
This commit is contained in:
parent
4d604c1089
commit
5ccb1596b4
|
@ -871,8 +871,8 @@ func (c *Container) generateInspectContainerHostConfig(ctrSpec *spec.Spec, named
|
||||||
for _, limit := range ctrSpec.Process.Rlimits {
|
for _, limit := range ctrSpec.Process.Rlimits {
|
||||||
newLimit := define.InspectUlimit{}
|
newLimit := define.InspectUlimit{}
|
||||||
newLimit.Name = limit.Type
|
newLimit.Name = limit.Type
|
||||||
newLimit.Soft = limit.Soft
|
newLimit.Soft = int64(limit.Soft)
|
||||||
newLimit.Hard = limit.Hard
|
newLimit.Hard = int64(limit.Hard)
|
||||||
hostConfig.Ulimits = append(hostConfig.Ulimits, newLimit)
|
hostConfig.Ulimits = append(hostConfig.Ulimits, newLimit)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -122,9 +122,9 @@ type InspectUlimit struct {
|
||||||
// Name is the name (type) of the ulimit.
|
// Name is the name (type) of the ulimit.
|
||||||
Name string `json:"Name"`
|
Name string `json:"Name"`
|
||||||
// Soft is the soft limit that will be applied.
|
// Soft is the soft limit that will be applied.
|
||||||
Soft uint64 `json:"Soft"`
|
Soft int64 `json:"Soft"`
|
||||||
// Hard is the hard limit that will be applied.
|
// Hard is the hard limit that will be applied.
|
||||||
Hard uint64 `json:"Hard"`
|
Hard int64 `json:"Hard"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// InspectDevice is a single device that will be mounted into the container.
|
// InspectDevice is a single device that will be mounted into the container.
|
||||||
|
|
|
@ -466,4 +466,28 @@ var _ = Describe("Podman inspect", func() {
|
||||||
Expect(len(inspect)).To(Equal(1))
|
Expect(len(inspect)).To(Equal(1))
|
||||||
Expect(len(inspect[0].NetworkSettings.Networks)).To(Equal(1))
|
Expect(len(inspect[0].NetworkSettings.Networks)).To(Equal(1))
|
||||||
})
|
})
|
||||||
|
|
||||||
|
It("Container inspect with unlimited uilimits should be -1", func() {
|
||||||
|
ctrName := "testctr"
|
||||||
|
session := podmanTest.Podman([]string{"run", "-d", "--ulimit", "core=-1:-1", "--name", ctrName, ALPINE, "top"})
|
||||||
|
session.WaitWithDefaultTimeout()
|
||||||
|
Expect(session.ExitCode()).To(BeZero())
|
||||||
|
|
||||||
|
inspect := podmanTest.Podman([]string{"inspect", ctrName})
|
||||||
|
inspect.WaitWithDefaultTimeout()
|
||||||
|
Expect(inspect.ExitCode()).To(BeZero())
|
||||||
|
|
||||||
|
data := inspect.InspectContainerToJSON()
|
||||||
|
ulimits := data[0].HostConfig.Ulimits
|
||||||
|
Expect(len(ulimits)).To(BeNumerically(">", 0))
|
||||||
|
found := false
|
||||||
|
for _, ulimit := range ulimits {
|
||||||
|
if ulimit.Name == "RLIMIT_CORE" {
|
||||||
|
found = true
|
||||||
|
Expect(ulimit.Soft).To(BeNumerically("==", -1))
|
||||||
|
Expect(ulimit.Hard).To(BeNumerically("==", -1))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Expect(found).To(BeTrue())
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in New Issue