From 318d679bff441888f35570507c58676a61938ecc Mon Sep 17 00:00:00 2001 From: Zexi Li Date: Wed, 25 Sep 2024 21:17:48 +0800 Subject: [PATCH] fix(host): wrap cephfs umount error (#21298) --- pkg/hostman/container/volume_mount/cephfs.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkg/hostman/container/volume_mount/cephfs.go b/pkg/hostman/container/volume_mount/cephfs.go index 554bba4cff..22cb616d40 100644 --- a/pkg/hostman/container/volume_mount/cephfs.go +++ b/pkg/hostman/container/volume_mount/cephfs.go @@ -53,14 +53,15 @@ func (h cephFS) Mount(pod IPodInfo, ctrId string, vm *hostapi.ContainerVolumeMou func (h cephFS) Unmount(pod IPodInfo, ctrId string, vm *hostapi.ContainerVolumeMount) error { dir, err := h.GetRuntimeMountHostPath(pod, ctrId, vm) if err != nil { - return err + return errors.Wrap(err, "GetRuntimeMountHostPath") } - err = container_storage.Unmount(dir) - if err != nil { + if err := container_storage.Unmount(dir); err != nil { return errors.Wrapf(err, "unmount %s", dir) } - _, err = procutils.NewRemoteCommandAsFarAsPossible("rm", "-f", dir).Output() - return err + if out, err := procutils.NewRemoteCommandAsFarAsPossible("rm", "-f", dir).Output(); err != nil { + return errors.Wrapf(err, "rm -f %s: %s", dir, string(out)) + } + return nil } func newCephFS() IVolumeMount {