fix(device): calculate the part free size

jianghushinian · jianghushinian · commit fbab60b8c8f7 · 2022-07-22T21:24:54.000+08:00
Signed-off-by: wangjiaxing &lt;jianghushinian007@163.com&gt;
diff --git a/pkg/device/device-util.go b/pkg/device/device-util.go
@@ -240,7 +240,7 @@ func findBestPart(diskMetaName string, partSize uint64) (string, uint64, error)
 			return pList[i].SizeMiB < pList[j].SizeMiB
 		})
 		for _, tmp := range pList {
-			if tmp.SizeMiB > partSize {
+			if tmp.SizeMiB >= partSize {
 				return tmp.DiskName, tmp.StartMiB, nil
 			}
 		}
@@ -295,7 +295,8 @@ func parsePartFree(row partedOutput) partFree {
 	endMib := math.Floor(float64(row.endBytes) / 1024 / 1024)
 	sizeMib := uint64(0)
 	if endMib > beginMib {
-		sizeMib = uint64(endMib - beginMib)
+		// calculate the part free size, needs increase the difference by 1
+		sizeMib = uint64(math.Floor(float64(row.endBytes-row.beginBytes+1) / 1024 / 1024))
 	}
 
 	return partFree{

Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ func findBestPart(diskMetaName string, partSize uint64) (string, uint64, error)`
`240`	`240`	`return pList[i].SizeMiB < pList[j].SizeMiB`
`241`	`241`	`})`
`242`	`242`	`for _, tmp := range pList {`
`243`		`- if tmp.SizeMiB > partSize {`
	`243`	`+ if tmp.SizeMiB >= partSize {`
`244`	`244`	`return tmp.DiskName, tmp.StartMiB, nil`
`245`	`245`	`}`
`246`	`246`	`}`
`@@ -295,7 +295,8 @@ func parsePartFree(row partedOutput) partFree {`
`295`	`295`	`endMib := math.Floor(float64(row.endBytes) / 1024 / 1024)`
`296`	`296`	`sizeMib := uint64(0)`
`297`	`297`	`if endMib > beginMib {`
`298`		`- sizeMib = uint64(endMib - beginMib)`
	`298`	`+ // calculate the part free size, needs increase the difference by 1`
	`299`	`+ sizeMib = uint64(math.Floor(float64(row.endBytes-row.beginBytes+1) / 1024 / 1024))`
`299`	`300`	`}`
`300`	`301`
`301`	`302`	`return partFree{`