milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: Revert Expose metrics of stanby coordinators (#27698) (#38742) 

issue: #38608
pr: #38620

Signed-off-by: jaime <yun.zhang@zilliz.com>
pull/38773/head
jaime 2024-12-26 10:16:51 +08:00 committed by GitHub
parent e8eea587d5
commit b496fa1914
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/datacoord/services.go
View File

@ -1015,7 +1015,7 @@ func (s *Server) ShowConfigurations(ctx context.Context, req *internalpb.ShowCon
// it may include SystemMetrics, Topology metrics, etc.
func (s *Server) GetMetrics(ctx context.Context, req *milvuspb.GetMetricsRequest) (*milvuspb.GetMetricsResponse, error) {
log := log.Ctx(ctx)
if err := merr.CheckHealthyStandby(s.GetStateCode()); err != nil {
if err := merr.CheckHealthy(s.GetStateCode()); err != nil {
return &milvuspb.GetMetricsResponse{
Status: merr.Status(err),
}, nil

2
internal/querycoordv2/services.go
View File

@ -838,7 +838,7 @@ func (s *Server) GetMetrics(ctx context.Context, req *milvuspb.GetMetricsRequest
log.RatedDebug(60, "get metrics request received",
zap.String("metricType", req.GetRequest()))
if err := merr.CheckHealthyStandby(s.State()); err != nil {
if err := merr.CheckHealthy(s.State()); err != nil {
msg := "failed to get metrics"
log.Warn(msg, zap.Error(err))
return &milvuspb.GetMetricsResponse{

2
internal/rootcoord/root_coord.go
View File

@ -1770,7 +1770,7 @@ func (c *Core) ShowConfigurations(ctx context.Context, req *internalpb.ShowConfi
// GetMetrics get metrics
func (c *Core) GetMetrics(ctx context.Context, in *milvuspb.GetMetricsRequest) (*milvuspb.GetMetricsResponse, error) {
if err := merr.CheckHealthyStandby(c.GetStateCode()); err != nil {
if err := merr.CheckHealthy(c.GetStateCode()); err != nil {
return &milvuspb.GetMetricsResponse{
Status: merr.Status(err),
Response: "",

12
pkg/util/merr/utils.go
View File

@ -273,18 +273,6 @@ func CheckHealthy(state commonpb.StateCode) error {
return nil
}
// CheckHealthyStandby checks whether the state is healthy or standby,
// returns nil if healthy or standby
// otherwise returns ErrServiceNotReady wrapped with current state
// this method only used in GetMetrics
func CheckHealthyStandby(state commonpb.StateCode) error {
if state != commonpb.StateCode_Healthy && state != commonpb.StateCode_StandBy {
return WrapErrServiceNotReady(paramtable.GetRole(), paramtable.GetNodeID(), state.String())
}
return nil
}
func IsHealthy(stateCode commonpb.StateCode) error {
if stateCode == commonpb.StateCode_Healthy {
return nil