Skip to content
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

Jump to bottom

cluster: fix getClusterID() type #1574

Merged
merged 2 commits into from
Oct 11, 2021
Merged

cluster: fix getClusterID() type #1574

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f34ae7
fix getClusterID
nexustar Oct 11, 2021
bf5827c
remove comment
nexustar Oct 11, 2021
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
5 changes: 1 addition & 4 deletions pkg/cluster/api/pdapi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,9 +330,6 @@ func (pc *PDClient) GetConfig() (map[string]interface{}, error) {
// GetClusterID return cluster ID
func (pc *PDClient) GetClusterID() (string, error) {
endpoints := pc.getEndpoints(pdClusterIDURI)

// We don't use the `github.com/tikv/pd/server/config` directly because
// there is compatible issue: https://github.com/pingcap/tiup/issues/637
clusterID := map[string]interface{}{}

_, err := tryURLs(endpoints, func(endpoint string) ([]byte, error) {
Expand All @@ -347,7 +344,7 @@ func (pc *PDClient) GetClusterID() (string, error) {
return "", err
}

return clusterID["id"].(string), nil
return fmt.Sprintf("%.0f", clusterID["id"]), nil
}

// GetDashboardAddress get the PD node address which runs dashboard
Expand Down