Merge pull request #2909 from Dingshujie/fix_log_usebytes

bobbypage · web-flow · commit 109af09a78d4 · 2021-08-26T13:55:44.000-07:00
fix when rootfs is empty, TotalUsageBytes will add extraUsage.Bytes on every update, lead to TotalUsageBytes keep increasing
diff --git a/container/common/fsHandler.go b/container/common/fsHandler.go
@@ -96,7 +96,12 @@ func (fh *realFsHandler) update() error {
 		fh.usage.TotalUsageBytes = rootUsage.Bytes
 	}
 	if fh.extraDir != "" && extraErr == nil {
-		fh.usage.TotalUsageBytes += extraUsage.Bytes
+		if fh.rootfs != "" {
+			fh.usage.TotalUsageBytes += extraUsage.Bytes
+		} else {
+			// rootfs is empty, totalUsageBytes use extra usage bytes
+			fh.usage.TotalUsageBytes = extraUsage.Bytes
+		}
 	}
 
 	// Combine errors into a single error to return

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,12 @@ func (fh *realFsHandler) update() error {`
`96`	`96`	`fh.usage.TotalUsageBytes = rootUsage.Bytes`
`97`	`97`	`}`
`98`	`98`	`if fh.extraDir != "" && extraErr == nil {`
`99`		`- fh.usage.TotalUsageBytes += extraUsage.Bytes`
	`99`	`+ if fh.rootfs != "" {`
	`100`	`+ fh.usage.TotalUsageBytes += extraUsage.Bytes`
	`101`	`+ } else {`
	`102`	`+ // rootfs is empty, totalUsageBytes use extra usage bytes`
	`103`	`+ fh.usage.TotalUsageBytes = extraUsage.Bytes`
	`104`	`+ }`
`100`	`105`	`}`
`101`	`106`
`102`	`107`	`// Combine errors into a single error to return`