projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
5737: Merge branch 'master' into 5737-ruby231
[arvados.git]
/
services
/
keepstore
/
volume_unix.go
diff --git
a/services/keepstore/volume_unix.go
b/services/keepstore/volume_unix.go
index 5239ed37402c93f25af0d6c65c03f6a953597cda..fff02aac260f59a6fc46fc24cbebea57b27e5743 100644
(file)
--- a/
services/keepstore/volume_unix.go
+++ b/
services/keepstore/volume_unix.go
@@
-7,7
+7,6
@@
import (
"fmt"
"io"
"io/ioutil"
"fmt"
"io"
"io/ioutil"
- "log"
"os"
"path/filepath"
"regexp"
"os"
"path/filepath"
"regexp"
@@
-16,6
+15,8
@@
import (
"sync"
"syscall"
"time"
"sync"
"syscall"
"time"
+
+ log "github.com/Sirupsen/logrus"
)
type unixVolumeAdder struct {
)
type unixVolumeAdder struct {
@@
-322,7
+323,12
@@
func (v *UnixVolume) Status() *VolumeStatus {
// uses fs.Blocks - fs.Bfree.
free := fs.Bavail * uint64(fs.Bsize)
used := (fs.Blocks - fs.Bfree) * uint64(fs.Bsize)
// uses fs.Blocks - fs.Bfree.
free := fs.Bavail * uint64(fs.Bsize)
used := (fs.Blocks - fs.Bfree) * uint64(fs.Bsize)
- return &VolumeStatus{v.Root, devnum, free, used}
+ return &VolumeStatus{
+ MountPoint: v.Root,
+ DeviceNum: devnum,
+ BytesFree: free,
+ BytesUsed: used,
+ }
}
var blockDirRe = regexp.MustCompile(`^[0-9a-f]+$`)
}
var blockDirRe = regexp.MustCompile(`^[0-9a-f]+$`)