mirror of
https://gitee.com/milvus-io/milvus.git
synced 2024-11-29 18:38:44 +08:00
fix: Return thread watcher goroutine after closed (#38091)
Resolves #38090 Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>
This commit is contained in:
parent
80c62f8c11
commit
61f73d552f
@ -75,6 +75,7 @@ func (thw *threadWatcher) watchThreadNum() {
|
|||||||
metrics.ThreadNum.Set(float64(threadNum))
|
metrics.ThreadNum.Set(float64(threadNum))
|
||||||
case <-thw.ch:
|
case <-thw.ch:
|
||||||
log.Info("thread watcher exit")
|
log.Info("thread watcher exit")
|
||||||
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
41
internal/util/metrics/thread_test.go
Normal file
41
internal/util/metrics/thread_test.go
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
// Licensed to the LF AI & Data foundation under one
|
||||||
|
// or more contributor license agreements. See the NOTICE file
|
||||||
|
// distributed with this work for additional information
|
||||||
|
// regarding copyright ownership. The ASF licenses this file
|
||||||
|
// to you under the Apache License, Version 2.0 (the
|
||||||
|
// "License"); you may not use this file except in compliance
|
||||||
|
// with the License. You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
package metrics
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestThreadWatcher(t *testing.T) {
|
||||||
|
watcher := NewThreadWatcher()
|
||||||
|
|
||||||
|
watcher.Start()
|
||||||
|
|
||||||
|
ch := make(chan struct{})
|
||||||
|
go func() {
|
||||||
|
defer close(ch)
|
||||||
|
watcher.Stop()
|
||||||
|
}()
|
||||||
|
select {
|
||||||
|
case <-ch:
|
||||||
|
case <-time.After(time.Second * 5):
|
||||||
|
assert.FailNow(t, "watcher failed to close after 5 seconds")
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user