Move filesystem type discrepancy check into share-manager mount opera…

…tion

Since we do this only for backwards compatibility it should be handled,
by the share-manager instead of the more general mount operation.

Longhorn #2991

Signed-off-by: Joshua Moody <joshua.moody@suse.com>

pkg/server/share_manager.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os/exec"
 	"path/filepath"
+	"strings"
 	"time"
 
 	"github.com/sirupsen/logrus"
@@ -80,7 +81,7 @@ func (m *ShareManager) Run() error {
 				return err
 			}
 
-			if err := volume.MountVolume(devicePath, mountPath, vol.FsType, vol.MountOptions); err != nil {
+			if err := mountVolume(m.logger, vol, devicePath, mountPath); err != nil {
 				m.logger.WithError(err).Warn("failed to mount volume")
 				return err
 			}
@@ -155,6 +156,29 @@ func tearDownDevice(logger logrus.FieldLogger, vol volume.Volume) error {
 	return nil
 }
 
+func mountVolume(logger logrus.FieldLogger, vol volume.Volume, devicePath, mountPath string) error {
+	fsType := vol.FsType
+	mountOptions := vol.MountOptions
+
+	// https://github.com/longhorn/longhorn/issues/2991
+	// pre v1.2 we ignored the fsType and always formatted as ext4
+	// after v1.2 we include the user specified fsType to be able to
+	// mount priorly created volumes we need to switch to the existing fsType
+	diskFormat, err := volume.GetDiskFormat(devicePath)
+	if err != nil {
+		logger.WithError(err).Error("failed to evaluate disk format")
+		return err
+	}
+
+	// `unknown data, probably partitions` is used when the disk contains a partition table
+	if diskFormat != "" && !strings.Contains(diskFormat, "unknown data") && fsType != diskFormat {
+		logger.Warnf("disk is already formatted to %v but user requested fs is %v using existing device fs type for mount", diskFormat, fsType)
+		fsType = diskFormat
+	}
+
+	return volume.MountVolume(devicePath, mountPath, fsType, mountOptions)
+}
+
 func (m *ShareManager) runHealthCheck() {
 	m.logger.Info("starting health check for volume")
 	ticker := time.NewTicker(healthCheckInterval)

pkg/volume/volume.go

@@ -3,7 +3,6 @@ package volume
 import (
 	"fmt"
 	"os"
-	"strings"
 
 	"k8s.io/kubernetes/pkg/volume/util/hostutil"
 	utilexec "k8s.io/utils/exec"
@@ -45,20 +44,6 @@ func MountVolume(devicePath, mountPath, fsType string, mountOptions []string) er
 		return nil
 	}
 
-	// https://github.com/longhorn/longhorn/issues/2991
-	// pre v1.2 we ignored the fsType and always formatted as ext4
-	// after v1.2 we include the user specified fsType to be able to
-	// mount priorly created volumes we need to switch to the existing fsType
-	diskFormat, err := GetDiskFormat(devicePath)
-	if err != nil {
-		return err
-	}
-
-	// `unknown data, probably partitions` is used when the disk contains a partition table
-	if diskFormat != "" && !strings.Contains(diskFormat, "unknown data") && fsType != diskFormat {
-		fsType = diskFormat
-	}
-
 	mounter := &mount.SafeFormatAndMount{Interface: mount.New(""), Exec: utilexec.New()}
 
 	if exists, err := hostutil.NewHostUtil().PathExists(mountPath); !exists || err != nil {