Merge pull request #469 from ctrlaltdel121/master

stop tickers in defer to prevent leak

Author: Kazuyoshi Kato

internal/psutil.go

@@ -30,7 +30,9 @@ func WaitForProcessToExist(
 	queryInterval time.Duration,
 	matcher func(context.Context, *process.Process) (bool, error),
 ) ([]*process.Process, error) {
-	for range time.NewTicker(queryInterval).C {
+	ticker := time.NewTicker(queryInterval)
+	defer ticker.Stop()
+	for range ticker.C {
 		select {
 		case <-ctx.Done():
 			return nil, ctx.Err()
@@ -63,7 +65,9 @@ func WaitForProcessToExist(
 // WaitForPidToExit queries running processes every `queryInterval` duration, blocking until the provided pid is found
 // to not exist or the context is canceled.
 func WaitForPidToExit(ctx context.Context, queryInterval time.Duration, pid int32) error {
-	for range time.NewTicker(queryInterval).C {
+	ticker := time.NewTicker(queryInterval)
+	defer ticker.Stop()
+	for range ticker.C {
 		select {
 		case <-ctx.Done():
 			return ctx.Err()
@@ -138,7 +142,9 @@ func sampleCPUTimes(ctx context.Context, sampleInterval time.Duration) <-chan *c
 		defer close(returnCh)
 
 		var index int
-		for range time.NewTicker(sampleInterval).C {
+		ticker := time.NewTicker(sampleInterval)
+		defer ticker.Stop()
+		for range ticker.C {
 			select {
 			case <-ctx.Done():
 				return

internal/vm/vsock.go

@@ -38,7 +38,9 @@ const (
 // path and port. It will retry connect attempts if a temporary error is encountered (up
 // to a fixed timeout) or the provided request is canceled.
 func VSockDial(ctx context.Context, logger *logrus.Entry, udsPath string, port uint32) (net.Conn, error) {
-	tickerCh := time.NewTicker(vsockRetryInterval).C
+	ticker := time.NewTicker(vsockRetryInterval)
+	defer ticker.Stop()
+	tickerCh := ticker.C
 	var attemptCount int
 	for {
 		attemptCount++
@@ -92,7 +94,9 @@ func (l vsockListener) Accept() (net.Conn, error) {
 	defer cancel()
 
 	var attemptCount int
-	tickerCh := time.NewTicker(vsockRetryInterval).C
+	ticker := time.NewTicker(vsockRetryInterval)
+	defer ticker.Stop()
+	tickerCh := ticker.C
 	for {
 		attemptCount++
 		logger := l.logger.WithField("attempt", attemptCount)