feat: add value of used filesystem space to API instance status

agneum · agneum · commit ee359b204076 · 2020-08-26T21:26:35.000+07:00
diff --git a/pkg/models/fs.go b/pkg/models/fs.go
@@ -7,4 +7,5 @@ package models
 type FileSystem struct {
 	Size uint64 `json:"size"`
 	Free uint64 `json:"free"`
+	Used uint64 `json:"used"`
 }
diff --git a/pkg/services/cloning/mode_base.go b/pkg/services/cloning/mode_base.go
@@ -322,6 +322,7 @@ func (c *baseCloning) GetInstanceState() (*models.InstanceStatus, error) {
 
 	c.instanceStatus.FileSystem.Size = disk.Size
 	c.instanceStatus.FileSystem.Free = disk.Free
+	c.instanceStatus.FileSystem.Used = disk.Used
 	c.instanceStatus.DataSize = disk.DataSize
 	c.instanceStatus.ExpectedCloningTime = c.getExpectedCloningTime()
 	c.instanceStatus.Clones = c.GetClones()
diff --git a/pkg/services/provision/resources/resources.go b/pkg/services/provision/resources/resources.go
@@ -32,6 +32,7 @@ type Session struct {
 type Disk struct {
 	Size     uint64
 	Free     uint64
+	Used     uint64
 	DataSize uint64
 }
 
diff --git a/pkg/services/provision/thinclones/manager_zfs.go b/pkg/services/provision/thinclones/manager_zfs.go
@@ -128,6 +128,7 @@ func (m *managerZFS) GetDiskState() (*resources.Disk, error) {
 	disk := &resources.Disk{
 		Size:     parentPoolEntry.Available + parentPoolEntry.Used,
 		Free:     parentPoolEntry.Available,
+		Used:     parentPoolEntry.Used,
 		DataSize: poolEntry.LogicalReferenced,
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,7 @@ func (m managerZFS) GetDiskState() (resources.Disk, error) {`
`128`	`128`	`disk := &resources.Disk{`
`129`	`129`	`Size: parentPoolEntry.Available + parentPoolEntry.Used,`
`130`	`130`	`Free: parentPoolEntry.Available,`
	`131`	`+ Used: parentPoolEntry.Used,`
`131`	`132`	`DataSize: poolEntry.LogicalReferenced,`
`132`	`133`	`}`
`133`	`134`