Skip to content

fix: handle TiKV metrics fetch errors (#6897) #6898

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ti-chi-bot wants to merge 1 commit into
base: release-2.1
Choose a base branch
from
+20 −3
Open

fix: handle TiKV metrics fetch errors (#6897) #6898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions pkg/tikvapi/v1/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,14 @@ func (c *tikvClient) GetLeaderCount() (int, error) {
apiURL := fmt.Sprintf("%s/%s", c.url, metricsPath)
transport := c.httpClient.Transport
mfChan := make(chan *dto.MetricFamily, metricChanSize)
errChan := make(chan error, 1)

var fetchErr error
go func() {
if err := prom2json.FetchMetricFamilies(apiURL, mfChan, transport); err != nil {
fetchErr = fmt.Errorf("fail to fetch metric families from %s, error: %w", apiURL, err)
errChan <- fmt.Errorf("fail to fetch metric families from %s, error: %w", apiURL, err)
return
}
errChan <- nil
}()

fms := []*prom2json.Family{}
Expand All @@ -93,7 +95,7 @@ func (c *tikvClient) GetLeaderCount() (int, error) {
}
}

if fetchErr != nil {
if fetchErr := <-errChan; fetchErr != nil {
return 0, fetchErr
}
return 0, fmt.Errorf("metric %s{type=\"%s\"} not found for %s", metricNameRegionCount, metricLabelNameLeaderCount, apiURL)
Expand Down
15 changes: 15 additions & 0 deletions pkg/tikvapi/v1/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,18 @@ tikv_raftstore_region_count{type="region"} 50
require.NoError(t, err)
assert.Equal(t, 20, count)
}

func TestTiKVClient_GetLeaderCountFetchError(t *testing.T) {
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusInternalServerError)
_, err := w.Write([]byte("boom"))
assert.NoError(t, err)
}))
defer server.Close()

client := NewTiKVClient(server.URL, 5*time.Second, nil, false)
count, err := client.GetLeaderCount()
require.Error(t, err)
assert.Equal(t, 0, count)
assert.Contains(t, err.Error(), "fail to fetch metric families")
}
Loading