fix: detect a filesystem type in cross-platform builds (#268)

Author: agneum

pkg/services/provision/pool/block_devices.go

@@ -8,15 +8,10 @@ package pool
 import (
 	"encoding/json"
 	"os/exec"
-	"strconv"
 
 	"github.com/pkg/errors"
 )
 
-var fsTypeToString = map[string]string{
-	"ef53":     ext4,
-	"2fc12fc1": ZFS,
-}
 
 type blockDeviceList struct {
 	BlockDevices []blockDevice `json:"blockdevices"`
@@ -27,11 +22,6 @@ type blockDevice struct {
 	MountPoint string `json:"mountpoint"`
 }
 
-// detectFSType detects the filesystem type of the underlying mounted filesystem.
-func detectFSType(fsType int64) string {
-	return fsTypeToString[strconv.FormatInt(fsType, 16)]
-}
-
 // getBlockDeviceTypes returns a filesystem type list of mounted block devices.
 func getBlockDeviceTypes() (map[string]string, error) {
 	output, err := exec.Command("lsblk", "--json", "--output", "type,mountpoint").Output()

pkg/services/provision/pool/fstype_bsd.go

@@ -0,0 +1,38 @@
+// +build darwin freebsd dragonfly openbsd solaris
+
+/*
+2020 © Postgres.ai
+*/
+
+// Package pool provides components to work with storage pools.
+package pool
+
+import (
+	"syscall"
+)
+
+func (pm *Manager) getFSInfo(path string) (string, error) {
+	fs := syscall.Statfs_t{}
+	if err := syscall.Statfs(path, &fs); err != nil {
+		return "", err
+	}
+
+	fsType := detectFSType(fs.Fstypename[:])
+	if fsType == ext4 {
+		// cannot detect LVM checking the blockDeviceTypes map.
+		return LVM, nil
+	}
+
+	return fsType, nil
+}
+
+// detectFSType detects the filesystem type of the underlying mounted filesystem.
+func detectFSType(fsType []int8) string {
+	fsTypeBytes := make([]byte, 0, len(fsType))
+
+	for _, v := range fsType {
+		fsTypeBytes = append(fsTypeBytes, byte(v))
+	}
+
+	return string(fsTypeBytes)
+}

pkg/services/provision/pool/fstype_linux.go

@@ -0,0 +1,38 @@
+// +build linux,!s390x,!arm,!386
+
+/*
+2020 © Postgres.ai
+*/
+
+// Package pool provides components to work with storage pools.
+package pool
+
+import (
+	"strconv"
+	"syscall"
+)
+
+var fsTypeToString = map[string]string{
+	"ef53":     ext4,
+	"2fc12fc1": ZFS,
+}
+
+func (pm *Manager) getFSInfo(path string) (string, error) {
+	fs := syscall.Statfs_t{}
+	if err := syscall.Statfs(path, &fs); err != nil {
+		return "", err
+	}
+
+	fsType := detectFSType(fs.Type)
+	if fsType == ext4 {
+		// cannot detect LVM checking the blockDeviceTypes map.
+		return LVM, nil
+	}
+
+	return fsType, nil
+}
+
+// detectFSType detects the filesystem type of the underlying mounted filesystem.
+func detectFSType(fsType int64) string {
+	return fsTypeToString[strconv.FormatInt(fsType, 16)]
+}

pkg/services/provision/pool/fstype_windows.go

@@ -0,0 +1,13 @@
+// +build windows
+
+/*
+2020 © Postgres.ai
+*/
+
+// Package pool provides components to work with storage pools.
+package pool
+
+func (pm *Manager) getFSInfo(path string) (string, error) {
+	// Not supported for windows.
+	return "", nil
+}

pkg/services/provision/pool/pool_manager.go

@@ -10,7 +10,6 @@ import (
 	"os"
 	"path"
 	"sync"
-	"syscall"
 	"time"
 
 	"github.com/pkg/errors"
@@ -284,21 +283,6 @@ func extractDataStateAt(dataPath string) (*time.Time, error) {
 	return &dsa, nil
 }
 
-func (pm *Manager) getFSInfo(path string) (string, error) {
-	fs := syscall.Statfs_t{}
-	if err := syscall.Statfs(path, &fs); err != nil {
-		return "", err
-	}
-
-	fsType := detectFSType(fs.Type)
-	if fsType == ext4 {
-		// cannot detect LVM checking the blockDeviceTypes map.
-		return LVM, nil
-	}
-
-	return fsType, nil
-}
-
 func (pm *Manager) describeAvailablePools() []string {
 	availablePools := []string{}