luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Improve error messages.

This commit is contained in:
Chris Hines 2015-12-09 16:34:18 -05:00
parent 6697980331
commit 53ecc03022
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client/fingerprint/storage.go
View File

@ -10,6 +10,8 @@ import (
"github.com/hashicorp/nomad/nomad/structs"
)
const bytesPerMegabyte = 1024 * 1024
// StorageFingerprint is used to measure the amount of storage free for
// applications that the Nomad agent will run on this machine.
type StorageFingerprint struct {
@ -38,21 +40,20 @@ func (f *StorageFingerprint) Fingerprint(cfg *config.Config, node *structs.Node)
var err error
storageDir, err = os.Getwd()
if err != nil {
return false, fmt.Errorf("Unable to get CWD from filesystem: %s", err)
return false, fmt.Errorf("unable to get CWD from filesystem: %s", err)
}
}
volume, total, free, err := f.diskFree(storageDir)
if err != nil {
return false, err
return false, fmt.Errorf("failed to determine disk space for %s: %v", storageDir, err)
}
node.Attributes["storage.volume"] = volume
node.Attributes["storage.bytestotal"] = strconv.FormatUint(total, 10)
node.Attributes["storage.bytesfree"] = strconv.FormatUint(free, 10)
const mb = 1024 * 1024
node.Resources.DiskMB = int(free / mb)
node.Resources.DiskMB = int(free / bytesPerMegabyte)
return true, nil
}

4
client/fingerprint/storage_windows.go
View File

@ -22,11 +22,11 @@ func (f *StorageFingerprint) diskFree(path string) (volume string, total, free u
absPathp, err := syscall.UTF16PtrFromString(absPath)
if err != nil {
return "", 0, 0, fmt.Errorf("failed to determine disk space for %s: %v", absPath, err)
return "", 0, 0, fmt.Errorf("failed to convert \"%s\" to UTF16: %v", absPath, err)
}
if err := getDiskFreeSpaceEx(absPathp, nil, &total, &free); err != nil {
return "", 0, 0, fmt.Errorf("failed to determine disk space for %s: %v", absPath, err)
return "", 0, 0, fmt.Errorf("failed to get free disk space for %s: %v", absPath, err)
}
return volume, total, free, nil