Merge pull request #35314 from thaJeztah/improve-devicemapper-info
Improve devicemapper driver-status output
diff --git a/daemon/graphdriver/devmapper/driver.go b/daemon/graphdriver/devmapper/driver.go
index f41afa2..b485096 100644
--- a/daemon/graphdriver/devmapper/driver.go
+++ b/daemon/graphdriver/devmapper/driver.go
@@ -73,19 +73,14 @@
{"Pool Blocksize", units.HumanSize(float64(s.SectorSize))},
{"Base Device Size", units.HumanSize(float64(s.BaseDeviceSize))},
{"Backing Filesystem", s.BaseDeviceFS},
- {"Data file", s.DataFile},
- {"Metadata file", s.MetadataFile},
- {"Data Space Used", units.HumanSize(float64(s.Data.Used))},
- {"Data Space Total", units.HumanSize(float64(s.Data.Total))},
- {"Data Space Available", units.HumanSize(float64(s.Data.Available))},
- {"Metadata Space Used", units.HumanSize(float64(s.Metadata.Used))},
- {"Metadata Space Total", units.HumanSize(float64(s.Metadata.Total))},
- {"Metadata Space Available", units.HumanSize(float64(s.Metadata.Available))},
- {"Thin Pool Minimum Free Space", units.HumanSize(float64(s.MinFreeSpace))},
{"Udev Sync Supported", fmt.Sprintf("%v", s.UdevSyncSupported)},
- {"Deferred Removal Enabled", fmt.Sprintf("%v", s.DeferredRemoveEnabled)},
- {"Deferred Deletion Enabled", fmt.Sprintf("%v", s.DeferredDeleteEnabled)},
- {"Deferred Deleted Device Count", fmt.Sprintf("%v", s.DeferredDeletedDeviceCount)},
+ }
+
+ if len(s.DataFile) > 0 {
+ status = append(status, [2]string{"Data file", s.DataFile})
+ }
+ if len(s.MetadataFile) > 0 {
+ status = append(status, [2]string{"Metadata file", s.MetadataFile})
}
if len(s.DataLoopback) > 0 {
status = append(status, [2]string{"Data loop file", s.DataLoopback})
@@ -93,6 +88,20 @@
if len(s.MetadataLoopback) > 0 {
status = append(status, [2]string{"Metadata loop file", s.MetadataLoopback})
}
+
+ status = append(status, [][2]string{
+ {"Data Space Used", units.HumanSize(float64(s.Data.Used))},
+ {"Data Space Total", units.HumanSize(float64(s.Data.Total))},
+ {"Data Space Available", units.HumanSize(float64(s.Data.Available))},
+ {"Metadata Space Used", units.HumanSize(float64(s.Metadata.Used))},
+ {"Metadata Space Total", units.HumanSize(float64(s.Metadata.Total))},
+ {"Metadata Space Available", units.HumanSize(float64(s.Metadata.Available))},
+ {"Thin Pool Minimum Free Space", units.HumanSize(float64(s.MinFreeSpace))},
+ {"Deferred Removal Enabled", fmt.Sprintf("%v", s.DeferredRemoveEnabled)},
+ {"Deferred Deletion Enabled", fmt.Sprintf("%v", s.DeferredDeleteEnabled)},
+ {"Deferred Deleted Device Count", fmt.Sprintf("%v", s.DeferredDeletedDeviceCount)},
+ }...)
+
if vStr, err := devicemapper.GetLibraryVersion(); err == nil {
status = append(status, [2]string{"Library Version", vStr})
}
