Merge pull request containerd#93 from sofat1989/master

fuweid · web-flow · commit c4b9ac5c7601 · 2019-07-16T23:03:53.000-04:00
avoid adding io_serviced and io_service_bytes duplicately
diff --git a/blkio.go b/blkio.go
@@ -86,6 +86,7 @@ func (b *blkioController) Stat(path string, stats *Metrics) error {
 	}
 	// Try to read CFQ stats available on all CFQ enabled kernels first
 	if _, err := os.Lstat(filepath.Join(b.Path(path), fmt.Sprintf("blkio.io_serviced_recursive"))); err == nil {
+		settings = []blkioStatSettings{}
 		settings = append(settings,
 			blkioStatSettings{
 				name:  "sectors_recursive",

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ func (b blkioController) Stat(path string, stats Metrics) error {`
`86`	`86`	`}`
`87`	`87`	`// Try to read CFQ stats available on all CFQ enabled kernels first`
`88`	`88`	`if _, err := os.Lstat(filepath.Join(b.Path(path), fmt.Sprintf("blkio.io_serviced_recursive"))); err == nil {`
	`89`	`+ settings = []blkioStatSettings{}`
`89`	`90`	`settings = append(settings,`
`90`	`91`	`blkioStatSettings{`
`91`	`92`	`name: "sectors_recursive",`