umount when volume is broken

hervenicol · Jul 19, 2021 · 62011b6 · 62011b6
1 parent 7959a44
commit 62011b6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## v0.8.0
+* fix did not umount when volume is broken
+
 ## v0.7.0
 
 * fix label too long errors at mkfs

diff --git a/plugin.go b/plugin.go
@@ -398,7 +398,9 @@ func (d plugin) Unmount(r *volume.UnmountRequest) error {
 		logger.WithError(err).Errorf("Error checking directory stat: %s", path)
 	}
 
-	if exists {
+	// error with "stats" usually means it exists but we can't reach it
+	// that means mounted but broken. So we must unmount it.
+	if exists || (err != nil) {
 		err = syscall.Unmount(path, 0)
 		if err != nil {
 			logger.WithError(err).Errorf("Error unmount %s", path)
@@ -407,7 +409,7 @@ func (d plugin) Unmount(r *volume.UnmountRequest) error {
 
 	vol, err := d.getByName(r.Name)
 	if err != nil {
-		logger.WithError(err).Error("Error retriving volume")
+		logger.WithError(err).Error("Error retrieving volume")
 	} else {
 		_, err = d.detachVolume(logger.Context, vol)
 		if err != nil {