github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #114071 from Mskxn/master

Browse Source 
Fix a potential goroutine leak
This commit is contained in:
Kubernetes Prow Robot 2022-12-10 06:04:17 -08:00 committed by GitHub
commit 89f6cb39d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/images/etcd/migrate/migrate_server.go
View File

@ -66,10 +66,10 @@ func (r *EtcdMigrateServer) Start(version *EtcdVersion) error {
} }
interval := time.NewTicker(time.Millisecond * 500) interval := time.NewTicker(time.Millisecond * 500)
defer interval.Stop() defer interval.Stop()
done := make(chan bool, 1) done := make(chan bool)
go func() { go func() {
time.Sleep(time.Minute * 2) time.Sleep(time.Minute * 2)
done <- true close(done)
}() }()
for { for {
select { select {
@ -108,7 +108,7 @@ func (r *EtcdMigrateServer) Stop() error {
timedout := make(chan bool) timedout := make(chan bool)
go func() { go func() {
time.Sleep(gracefulWait) time.Sleep(gracefulWait)
timedout <- true close(timedout)
}() }()
go func() { go func() {
select { select {
@ -121,7 +121,7 @@ func (r *EtcdMigrateServer) Stop() error {
} }
}() }()
err = r.cmd.Wait() err = r.cmd.Wait()
stopped <- true close(stopped)
if exiterr, ok := err.(*exec.ExitError); ok { if exiterr, ok := err.(*exec.ExitError); ok {
klog.Infof("etcd server stopped (signal: %s)", exiterr.Error()) klog.Infof("etcd server stopped (signal: %s)", exiterr.Error())
// stopped // stopped