opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 00:51:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18379 from giuseppe/small-fixes

Browse Source 
some small fixes
This commit is contained in:
OpenShift Merge Robot
2023-05-01 10:36:34 -04:00
committed by GitHub
parent 22047c6321 70870895b7
commit cda2b6e7ea
4 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
cmd/podman/kube/play.go
View File

@ -346,34 +346,26 @@ func playKube(cmd *cobra.Command, args []string) error {
}
func readerFromArg(fileName string) (*bytes.Reader, error) {
errURL := parse.ValidURL(fileName)
if fileName == "-" { // Read from stdin
data, err := io.ReadAll(os.Stdin)
if err != nil {
return nil, err
}
return bytes.NewReader(data), nil
}
if errURL == nil {
var reader io.Reader
switch {
case fileName == "-": // Read from stdin
reader = os.Stdin
case parse.ValidURL(fileName) == nil:
response, err := http.Get(fileName)
if err != nil {
return nil, err
}
defer response.Body.Close()
data, err := io.ReadAll(response.Body)
if err != nil {
return nil, err
}
return bytes.NewReader(data), nil
}
reader = response.Body
default:
f, err := os.Open(fileName)
if err != nil {
return nil, err
}
defer f.Close()
data, err := io.ReadAll(f)
reader = f
}
data, err := io.ReadAll(reader)
if err != nil {
return nil, err
}

37
libpod/container_internal.go
View File

@ -1848,12 +1848,13 @@ func (c *Container) cleanupStorage() error {
if c.valid {
if err := c.save(); err != nil {
if cleanupErr != nil {
logrus.Errorf("Unmounting container %s: %v", c.ID(), cleanupErr)
}
logrus.Errorf("Unmounting container %s: %v", c.ID(), err)
} else {
cleanupErr = err
}
}
}
}
// umount rootfs overlay if it was created
if c.config.RootfsOverlay {
@ -1861,29 +1862,38 @@ func (c *Container) cleanupStorage() error {
if err := overlay.Unmount(overlayBasePath); err != nil {
if cleanupErr != nil {
logrus.Errorf("Failed to clean up overlay mounts for %s: %v", c.ID(), err)
} else {
cleanupErr = fmt.Errorf("failed to clean up overlay mounts for %s: %w", c.ID(), err)
}
cleanupErr = err
}
}
if c.config.RootfsMapping != nil {
if err := unix.Unmount(c.config.Rootfs, 0); err != nil {
if err := unix.Unmount(c.config.Rootfs, 0); err != nil && err != unix.EINVAL {
if cleanupErr != nil {
logrus.Errorf("Unmounting idmapped rootfs for container %s after mount error: %v", c.ID(), err)
} else {
cleanupErr = fmt.Errorf("unmounting idmapped rootfs for container %s after mount error: %w", c.ID(), err)
}
}
}
for _, containerMount := range c.config.Mounts {
if err := c.unmountSHM(containerMount); err != nil {
if cleanupErr != nil {
logrus.Errorf("Unmounting container %s: %v", c.ID(), cleanupErr)
logrus.Errorf("Unmounting container %s: %v", c.ID(), err)
} else {
cleanupErr = fmt.Errorf("unmounting container %s: %w", c.ID(), err)
}
cleanupErr = err
}
}
if err := c.cleanupOverlayMounts(); err != nil {
// If the container can't remove content report the error
if cleanupErr != nil {
logrus.Errorf("Failed to clean up overlay mounts for %s: %v", c.ID(), err)
cleanupErr = err
} else {
cleanupErr = fmt.Errorf("failed to clean up overlay mounts for %s: %w", c.ID(), err)
}
}
if c.config.Rootfs != "" {
@ -1901,8 +1911,9 @@ func (c *Container) cleanupStorage() error {
} else {
if cleanupErr != nil {
logrus.Errorf("Cleaning up container %s storage: %v", c.ID(), cleanupErr)
} else {
cleanupErr = fmt.Errorf("cleaning up container %s storage: %w", c.ID(), cleanupErr)
}
cleanupErr = err
}
}
@ -1911,9 +1922,10 @@ func (c *Container) cleanupStorage() error {
vol, err := c.runtime.state.Volume(v.Name)
if err != nil {
if cleanupErr != nil {
logrus.Errorf("Unmounting container %s: %v", c.ID(), cleanupErr)
}
logrus.Errorf("Retrieving named volume %s for container %s: %v", v.Name, c.ID(), err)
} else {
cleanupErr = fmt.Errorf("retrieving named volume %s for container %s: %w", v.Name, c.ID(), err)
}
// We need to try and unmount every volume, so continue
// if they fail.
@ -1924,10 +1936,11 @@ func (c *Container) cleanupStorage() error {
vol.lock.Lock()
if err := vol.unmount(false); err != nil {
if cleanupErr != nil {
logrus.Errorf("Unmounting container %s: %v", c.ID(), cleanupErr)
}
logrus.Errorf("Unmounting volume %s for container %s: %v", vol.Name(), c.ID(), err)
} else {
cleanupErr = fmt.Errorf("unmounting volume %s for container %s: %w", vol.Name(), c.ID(), err)
}
}
vol.lock.Unlock()
}
}

2
test/system/251-system-service.bats
View File

@ -15,7 +15,7 @@ function teardown() {
basic_teardown
}
@test "podman systerm service <bad_scheme_uri> returns error" {
@test "podman system service <bad_scheme_uri> returns error" {
skip_if_remote "podman system service unavailable over remote"
run_podman 125 system service localhost:9292
is "$output" "Error: API Service endpoint scheme \"localhost\" is not supported. Try tcp://localhost:9292 or unix:/localhost:9292"

3
test/system/700-play.bats
View File

@ -480,8 +480,7 @@ _EOF
is "$output" ".*Error: inspecting object: no such object: \"test_pod-test\""
run_podman pod rm -a -f
run_podman rm -a -f
run_podman rm -f -t0 myyaml
run_podman rm -a -f -t0
}
@test "podman play with init container" {