Merge branch 'master' into fsr_warmup_support

pingcap · Oct 19, 2023 · d631c38 · d631c38
2 parents ee0b230 + bbb73c5
commit d631c38
Showing 1 changed file with 6 additions and 3 deletions.
diff --git 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{