modify mount and umount

cmd/sealer/cmd/alpha/mount.go

@@ -195,21 +195,21 @@ func (m MountService) Mount(imageNameOrID []string) error {
 		ok := utilsstrings.IsInSlice(imageID, imageIDList)
 		if ok {
 			logrus.Infof("this image has already been mounted, please do not repeat the operation")
-		} else {
-			cid, err := m.engine.CreateContainer(&options.FromOptions{
-				Image: imageID,
-				Quiet: false,
-			})
-			if err != nil {
-				return err
-			}
-			mounts, err := m.engine.Mount(&options.MountOptions{Containers: []string{cid}})
-			if err != nil {
-				return err
-			}
-			mountPoint := mounts[0].MountPoint
-			logrus.Infof("mount cluster image %s to %s successful", name, mountPoint)
+			continue
+		}
+		cid, err := m.engine.CreateContainer(&options.FromOptions{
+			Image: imageID,
+			Quiet: false,
+		})
+		if err != nil {
+			return err
+		}
+		mounts, err := m.engine.Mount(&options.MountOptions{Containers: []string{cid}})
+		if err != nil {
+			return err
 		}
+		mountPoint := mounts[0].MountPoint
+		logrus.Infof("mount cluster image %s to %s successful", name, mountPoint)
 	}
 	return nil
 }

cmd/sealer/cmd/alpha/umount.go

@@ -17,7 +17,6 @@ package alpha
 import (
 	"context"
 	"fmt"
-	"os"
 
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -27,7 +26,6 @@ import (
 
 var (
 	umountAll bool
-	lastError error
 
 	longUmountCmdDescription = `
 umount the cluster image and delete the mount directory
@@ -65,16 +63,17 @@ func NewUmountCmd() *cobra.Command {
 				return nil
 			}
 
-			umountInfo.Umount(args)
+			if err := umountInfo.Umount(args); err != nil {
+				return err
+			}
 			return nil
 		},
 	}
 	umountCmd.Flags().BoolVarP(&umountAll, "all", "a", false, "umount all cluster image directories")
 	return umountCmd
 }
 
-func (m MountService) Umount(imageNameOrID []string) {
-	var lastError error
+func (m MountService) Umount(imageNameOrID []string) error {
 	for _, name := range imageNameOrID {
 		var containerID string
 		if ok := m.IsContainImgName(name); !ok {
@@ -85,25 +84,15 @@ func (m MountService) Umount(imageNameOrID []string) {
 
 		client, err := buildah.OpenBuilder(context.TODO(), m.store, containerID)
 		if err != nil {
-			if lastError != nil {
-				fmt.Fprintln(os.Stderr, lastError)
-			}
-			lastError = fmt.Errorf("failed to unmount image %s: %w", name, err)
-			continue
-		}
-		if client.MountPoint == "" {
-			continue
+			return fmt.Errorf("failed to unmount image %s: %w", name, err)
 		}
 
-		if err = client.Unmount(); err != nil {
-			if lastError != nil {
-				fmt.Fprintln(os.Stderr, lastError)
-			}
-			lastError = fmt.Errorf("failed to unmount container %q: %w", client.Container, err)
-			continue
+		if err := client.Unmount(); err != nil {
+			return fmt.Errorf("failed to unmount container %q: %w", client.Container, err)
 		}
 		logrus.Infof("umount %s successful", name)
 	}
+	return nil
 }
 
 func (m MountService) getContainerID(imageName string) string {
@@ -126,12 +115,8 @@ func (m MountService) UmountAllContainers() error {
 			continue
 		}
 
-		if err = client.Unmount(); err != nil {
-			if lastError != nil {
-				fmt.Fprintln(os.Stderr, lastError)
-			}
-			lastError = fmt.Errorf("failed to unmount container %q: %w", client.Container, err)
-			continue
+		if err := client.Unmount(); err != nil {
+			return fmt.Errorf("failed to unmount container %q: %w", client.Container, err)
 		}
 	}
 	return nil