Commit fabc9c1

committed

Merge branch '268-detect-fs-type' into 'master'

fix: detect a filesystem type in cross-platform builds (#268) Closes #268 See merge request postgres-ai/database-lab!295

2 parents 4ec1858 + 14b3d6f commit fabc9c1Copy full SHA for fabc9c1

File tree

+89

-26

lines changed

+89

-26

lines changed

Lines changed: 0 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,15 +8,10 @@ package pool`
`8`	`8`	`import (`
`9`	`9`	`"encoding/json"`
`10`	`10`	`"os/exec"`
`11`		`- "strconv"`
`12`	`11`
`13`	`12`	`"github.com/pkg/errors"`
`14`	`13`	`)`
`15`	`14`
`16`		`-var fsTypeToString = map[string]string{`
`17`		`- "ef53": ext4,`
`18`		`- "2fc12fc1": ZFS,`
`19`		`-}`
`20`	`15`
`21`	`16`	`type blockDeviceList struct {`
`22`	`17`	BlockDevices []blockDevice `json:"blockdevices"`
`@@ -27,11 +22,6 @@ type blockDevice struct {`
`27`	`22`	MountPoint string `json:"mountpoint"`
`28`	`23`	`}`
`29`	`24`
`30`		`-// detectFSType detects the filesystem type of the underlying mounted filesystem.`
`31`		`-func detectFSType(fsType int64) string {`
`32`		`- return fsTypeToString[strconv.FormatInt(fsType, 16)]`
`33`		`-}`
`34`		`-`
`35`	`25`	`// getBlockDeviceTypes returns a filesystem type list of mounted block devices.`
`36`	`26`	`func getBlockDeviceTypes() (map[string]string, error) {`
`37`	`27`	`output, err := exec.Command("lsblk", "--json", "--output", "type,mountpoint").Output()`

Lines changed: 38 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,38 @@`
	`1`	`+// +build darwin freebsd dragonfly openbsd solaris`
	`2`	`+`
	`3`	`+/*`
	`4`	`+2020 © Postgres.ai`
	`5`	`+*/`
	`6`	`+`
	`7`	`+// Package pool provides components to work with storage pools.`
	`8`	`+package pool`
	`9`	`+`
	`10`	`+import (`
	`11`	`+ "syscall"`
	`12`	`+)`
	`13`	`+`
	`14`	`+func (pm *Manager) getFSInfo(path string) (string, error) {`
	`15`	`+ fs := syscall.Statfs_t{}`
	`16`	`+ if err := syscall.Statfs(path, &fs); err != nil {`
	`17`	`+ return "", err`
	`18`	`+ }`
	`19`	`+`
	`20`	`+ fsType := detectFSType(fs.Fstypename[:])`
	`21`	`+ if fsType == ext4 {`
	`22`	`+ // cannot detect LVM checking the blockDeviceTypes map.`
	`23`	`+ return LVM, nil`
	`24`	`+ }`
	`25`	`+`
	`26`	`+ return fsType, nil`
	`27`	`+}`
	`28`	`+`
	`29`	`+// detectFSType detects the filesystem type of the underlying mounted filesystem.`
	`30`	`+func detectFSType(fsType []int8) string {`
	`31`	`+ fsTypeBytes := make([]byte, 0, len(fsType))`
	`32`	`+`
	`33`	`+ for _, v := range fsType {`
	`34`	`+ fsTypeBytes = append(fsTypeBytes, byte(v))`
	`35`	`+ }`
	`36`	`+`
	`37`	`+ return string(fsTypeBytes)`
	`38`	`+}`

Lines changed: 38 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,38 @@`
	`1`	`+// +build linux,!s390x,!arm,!386`
	`2`	`+`
	`3`	`+/*`
	`4`	`+2020 © Postgres.ai`
	`5`	`+*/`
	`6`	`+`
	`7`	`+// Package pool provides components to work with storage pools.`
	`8`	`+package pool`
	`9`	`+`
	`10`	`+import (`
	`11`	`+ "strconv"`
	`12`	`+ "syscall"`
	`13`	`+)`
	`14`	`+`
	`15`	`+var fsTypeToString = map[string]string{`
	`16`	`+ "ef53": ext4,`
	`17`	`+ "2fc12fc1": ZFS,`
	`18`	`+}`
	`19`	`+`
	`20`	`+func (pm *Manager) getFSInfo(path string) (string, error) {`
	`21`	`+ fs := syscall.Statfs_t{}`
	`22`	`+ if err := syscall.Statfs(path, &fs); err != nil {`
	`23`	`+ return "", err`
	`24`	`+ }`
	`25`	`+`
	`26`	`+ fsType := detectFSType(fs.Type)`
	`27`	`+ if fsType == ext4 {`
	`28`	`+ // cannot detect LVM checking the blockDeviceTypes map.`
	`29`	`+ return LVM, nil`
	`30`	`+ }`
	`31`	`+`
	`32`	`+ return fsType, nil`
	`33`	`+}`
	`34`	`+`
	`35`	`+// detectFSType detects the filesystem type of the underlying mounted filesystem.`
	`36`	`+func detectFSType(fsType int64) string {`
	`37`	`+ return fsTypeToString[strconv.FormatInt(fsType, 16)]`
	`38`	`+}`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,13 @@`
	`1`	`+// +build windows`
	`2`	`+`
	`3`	`+/*`
	`4`	`+2020 © Postgres.ai`
	`5`	`+*/`
	`6`	`+`
	`7`	`+// Package pool provides components to work with storage pools.`
	`8`	`+package pool`
	`9`	`+`
	`10`	`+func (pm *Manager) getFSInfo(path string) (string, error) {`
	`11`	`+ // Not supported for windows.`
	`12`	`+ return "", nil`
	`13`	`+}`

Lines changed: 0 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ import (`
`10`	`10`	`"os"`
`11`	`11`	`"path"`
`12`	`12`	`"sync"`
`13`		`- "syscall"`
`14`	`13`	`"time"`
`15`	`14`
`16`	`15`	`"github.com/pkg/errors"`
`@@ -284,21 +283,6 @@ func extractDataStateAt(dataPath string) (*time.Time, error) {`
`284`	`283`	`return &dsa, nil`
`285`	`284`	`}`
`286`	`285`
`287`		`-func (pm *Manager) getFSInfo(path string) (string, error) {`
`288`		`- fs := syscall.Statfs_t{}`
`289`		`- if err := syscall.Statfs(path, &fs); err != nil {`
`290`		`- return "", err`
`291`		`- }`
`292`		`-`
`293`		`- fsType := detectFSType(fs.Type)`
`294`		`- if fsType == ext4 {`
`295`		`- // cannot detect LVM checking the blockDeviceTypes map.`
`296`		`- return LVM, nil`
`297`		`- }`
`298`		`-`
`299`		`- return fsType, nil`
`300`		`-}`
`301`		`-`
`302`	`286`	`func (pm *Manager) describeAvailablePools() []string {`
`303`	`287`	`availablePools := []string{}`
`304`	`288`

Comments

(0)