docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8172 from vbatts/vbatts-devmapper_fix_devicset_status_devices 

devmapper: `docker info` devices hard coded
This commit is contained in:
Tibor Vass 2014-09-23 10:28:31 -04:00
parent 3ea5a20776 636e8561a8
commit 9941b03af1
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
daemon/graphdriver/devmapper/deviceset.go
View File

@ -466,7 +466,13 @@ func minor(device uint64) uint64 {
func (devices *DeviceSet) ResizePool(size int64) error { func (devices *DeviceSet) ResizePool(size int64) error {
dirname := devices.loopbackDir() dirname := devices.loopbackDir()
datafilename := path.Join(dirname, "data") datafilename := path.Join(dirname, "data")
if len(devices.dataDevice) > 0 {
datafilename = devices.dataDevice
}
metadatafilename := path.Join(dirname, "metadata") metadatafilename := path.Join(dirname, "metadata")
if len(devices.metadataDevice) > 0 {
metadatafilename = devices.metadataDevice
}
datafile, err := os.OpenFile(datafilename, os.O_RDWR, 0) datafile, err := os.OpenFile(datafilename, os.O_RDWR, 0)
if datafile == nil { if datafile == nil {
@ -1134,8 +1140,16 @@ func (devices *DeviceSet) Status() *Status {
status := &Status{} status := &Status{}
status.PoolName = devices.getPoolName() status.PoolName = devices.getPoolName()
status.DataLoopback = path.Join(devices.loopbackDir(), "data") if len(devices.dataDevice) > 0 {
status.MetadataLoopback = path.Join(devices.loopbackDir(), "metadata") status.DataLoopback = devices.dataDevice
} else {
status.DataLoopback = path.Join(devices.loopbackDir(), "data")
}
if len(devices.metadataDevice) > 0 {
status.MetadataLoopback = devices.metadataDevice
} else {
status.MetadataLoopback = path.Join(devices.loopbackDir(), "metadata")
}
totalSizeInSectors, _, dataUsed, dataTotal, metadataUsed, metadataTotal, err := devices.poolStatus() totalSizeInSectors, _, dataUsed, dataTotal, metadataUsed, metadataTotal, err := devices.poolStatus()
if err == nil { if err == nil {