From bbb73c5de7f0e785b034d533f54a5fa116e6e4dc Mon Sep 17 00:00:00 2001 From: Xuecheng Zhang Date: Thu, 19 Oct 2023 19:34:53 +0800 Subject: [PATCH] http-service: fix get prometheus config panic (#5348) --- cmd/http-service/server/cluster.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cmd/http-service/server/cluster.go b/cmd/http-service/server/cluster.go index 32648f4df6..d9ca1a7c38 100644 --- a/cmd/http-service/server/cluster.go +++ b/cmd/http-service/server/cluster.go @@ -523,6 +523,7 @@ func (s *ClusterServer) GetCluster(ctx context.Context, req *api.GetClusterReq) // for TidbMonitor, we don't return error if previous TiDBCluster exists if apierrors.IsNotFound(err) { logger.Warn("TidbMonitor not found", zap.Error(err)) + tm = nil // set empty TidbMonitor to nil } else { logger.Error("Get TidbMonitor failed", zap.Error(err)) } @@ -664,9 +665,11 @@ func convertToClusterInfo(logger *zap.Logger, kubeCli kubernetes.Interface, tc * if tm != nil { info.Prometheus = &api.PrometheusStatus{ - Version: tm.Spec.Prometheus.MonitorContainer.Version, - Resource: reConvertResourceRequirements(tm.Spec.Prometheus.MonitorContainer.ResourceRequirements), - CommandOptions: tm.Spec.Prometheus.Config.CommandOptions, + Version: tm.Spec.Prometheus.MonitorContainer.Version, + Resource: reConvertResourceRequirements(tm.Spec.Prometheus.MonitorContainer.ResourceRequirements), + } + if tm.Spec.Prometheus.Config != nil { + info.Prometheus.CommandOptions = tm.Spec.Prometheus.Config.CommandOptions } if tm.Spec.Grafana != nil { info.Grafana = &api.GrafanaStatus{