Merge pull request #29439 from matttproud/cleanups_volumeflocker

Automatic merge from submit-queue volume/flocker: plug time.Ticker resource leak This commit ensures that `flockerMounter.updateDatasetPrimary` does not leak running `time.Ticker` instances. Upon termination of the consuming routine, we stop the tickers. ```release-note * flockerMounter.updateDatasetPrimary no longer leaks running time.Ticker instances. Upon termination of the consuming routine, we stop the tickers. ```

Merge pull request #29439 from matttproud/cleanups_volumeflocker
75c93b40 · k8s-merge-robot · GitHub · ab7d039c · dbba1347 · 75c93b40
Commit 75c93b40 authored Jul 27, 2016 by k8s-merge-robot Committed by GitHub Jul 27, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

plugin.go pkg/volume/flocker/plugin.go +6 -4

No files found.
--- a/pkg/volume/flocker/plugin.go
+++ b/pkg/volume/flocker/plugin.go
@@ -223,8 +223,10 @@ func (b flockerMounter) updateDatasetPrimary(datasetID, primaryUUID string) erro
 		return err
 	}

-	timeoutChan := time.NewTimer(timeoutWaitingForVolume).C
-	tickChan := time.NewTicker(tickerWaitingForVolume).C
+	timeoutChan := time.NewTimer(timeoutWaitingForVolume)
+	defer timeoutChan.Stop()
+	tickChan := time.NewTicker(tickerWaitingForVolume)
+	defer tickChan.Stop()

 	for {
 		if s, err := b.client.GetDatasetState(datasetID); err == nil && s.Primary == primaryUUID {
@@ -232,12 +234,12 @@ func (b flockerMounter) updateDatasetPrimary(datasetID, primaryUUID string) erro
 		}

 		select {
-		case <-timeoutChan:
+		case <-timeoutChan.C:
 			return fmt.Errorf(
 				"Timed out waiting for the dataset_id: '%s' to be moved to the primary: '%s'\n%v",
 				datasetID, primaryUUID, err,
 			)
-		case <-tickChan:
+		case <-tickChan.C:
 			break
 		}
 	}