Skip to content

Commit e239850

Browse files
authored
feat(pd): add log for pd (#6218)
1 parent 089bf48 commit e239850

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

pkg/controllers/pd/handler.go

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ func (r *Reconciler) EventLogger() predicate.Funcs {
5555
func (r *Reconciler) ClusterEventHandler() handler.TypedEventHandler[client.Object, reconcile.Request] {
5656
return handler.TypedFuncs[client.Object, reconcile.Request]{
5757
UpdateFunc: func(ctx context.Context, event event.TypedUpdateEvent[client.Object],
58-
queue workqueue.TypedRateLimitingInterface[reconcile.Request]) {
58+
queue workqueue.TypedRateLimitingInterface[reconcile.Request],
59+
) {
5960
oldObj := event.ObjectOld.(*v1alpha1.Cluster)
6061
newObj := event.ObjectNew.(*v1alpha1.Cluster)
6162

@@ -94,11 +95,12 @@ func (r *Reconciler) ClusterEventHandler() handler.TypedEventHandler[client.Obje
9495
func (r *Reconciler) MemberEventHandler() handler.TypedEventHandler[client.Object, reconcile.Request] {
9596
return handler.TypedFuncs[client.Object, reconcile.Request]{
9697
CreateFunc: func(_ context.Context, event event.TypedCreateEvent[client.Object],
97-
queue workqueue.TypedRateLimitingInterface[reconcile.Request]) {
98+
queue workqueue.TypedRateLimitingInterface[reconcile.Request],
99+
) {
98100
m := event.Object.(*pdv1.Member)
99101
ns, cluster := pdm.SplitPrimaryKey(m.Namespace)
100102

101-
r.Logger.Info("add member", "namespace", ns, "cluster", cluster, "name", m.Name)
103+
r.Logger.Info("add member", "namespace", ns, "cluster", cluster, "name", m.Name, "health", m.Health, "invalid", m.Invalid)
102104

103105
queue.Add(reconcile.Request{
104106
NamespacedName: types.NamespacedName{
@@ -109,11 +111,12 @@ func (r *Reconciler) MemberEventHandler() handler.TypedEventHandler[client.Objec
109111
},
110112

111113
UpdateFunc: func(_ context.Context, event event.TypedUpdateEvent[client.Object],
112-
queue workqueue.TypedRateLimitingInterface[reconcile.Request]) {
114+
queue workqueue.TypedRateLimitingInterface[reconcile.Request],
115+
) {
113116
m := event.ObjectNew.(*pdv1.Member)
114117
ns, cluster := pdm.SplitPrimaryKey(m.Namespace)
115118

116-
r.Logger.Info("update member", "namespace", ns, "cluster", cluster, "name", m.Name)
119+
r.Logger.Info("update member", "namespace", ns, "cluster", cluster, "name", m.Name, "health", m.Health, "invalid", m.Invalid)
117120

118121
queue.Add(reconcile.Request{
119122
NamespacedName: types.NamespacedName{
@@ -123,7 +126,8 @@ func (r *Reconciler) MemberEventHandler() handler.TypedEventHandler[client.Objec
123126
})
124127
},
125128
DeleteFunc: func(_ context.Context, event event.TypedDeleteEvent[client.Object],
126-
queue workqueue.TypedRateLimitingInterface[reconcile.Request]) {
129+
queue workqueue.TypedRateLimitingInterface[reconcile.Request],
130+
) {
127131
m := event.Object.(*pdv1.Member)
128132
ns, cluster := pdm.SplitPrimaryKey(m.Namespace)
129133

pkg/controllers/pd/tasks/ctx.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,10 @@ func TaskContextInfoFromPD(state *ReconcileContext, cm pdm.PDClientManager) task
6767
// set available and trust health info only when member info is valid
6868
if !m.Invalid && m.Health {
6969
state.SetHealthy()
70+
return task.Complete().With("pd is ready")
7071
}
7172

72-
return task.Complete().With("pd is ready")
73+
return task.Wait().With("pd is unready, invalid: %v, health: %v", m.Invalid, m.Health)
7374
})
7475
}
7576

0 commit comments

Comments
 (0)