Fix typo and nit

Signed-off-by: Min Uk Lee <[email protected]>

Author: minuk-dev

pkg/cmd/container/create.go

@@ -710,7 +710,9 @@ func generateGcFunc(ctx context.Context, container containerd.Container, ns, id,
 		if ipcErr != nil {
 			log.G(ctx).WithError(ipcErr).Warnf("failed to decode ipc label for container %q", id)
 		}
-		ipcutil.CleanUp(ipc)
+		if ipcErr := ipcutil.CleanUp(ipc); ipcErr != nil {
+			log.G(ctx).WithError(ipcErr).Warnf("failed to clean up ipc for container %q", id)
+		}
 		if rmErr := os.RemoveAll(internalLabels.stateDir); rmErr != nil {
 			log.G(ctx).WithError(rmErr).Warnf("failed to remove container %q state dir %q", id, internalLabels.stateDir)
 		}

pkg/containerutil/containerutil.go

@@ -340,12 +340,10 @@ func Stop(ctx context.Context, container containerd.Container, timeout *time.Dur
 	if err != nil {
 		return err
 	}
-	defer ipcutil.CleanUp(ipc)
-
 	// defer umount
 	defer func() {
-		if err != nil {
-			log.G(ctx).Warnf("Cannot unmount shm container %s: %s", container.ID(), err)
+		if err := ipcutil.CleanUp(ipc); err != nil {
+			log.G(ctx).Warnf("failed to clean up IPC  container %s: %s", container.ID(), err)
 		}
 	}()
 

pkg/ipcutil/ipcutil_linux.go

@@ -19,24 +19,24 @@
 package ipcutil
 
 import (
+	"fmt"
 	"os"
-	"strconv"
 
 	"github.com/docker/go-units"
 	"golang.org/x/sys/unix"
 )
 
 // makeShareableDevshm returns devshm directory path on host when there is no error.
-func makeShareableDevshm(shmPath string, shmSize string) error {
+func makeShareableDevshm(shmPath, shmSize string) error {
 	shmproperty := "mode=1777"
 	if len(shmSize) > 0 {
 		shmBytes, err := units.RAMInBytes(shmSize)
 		if err != nil {
 			return err
 		}
-		shmproperty += ",size=" + strconv.FormatInt(shmBytes, 10)
+		shmproperty = fmt.Sprintf("%s,size=%d", shmproperty, shmBytes)
 	}
-	err := os.MkdirAll(shmPath, 0o700)
+	err := os.MkdirAll(shmPath, 0700)
 	if err != nil {
 		return err
 	}

pkg/ipcutil/ipcutil_unix.go

@@ -21,7 +21,7 @@ package ipcutil
 import "fmt"
 
 // makeShareableDevshm returns devshm directory path on host when there is no error.
-func makeShareableDevshm(shmPath string, shmSize string) error {
+func makeShareableDevshm(shmPath, shmSize string) error {
 	return fmt.Errorf("unix does not support shareable devshm")
 }
 

pkg/ipcutil/ipcutil_windows.go

@@ -19,14 +19,14 @@ package ipcutil
 import "fmt"
 
 // makeShareableDevshm returns devshm directory path on host when there is no error.
-func makeShareableDevshm(shmPath string, shmSize string) error {
+func makeShareableDevshm(shmPath, shmSize string) error {
 	return fmt.Errorf("windows does not support shareable devshm")
 }
 
 // cleanUpPlatformSpecificIPC cleans up platform specific IPC.
 func cleanUpPlatformSpecificIPC(ipc IPC) error {
 	if ipc.Mode == Shareable {
-		return fmt.Errorf("unix does not support shareable devshm")
+		return fmt.Errorf("windows does not support shareable devshm")
 	}
 	return nil
 }