Merge pull request #355 from areed/fs-perf-fix-timeout

areed · web-flow · commit 822ada99a2f4 · 2021-04-13T12:05:54.000-07:00
Fix background IOPS blocking until timeout
diff --git a/pkg/collect/host_filesystem_performance_linux.go b/pkg/collect/host_filesystem_performance_linux.go
@@ -97,6 +97,7 @@ func collectHostFilesystemPerformance(hostCollector *troubleshootv1beta2.Filesys
 		jobs := hostCollector.BackgroundReadIOPSJobs + hostCollector.BackgroundWriteIOPSJobs
 		done := make(chan bool, jobs)
 		defer func() {
+			cancel()
 			for i := 0; i < jobs; i++ {
 				<-done
 			}

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,7 @@ func collectHostFilesystemPerformance(hostCollector *troubleshootv1beta2.Filesys`
`97`	`97`	`jobs := hostCollector.BackgroundReadIOPSJobs + hostCollector.BackgroundWriteIOPSJobs`
`98`	`98`	`done := make(chan bool, jobs)`
`99`	`99`	`defer func() {`
	`100`	`+ cancel()`
`100`	`101`	`for i := 0; i < jobs; i++ {`
`101`	`102`	`<-done`
`102`	`103`	`}`