From 30337c313fe01475645f6182603a2171d47874ef Mon Sep 17 00:00:00 2001 From: weekface Date: Mon, 6 Jan 2020 11:23:53 +0800 Subject: [PATCH 1/2] remove useless update events --- .../backup_schedule_status_updater.go | 4 --- pkg/controller/backup_status_updater.go | 3 -- pkg/controller/configmap_control.go | 1 - pkg/controller/configmap_control_test.go | 8 ----- pkg/controller/generic_control.go | 1 - pkg/controller/pod_control.go | 2 -- pkg/controller/pod_control_test.go | 29 ------------------- pkg/controller/pv_control.go | 1 - pkg/controller/pv_control_test.go | 15 ---------- pkg/controller/pvc_control.go | 2 -- pkg/controller/pvc_control_test.go | 24 --------------- pkg/controller/restore_status_updater.go | 3 -- pkg/controller/service_control.go | 1 - pkg/controller/service_control_test.go | 8 ----- pkg/controller/stateful_set_control.go | 1 - pkg/controller/stateful_set_control_test.go | 8 ----- pkg/controller/tidbcluster_control.go | 3 -- pkg/controller/tidbcluster_control_test.go | 6 ---- 18 files changed, 120 deletions(-) diff --git a/pkg/controller/backup_schedule_status_updater.go b/pkg/controller/backup_schedule_status_updater.go index e5933a1872..9e633f9306 100644 --- a/pkg/controller/backup_schedule_status_updater.go +++ b/pkg/controller/backup_schedule_status_updater.go @@ -24,7 +24,6 @@ import ( informers "github.com/pingcap/tidb-operator/pkg/client/informers/externalversions/pingcap/v1alpha1" listers "github.com/pingcap/tidb-operator/pkg/client/listers/pingcap/v1alpha1" corev1 "k8s.io/api/core/v1" - apiequality "k8s.io/apimachinery/pkg/api/equality" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" @@ -82,9 +81,6 @@ func (bss *realBackupScheduleStatusUpdater) UpdateBackupScheduleStatus( return updateErr }) - if !apiequality.Semantic.DeepEqual(newStatus, oldStatus) { - bss.recordBackupScheduleEvent("update", bs, err) - } return err } diff --git a/pkg/controller/backup_status_updater.go b/pkg/controller/backup_status_updater.go index a08e9069ab..9a6490d24d 100644 --- a/pkg/controller/backup_status_updater.go +++ b/pkg/controller/backup_status_updater.go @@ -77,9 +77,6 @@ func (bcu *realBackupConditionUpdater) Update(backup *v1alpha1.Backup, condition } return nil }) - if isUpdate { - bcu.recordBackupEvent("update", backup, err) - } return err } diff --git a/pkg/controller/configmap_control.go b/pkg/controller/configmap_control.go index 385235b881..6e05755b58 100644 --- a/pkg/controller/configmap_control.go +++ b/pkg/controller/configmap_control.go @@ -90,7 +90,6 @@ func (cc *realConfigMapControl) UpdateConfigMap(owner runtime.Object, cm *corev1 return updateErr }) - cc.recordConfigMapEvent("update", owner, cm, err) return updatedCm, err } diff --git a/pkg/controller/configmap_control_test.go b/pkg/controller/configmap_control_test.go index 7fae063b12..ffdfb8ad88 100644 --- a/pkg/controller/configmap_control_test.go +++ b/pkg/controller/configmap_control_test.go @@ -81,10 +81,6 @@ func TestConfigMapControlUpdateConfigMap(t *testing.T) { updatecm, err := control.UpdateConfigMap(tc, cm) g.Expect(err).To(Succeed()) g.Expect(updatecm.Data["file"]).To(Equal("test")) - - events := collectEvents(recorder.Events) - g.Expect(events).To(HaveLen(1)) - g.Expect(events[0]).To(ContainSubstring(corev1.EventTypeNormal)) } func TestConfigMapControlUpdateConfigMapConflictSuccess(t *testing.T) { @@ -113,10 +109,6 @@ func TestConfigMapControlUpdateConfigMapConflictSuccess(t *testing.T) { updatecm, err := control.UpdateConfigMap(tc, cm) g.Expect(err).To(Succeed()) g.Expect(updatecm.Data["file"]).To(Equal("test")) - - events := collectEvents(recorder.Events) - g.Expect(events).To(HaveLen(1)) - g.Expect(events[0]).To(ContainSubstring(corev1.EventTypeNormal)) } func TestConfigMapControlDeleteConfigMap(t *testing.T) { diff --git a/pkg/controller/generic_control.go b/pkg/controller/generic_control.go index 0ce8533b2c..1cf8f1f5e3 100644 --- a/pkg/controller/generic_control.go +++ b/pkg/controller/generic_control.go @@ -374,7 +374,6 @@ func (c *realGenericControlInterface) CreateOrUpdate(controller, obj runtime.Obj // 5. check if the copy is actually mutated if !apiequality.Semantic.DeepEqual(existing, mutated) { err := c.client.Update(context.TODO(), mutated) - c.RecordControllerEvent("update", controller, mutated, err) return mutated, err } diff --git a/pkg/controller/pod_control.go b/pkg/controller/pod_control.go index 1910226938..06be0d3efd 100644 --- a/pkg/controller/pod_control.go +++ b/pkg/controller/pod_control.go @@ -93,7 +93,6 @@ func (rpc *realPodControl) UpdatePod(tc *v1alpha1.TidbCluster, pod *corev1.Pod) return updateErr }) - rpc.recordPodEvent("update", tc, podName, err) return updatePod, err } @@ -185,7 +184,6 @@ func (rpc *realPodControl) UpdateMetaInfo(tc *v1alpha1.TidbCluster, pod *corev1. return updateErr }) - rpc.recordPodEvent("update", tc, podName, err) return updatePod, err } diff --git a/pkg/controller/pod_control_test.go b/pkg/controller/pod_control_test.go index afc55411f8..05b36d6d22 100644 --- a/pkg/controller/pod_control_test.go +++ b/pkg/controller/pod_control_test.go @@ -82,10 +82,6 @@ func TestPodControlUpdateMetaInfoSuccess(t *testing.T) { }) _, err := control.UpdateMetaInfo(tc, pod) g.Expect(err).To(Succeed()) - - events := collectEvents(recorder.Events) - g.Expect(events).To(HaveLen(1)) - g.Expect(events[0]).To(ContainSubstring(corev1.EventTypeNormal)) } func TestPodControlUpdateMetaInfoGetClusterFailed(t *testing.T) { @@ -129,9 +125,6 @@ func TestPodControlUpdateMetaInfoGetClusterFailed(t *testing.T) { }) _, err := control.UpdateMetaInfo(tc, pod) g.Expect(err).To(HaveOccurred()) - - events := collectEvents(recorder.Events) - g.Expect(events).To(HaveLen(0)) } func TestPodControlUpdateMetaInfoGetMemberFailed(t *testing.T) { @@ -172,9 +165,6 @@ func TestPodControlUpdateMetaInfoGetMemberFailed(t *testing.T) { pod.Labels[label.ComponentLabelKey] = label.PDLabelVal _, err := control.UpdateMetaInfo(tc, pod) g.Expect(err).To(HaveOccurred()) - - events := collectEvents(recorder.Events) - g.Expect(events).To(HaveLen(0)) } func TestPodControlUpdateMetaInfoGetStoreFailed(t *testing.T) { @@ -210,9 +200,6 @@ func TestPodControlUpdateMetaInfoGetStoreFailed(t *testing.T) { pod.Labels[label.ComponentLabelKey] = label.TiKVLabelVal _, err := control.UpdateMetaInfo(tc, pod) g.Expect(err).To(HaveOccurred()) - - events := collectEvents(recorder.Events) - g.Expect(events).To(HaveLen(0)) } func TestPodControlUpdateMetaInfoUpdatePodFailed(t *testing.T) { @@ -259,10 +246,6 @@ func TestPodControlUpdateMetaInfoUpdatePodFailed(t *testing.T) { }) _, err := control.UpdateMetaInfo(tc, pod) g.Expect(err).To(HaveOccurred()) - - events := collectEvents(recorder.Events) - g.Expect(events).To(HaveLen(1)) - g.Expect(events[0]).To(ContainSubstring(corev1.EventTypeWarning)) } func TestPodControlUpdateMetaInfoConflictSuccess(t *testing.T) { @@ -320,10 +303,6 @@ func TestPodControlUpdateMetaInfoConflictSuccess(t *testing.T) { g.Expect(err).To(Succeed()) g.Expect(updatePod.Labels[label.StoreIDLabelKey]).To(Equal("333")) g.Expect(updatePod.Labels[label.ClusterIDLabelKey]).To(Equal("222")) - - events := collectEvents(recorder.Events) - g.Expect(events).To(HaveLen(1)) - g.Expect(events[0]).To(ContainSubstring(corev1.EventTypeNormal)) } func TestPodControlUpdatePod(t *testing.T) { @@ -343,10 +322,6 @@ func TestPodControlUpdatePod(t *testing.T) { g.Expect(err).To(Succeed()) g.Expect(updatePod.Annotations["a"]).To(Equal("b")) g.Expect(updatePod.Labels["a"]).To(Equal("b")) - - events := collectEvents(recorder.Events) - g.Expect(events).To(HaveLen(1)) - g.Expect(events[0]).To(ContainSubstring(corev1.EventTypeNormal)) } func TestPodControlUpdatePodConflictSuccess(t *testing.T) { @@ -374,10 +349,6 @@ func TestPodControlUpdatePodConflictSuccess(t *testing.T) { g.Expect(err).To(Succeed()) g.Expect(updatePod.Annotations["a"]).To(Equal("b")) g.Expect(updatePod.Labels["a"]).To(Equal("b")) - - events := collectEvents(recorder.Events) - g.Expect(events).To(HaveLen(1)) - g.Expect(events[0]).To(ContainSubstring(corev1.EventTypeNormal)) } func newFakeClientRecorderAndPDControl() (*fake.Clientset, *pdapi.FakePDControl, corelisters.PodLister, cache.Indexer, *record.FakeRecorder) { diff --git a/pkg/controller/pv_control.go b/pkg/controller/pv_control.go index 6a705d2bdb..c4172e9ba1 100644 --- a/pkg/controller/pv_control.go +++ b/pkg/controller/pv_control.go @@ -153,7 +153,6 @@ func (rpc *realPVControl) UpdateMetaInfo(tc *v1alpha1.TidbCluster, pv *corev1.Pe return updateErr }) - rpc.recordPVEvent("update", tc, pvName, err) return updatePV, err } diff --git a/pkg/controller/pv_control_test.go b/pkg/controller/pv_control_test.go index 93c0e9067e..921263c82c 100644 --- a/pkg/controller/pv_control_test.go +++ b/pkg/controller/pv_control_test.go @@ -106,10 +106,6 @@ func TestPVControlUpdateMetaInfoSuccess(t *testing.T) { updatePV, err := control.UpdateMetaInfo(tc, pv) g.Expect(err).To(Succeed()) g.Expect(updatePV.Annotations["a"]).To(Equal("b")) - - events := collectEvents(recorder.Events) - g.Expect(events).To(HaveLen(1)) - g.Expect(events[0]).To(ContainSubstring(corev1.EventTypeNormal)) } func TestPVControlUpdateMetaInfoUpdatePVFailed(t *testing.T) { @@ -128,10 +124,6 @@ func TestPVControlUpdateMetaInfoUpdatePVFailed(t *testing.T) { }) _, err := control.UpdateMetaInfo(tc, pv) g.Expect(err).To(HaveOccurred()) - - events := collectEvents(recorder.Events) - g.Expect(events).To(HaveLen(1)) - g.Expect(events[0]).To(ContainSubstring(corev1.EventTypeWarning)) } func TestPVControlUpdateMetaInfoGetPVCFailed(t *testing.T) { @@ -148,9 +140,6 @@ func TestPVControlUpdateMetaInfoGetPVCFailed(t *testing.T) { }) _, err := control.UpdateMetaInfo(tc, pv) g.Expect(err).To(Succeed()) - - events := collectEvents(recorder.Events) - g.Expect(events).To(HaveLen(0)) } func TestPVControlUpdateMetaInfoConflictSuccess(t *testing.T) { @@ -179,10 +168,6 @@ func TestPVControlUpdateMetaInfoConflictSuccess(t *testing.T) { updatePV, err := control.UpdateMetaInfo(tc, pv) g.Expect(err).To(Succeed()) g.Expect(updatePV.Annotations["a"]).To(Equal("b")) - - events := collectEvents(recorder.Events) - g.Expect(events).To(HaveLen(1)) - g.Expect(events[0]).To(ContainSubstring(corev1.EventTypeNormal)) } func newFakeRecorderAndPVCInformer() (*fake.Clientset, coreinformers.PersistentVolumeClaimInformer, coreinformers.PersistentVolumeInformer, *record.FakeRecorder) { diff --git a/pkg/controller/pvc_control.go b/pkg/controller/pvc_control.go index 5abf21dd05..2ec2ad51e1 100644 --- a/pkg/controller/pvc_control.go +++ b/pkg/controller/pvc_control.go @@ -103,7 +103,6 @@ func (rpc *realPVCControl) UpdatePVC(tc *v1alpha1.TidbCluster, pvc *corev1.Persi return updateErr }) - rpc.recordPVCEvent("update", tc, pvcName, err) return updatePVC, err } @@ -161,7 +160,6 @@ func (rpc *realPVCControl) UpdateMetaInfo(tc *v1alpha1.TidbCluster, pvc *corev1. return updateErr }) - rpc.recordPVCEvent("update", tc, pvcName, err) return updatePVC, err } diff --git a/pkg/controller/pvc_control_test.go b/pkg/controller/pvc_control_test.go index 21b81fa554..c312e149c2 100644 --- a/pkg/controller/pvc_control_test.go +++ b/pkg/controller/pvc_control_test.go @@ -48,10 +48,6 @@ func TestPVCControlUpdateMetaInfoSuccess(t *testing.T) { updatePVC, err := control.UpdateMetaInfo(tc, pvc, pod) g.Expect(err).To(Succeed()) g.Expect(updatePVC.Annotations[label.AnnPodNameKey]).To(Equal(pod.GetName())) - - events := collectEvents(recorder.Events) - g.Expect(events).To(HaveLen(1)) - g.Expect(events[0]).To(ContainSubstring(corev1.EventTypeNormal)) } func TestPVCControlUpdateMetaInfoFailed(t *testing.T) { @@ -66,10 +62,6 @@ func TestPVCControlUpdateMetaInfoFailed(t *testing.T) { }) _, err := control.UpdateMetaInfo(tc, pvc, pod) g.Expect(err).To(HaveOccurred()) - - events := collectEvents(recorder.Events) - g.Expect(events).To(HaveLen(1)) - g.Expect(events[0]).To(ContainSubstring(corev1.EventTypeWarning)) } func TestPVCControlUpdateMetaInfoConflictSuccess(t *testing.T) { @@ -93,10 +85,6 @@ func TestPVCControlUpdateMetaInfoConflictSuccess(t *testing.T) { updatePVC, err := control.UpdateMetaInfo(tc, pvc, pod) g.Expect(err).To(Succeed()) g.Expect(updatePVC.Annotations[label.AnnPodNameKey]).To(Equal(pod.GetName())) - - events := collectEvents(recorder.Events) - g.Expect(events).To(HaveLen(1)) - g.Expect(events[0]).To(ContainSubstring(corev1.EventTypeNormal)) } func TestPVCControlUpdatePVCSuccess(t *testing.T) { @@ -114,10 +102,6 @@ func TestPVCControlUpdatePVCSuccess(t *testing.T) { updatePVC, err := control.UpdatePVC(tc, pvc) g.Expect(err).To(Succeed()) g.Expect(updatePVC.Annotations["a"]).To(Equal("b")) - - events := collectEvents(recorder.Events) - g.Expect(events).To(HaveLen(1)) - g.Expect(events[0]).To(ContainSubstring(corev1.EventTypeNormal)) } func TestPVCControlUpdatePVCFailed(t *testing.T) { @@ -131,10 +115,6 @@ func TestPVCControlUpdatePVCFailed(t *testing.T) { }) _, err := control.UpdatePVC(tc, pvc) g.Expect(err).To(HaveOccurred()) - - events := collectEvents(recorder.Events) - g.Expect(events).To(HaveLen(1)) - g.Expect(events[0]).To(ContainSubstring(corev1.EventTypeWarning)) } func TestPVCControlUpdatePVCConflictSuccess(t *testing.T) { @@ -158,10 +138,6 @@ func TestPVCControlUpdatePVCConflictSuccess(t *testing.T) { updatePVC, err := control.UpdatePVC(tc, pvc) g.Expect(err).To(Succeed()) g.Expect(updatePVC.Annotations["a"]).To(Equal("b")) - - events := collectEvents(recorder.Events) - g.Expect(events).To(HaveLen(1)) - g.Expect(events[0]).To(ContainSubstring(corev1.EventTypeNormal)) } func newFakeClientAndRecorder() (*fake.Clientset, corelisters.PersistentVolumeClaimLister, cache.Indexer, *record.FakeRecorder) { diff --git a/pkg/controller/restore_status_updater.go b/pkg/controller/restore_status_updater.go index cf530b114e..486f146c3c 100644 --- a/pkg/controller/restore_status_updater.go +++ b/pkg/controller/restore_status_updater.go @@ -77,9 +77,6 @@ func (rcu *realRestoreConditionUpdater) Update(restore *v1alpha1.Restore, condit } return nil }) - if isUpdate { - rcu.recordRestoreEvent("update", restore, err) - } return err } diff --git a/pkg/controller/service_control.go b/pkg/controller/service_control.go index c3c3fb4ba4..1d858c1a0f 100644 --- a/pkg/controller/service_control.go +++ b/pkg/controller/service_control.go @@ -87,7 +87,6 @@ func (sc *realServiceControl) UpdateService(tc *v1alpha1.TidbCluster, svc *corev return updateErr }) - sc.recordServiceEvent("update", tc, svc, err) return updateSvc, err } diff --git a/pkg/controller/service_control_test.go b/pkg/controller/service_control_test.go index 3bcf3dbcca..9554b8613a 100644 --- a/pkg/controller/service_control_test.go +++ b/pkg/controller/service_control_test.go @@ -80,10 +80,6 @@ func TestServiceControlUpdateService(t *testing.T) { updateSvc, err := control.UpdateService(tc, svc) g.Expect(err).To(Succeed()) g.Expect(updateSvc.Spec.ClusterIP).To(Equal("1.1.1.1")) - - events := collectEvents(recorder.Events) - g.Expect(events).To(HaveLen(1)) - g.Expect(events[0]).To(ContainSubstring(corev1.EventTypeNormal)) } func TestServiceControlUpdateServiceConflictSuccess(t *testing.T) { @@ -112,10 +108,6 @@ func TestServiceControlUpdateServiceConflictSuccess(t *testing.T) { updateSvc, err := control.UpdateService(tc, svc) g.Expect(err).To(Succeed()) g.Expect(updateSvc.Spec.ClusterIP).To(Equal("1.1.1.1")) - - events := collectEvents(recorder.Events) - g.Expect(events).To(HaveLen(1)) - g.Expect(events[0]).To(ContainSubstring(corev1.EventTypeNormal)) } func TestServiceControlDeleteService(t *testing.T) { diff --git a/pkg/controller/stateful_set_control.go b/pkg/controller/stateful_set_control.go index 272a4ccd2d..7d4a427487 100644 --- a/pkg/controller/stateful_set_control.go +++ b/pkg/controller/stateful_set_control.go @@ -93,7 +93,6 @@ func (sc *realStatefulSetControl) UpdateStatefulSet(tc *v1alpha1.TidbCluster, se return updateErr }) - sc.recordStatefulSetEvent("update", tc, set, err) return updatedSS, err } diff --git a/pkg/controller/stateful_set_control_test.go b/pkg/controller/stateful_set_control_test.go index 3d5853e934..102aab2acc 100644 --- a/pkg/controller/stateful_set_control_test.go +++ b/pkg/controller/stateful_set_control_test.go @@ -97,10 +97,6 @@ func TestStatefulSetControlUpdateStatefulSet(t *testing.T) { updateSS, err := control.UpdateStatefulSet(tc, set) g.Expect(err).To(Succeed()) g.Expect(int(*updateSS.Spec.Replicas)).To(Equal(100)) - - events := collectEvents(recorder.Events) - g.Expect(events).To(HaveLen(1)) - g.Expect(events[0]).To(ContainSubstring(corev1.EventTypeNormal)) } func TestStatefulSetControlUpdateStatefulSetConflictSuccess(t *testing.T) { @@ -129,10 +125,6 @@ func TestStatefulSetControlUpdateStatefulSetConflictSuccess(t *testing.T) { updateSS, err := control.UpdateStatefulSet(tc, set) g.Expect(err).To(Succeed()) g.Expect(int(*updateSS.Spec.Replicas)).To(Equal(100)) - - events := collectEvents(recorder.Events) - g.Expect(events).To(HaveLen(1)) - g.Expect(events[0]).To(ContainSubstring(corev1.EventTypeNormal)) } func TestStatefulSetControlDeleteStatefulSet(t *testing.T) { diff --git a/pkg/controller/tidbcluster_control.go b/pkg/controller/tidbcluster_control.go index 7629676008..268f7769ea 100644 --- a/pkg/controller/tidbcluster_control.go +++ b/pkg/controller/tidbcluster_control.go @@ -80,9 +80,6 @@ func (rtc *realTidbClusterControl) UpdateTidbCluster(tc *v1alpha1.TidbCluster, n return updateErr }) - if !deepEqualExceptHeartbeatTime(newStatus.DeepCopy(), oldStatus.DeepCopy()) { - rtc.recordTidbClusterEvent("update", tc, err) - } return updateTC, err } diff --git a/pkg/controller/tidbcluster_control_test.go b/pkg/controller/tidbcluster_control_test.go index 01db3e1c71..f07a985984 100644 --- a/pkg/controller/tidbcluster_control_test.go +++ b/pkg/controller/tidbcluster_control_test.go @@ -45,9 +45,6 @@ func TestTidbClusterControlUpdateTidbCluster(t *testing.T) { updateTC, err := control.UpdateTidbCluster(tc, &v1alpha1.TidbClusterStatus{}, &v1alpha1.TidbClusterStatus{}) g.Expect(err).To(Succeed()) g.Expect(updateTC.Spec.PD.Replicas).To(Equal(int32(5))) - - events := collectEvents(recorder.Events) - g.Expect(events).To(HaveLen(0)) } func TestTidbClusterControlUpdateTidbClusterConflictSuccess(t *testing.T) { @@ -69,9 +66,6 @@ func TestTidbClusterControlUpdateTidbClusterConflictSuccess(t *testing.T) { }) _, err := control.UpdateTidbCluster(tc, &v1alpha1.TidbClusterStatus{}, &v1alpha1.TidbClusterStatus{}) g.Expect(err).To(Succeed()) - - events := collectEvents(recorder.Events) - g.Expect(events).To(HaveLen(0)) } func TestDeepEqualExceptHeartbeatTime(t *testing.T) { From 169f666b971af369d4907ecbe0aca9e51ae2c1ad Mon Sep 17 00:00:00 2001 From: weekface Date: Mon, 6 Jan 2020 13:11:06 +0800 Subject: [PATCH 2/2] fix CI --- pkg/controller/pod_control_test.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkg/controller/pod_control_test.go b/pkg/controller/pod_control_test.go index 05b36d6d22..0f15b972b1 100644 --- a/pkg/controller/pod_control_test.go +++ b/pkg/controller/pod_control_test.go @@ -307,7 +307,6 @@ func TestPodControlUpdateMetaInfoConflictSuccess(t *testing.T) { func TestPodControlUpdatePod(t *testing.T) { g := NewGomegaWithT(t) - recorder := record.NewFakeRecorder(10) tc := newTidbCluster() pod := newPod(tc) pod.Annotations = map[string]string{"a": "b"} @@ -326,7 +325,6 @@ func TestPodControlUpdatePod(t *testing.T) { func TestPodControlUpdatePodConflictSuccess(t *testing.T) { g := NewGomegaWithT(t) - recorder := record.NewFakeRecorder(10) tc := newTidbCluster() pod := newPod(tc) pod.Annotations = map[string]string{"a": "b"}