fix ticker without stop (istio#45090)

zhaohuabing · May 25, 2023 · a23f50e · a23f50e
1 parent 03c4854
commit a23f50e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/istioctl/cmd/wait.go b/istioctl/cmd/wait.go
@@ -113,6 +113,7 @@ func waitCmd() *cobra.Command {
  printVerbosef(cmd, "tick")
  continue
  case err = <-w.errorChan:
+ t.Stop()
  return fmt.Errorf("unable to retrieve Kubernetes resource2 %s: %v", "", err)
  case <-ctx.Done():
  printVerbosef(cmd, "timeout")

diff --git a/pilot/pkg/model/jwks_resolver_test.go b/pilot/pkg/model/jwks_resolver_test.go
@@ -292,6 +292,7 @@ func TestJwtPubKeyEvictionForNotRefreshed(t *testing.T) {
  for {
  select {
  case <-done:
+ c.Stop()
  return
  case <-c.C:
  _, _ = r.GetPublicKey(mockCertURL, "")

diff --git a/pkg/envoy/agent.go b/pkg/envoy/agent.go
@@ -138,6 +138,7 @@ func (a *Agent) terminate() {
  time.Sleep(a.minDrainDuration)
  log.Infof("Checking for active connections...")
  ticker := time.NewTicker(activeConnectionCheckDelay)
+ defer ticker.Stop()
  for range ticker.C {
  ac, err := a.activeProxyConnections()
  if err != nil {

diff --git a/pkg/test/echo/server/forwarder/util.go b/pkg/test/echo/server/forwarder/util.go
@@ -107,6 +107,7 @@ func doForward(ctx context.Context, cfg *Config, e *executor, doReq func(context
  sleepTime := time.Second / time.Duration(qps)
  fwLog.Debugf("Sleeping %v between requests", sleepTime)
  throttle = time.NewTicker(sleepTime)
+ defer throttle.Stop()
  }
 
  g := e.NewGroup()