Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: Type-convert fs.Bavail for portability (#19816) 

Prior to this patch, DiskUsage() would calculate bytes available
by multiplying blocks available by block size in bytes:

  disk.Avail = fs.Bavail * uint64(fs.Bsize)

Under some versions of Unix, fs.Bavail is of type uint64 and on
others (like FreeBSD) it is of type int64.

This causes a compile time error:

  $ go build
  # github.com/influxdata/influxdb/v2/pkg/fs
  ./fs_unix.go:81:25: invalid operation: fs.Bavail * uint64(fs.Bsize) (mismatched types int64 and uint64)

This patch type-converts fs.Bavail to unit64 to ensure that all
types in the expression align.

This prevents compile time errors under FreeBSD and other platforms
where fs.Bavail isn't uint64.
pull/19825/head
Ayan George 2020-10-26 05:32:04 -04:00 committed by GitHub
parent b7ac9f07be
commit bd47d8efe1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/fs/fs_unix.go
View File

@ -71,14 +71,14 @@ func CreateFile(newpath string) (*os.File, error) {
// DiskUsage returns disk usage of disk of path
func DiskUsage(path string) (*DiskStatus, error) {
var disk DiskStatus
fs := unix.Statfs_t{}
err := unix.Statfs(path, &fs)
if err != nil {
if err := unix.Statfs(path, &fs); err != nil {
return nil, err
}
var disk DiskStatus
disk.All = fs.Blocks * uint64(fs.Bsize)
disk.Avail = fs.Bavail * uint64(fs.Bsize)
disk.Avail = uint64(fs.Bavail) * uint64(fs.Bsize)
disk.Free = fs.Bfree * uint64(fs.Bsize)
disk.Used = disk.All - disk.Free
return &disk, nil