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

tidb status add gethealth info #4844

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
+27 −4
Open

tidb status add gethealth info #4844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
641f2f3
tidb status add gethealth info
mikechengwei Jan 19, 2023
62e6e85
Merge branch 'master' into optimize_health_info
mikechengwei Jan 19, 2023
665f550
optimize code
mikechengwei Jan 19, 2023
8b10c2f
Merge branch 'master' into optimize_health_info
mikechengwei Jan 20, 2023
a6168ca
Merge branch 'master' into optimize_health_info
mikechengwei Jan 24, 2023
bff8335
optimize code
mikechengwei Jan 27, 2023
cc2e2ee
Merge branch 'optimize_health_info' of github.com:mikechengwei/tidb-o…
mikechengwei Jan 27, 2023
a637f81
optimize code
mikechengwei Jan 28, 2023
5566df9
Merge branch 'master' into optimize_health_info
mikechengwei Feb 5, 2023
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
10 changes: 10 additions & 0 deletions docs/api-references/docs.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16153,6 +16153,16 @@ string
<p>Node hosting pod of this TiDB member.</p>
</td>
</tr>
<tr>
<td>
<code>message</code></br>
<em>
string
</em>
</td>
<td>
</td>
</tr>
</tbody>
</table>
<h3 id="tidbservicespec">TiDBServiceSpec</h3>
Expand Down
3 changes: 3 additions & 0 deletions manifests/crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33604,12 +33604,15 @@ spec:
format: date-time
nullable: true
type: string
message:
type: string
name:
type: string
node:
type: string
required:
- health
- message
- name
type: object
type: object
Expand Down
3 changes: 3 additions & 0 deletions manifests/crd/v1/pingcap.com_tidbclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20349,12 +20349,15 @@ spec:
format: date-time
nullable: true
type: string
message:
type: string
name:
type: string
node:
type: string
required:
- health
- message
- name
type: object
type: object
Expand Down
3 changes: 3 additions & 0 deletions manifests/crd/v1beta1/pingcap.com_tidbclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20319,12 +20319,15 @@ spec:
format: date-time
nullable: true
type: string
message:
type: string
name:
type: string
node:
type: string
required:
- health
- message
- name
type: object
type: object
Expand Down
3 changes: 3 additions & 0 deletions manifests/crd_v1beta1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33569,12 +33569,15 @@ spec:
format: date-time
nullable: true
type: string
message:
type: string
name:
type: string
node:
type: string
required:
- health
- message
- name
type: object
type: object
Expand Down
1 change: 1 addition & 0 deletions pkg/apis/pingcap/v1alpha1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1346,6 +1346,7 @@ type TiDBMember struct {
LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"`
// Node hosting pod of this TiDB member.
NodeName string `json:"node,omitempty"`
Message string `json:"message"`
}

// TiDBFailureMember is the tidb failure member information
Expand Down
8 changes: 4 additions & 4 deletions pkg/manager/member/tidb_member_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1049,14 +1049,14 @@ func (m *tidbMemberManager) syncTidbClusterStatus(tc *v1alpha1.TidbCluster, set
for id := range helper.GetPodOrdinals(tc.Status.TiDB.StatefulSet.Replicas, set) {
name := fmt.Sprintf("%s-%d", controller.TiDBMemberName(tc.GetName()), id)
health, err := m.deps.TiDBControl.GetHealth(tc, int32(id))
if err != nil {
return err
}

newTidbMember := v1alpha1.TiDBMember{
Name: name,
Health: health,
}
if err != nil {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need to keep the err in _, err = getBodyOK(httpClient, url)?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do you revert it in a637f81

klog.V(4).Infof("tidb cluster %s/%s sync status get health error:%v", tc.GetNamespace(), tc.GetName(), err)
newTidbMember.Message = err.Error()
}
oldTidbMember, exist := tc.Status.TiDB.Members[name]

newTidbMember.LastTransitionTime = metav1.Now()
Expand Down