-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
enhance: Add thread watcher to provide actual thread num (#37905)
Related to #37904 --------- Signed-off-by: Congqi Xia <[email protected]>
- Loading branch information
Showing
6 changed files
with
121 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| // 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 ( | ||
| "os" | ||
| "sync" | ||
| "time" | ||
|
|
||
| "github.com/shirou/gopsutil/v4/process" | ||
| "go.uber.org/zap" | ||
|
|
||
| "github.com/milvus-io/milvus/pkg/log" | ||
| "github.com/milvus-io/milvus/pkg/metrics" | ||
| ) | ||
|
|
||
| // theadWatcher is the utility to update milvus process thread number metrics. | ||
| // the os thread number metrics is not accurate since it only returns thread number used by golang "normal" runtime | ||
| // and the crucial threads number in cpp side is not included. | ||
| type threadWatcher struct { | ||
| startOnce sync.Once | ||
| stopOnce sync.Once | ||
| wg sync.WaitGroup | ||
| ch chan struct{} | ||
| } | ||
|
|
||
| func NewThreadWatcher() *threadWatcher { | ||
| return &threadWatcher{ | ||
| ch: make(chan struct{}), | ||
| } | ||
| } | ||
|
|
||
| func (thw *threadWatcher) Start() { | ||
| thw.startOnce.Do(func() { | ||
| thw.wg.Add(1) | ||
| go func() { | ||
| defer thw.wg.Done() | ||
| thw.watchThreadNum() | ||
| }() | ||
| }) | ||
| } | ||
|
|
||
| func (thw *threadWatcher) watchThreadNum() { | ||
| ticker := time.NewTicker(time.Second * 30) | ||
| defer ticker.Stop() | ||
| pid := os.Getpid() | ||
| p, err := process.NewProcess(int32(pid)) | ||
| if err != nil { | ||
| log.Warn("thread watcher failed to get milvus process info, quit", zap.Int("pid", pid), zap.Error(err)) | ||
| return | ||
| } | ||
| for { | ||
| select { | ||
| case <-ticker.C: | ||
| threadNum, err := p.NumThreads() | ||
| if err != nil { | ||
| log.Warn("thread watcher failed to get process", zap.Int("pid", pid), zap.Error(err)) | ||
| continue | ||
| } | ||
| log.Debug("thread watcher observe thread num", zap.Int32("threadNum", threadNum)) | ||
| metrics.ThreadNum.Set(float64(threadNum)) | ||
| case <-thw.ch: | ||
| log.Info("thread watcher exit") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func (thw *threadWatcher) Stop() { | ||
| thw.stopOnce.Do(func() { | ||
| close(thw.ch) | ||
| thw.wg.Wait() | ||
| }) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters