Skip to content

Commit 22c952c

Browse files
shuo-wumergify[bot]
authored andcommitted
controller: Avoid unnecessary DeepCopy in EngineImageController list functions
Longhorn 8528 Signed-off-by: Shuo Wu <[email protected]>
1 parent f7e2d53 commit 22c952c

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

controller/engine_image_controller.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ func (ic *EngineImageController) syncNodeDeploymentMap(engineImage *longhorn.Eng
386386
return err
387387
}
388388

389-
eiDaemonSetPods, err := ic.ds.ListEngineImageDaemonSetPodsFromEngineImageName(engineImage.Name)
389+
eiDaemonSetPods, err := ic.ds.ListEngineImageDaemonSetPodsFromEngineImageNameRO(engineImage.Name)
390390
if err != nil {
391391
return err
392392
}
@@ -565,7 +565,7 @@ func updateEngineImageVersion(ei *longhorn.EngineImage) error {
565565
}
566566

567567
func (ic *EngineImageController) countVolumesUsingEngineImage(image string) (int, error) {
568-
volumes, err := ic.ds.ListVolumes()
568+
volumes, err := ic.ds.ListVolumesRO()
569569
if err != nil {
570570
return 0, err
571571
}
@@ -580,7 +580,7 @@ func (ic *EngineImageController) countVolumesUsingEngineImage(image string) (int
580580
}
581581

582582
func (ic *EngineImageController) countEnginesUsingEngineImage(image string) (int, error) {
583-
engines, err := ic.ds.ListEngines()
583+
engines, err := ic.ds.ListEnginesRO()
584584
if err != nil {
585585
return 0, err
586586
}
@@ -595,7 +595,7 @@ func (ic *EngineImageController) countEnginesUsingEngineImage(image string) (int
595595
}
596596

597597
func (ic *EngineImageController) countReplicasUsingEngineImage(image string) (int, error) {
598-
replicas, err := ic.ds.ListReplicas()
598+
replicas, err := ic.ds.ListReplicasRO()
599599
if err != nil {
600600
return 0, err
601601
}

datastore/kubernetes.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,14 +185,14 @@ func (s *DataStore) GetEngineImageDaemonSet(name string) (*appsv1.DaemonSet, err
185185
return resultRO.DeepCopy(), nil
186186
}
187187

188-
func (s *DataStore) ListEngineImageDaemonSetPodsFromEngineImageName(EIName string) ([]*corev1.Pod, error) {
188+
func (s *DataStore) ListEngineImageDaemonSetPodsFromEngineImageNameRO(EIName string) ([]*corev1.Pod, error) {
189189
selector, err := metav1.LabelSelectorAsSelector(&metav1.LabelSelector{
190190
MatchLabels: types.GetEIDaemonSetLabelSelector(EIName),
191191
})
192192
if err != nil {
193193
return nil, err
194194
}
195-
return s.ListPodsBySelector(selector)
195+
return s.ListPodsBySelectorRO(selector)
196196
}
197197

198198
// CreatePDB creates a PodDisruptionBudget resource for the given PDB object and namespace

0 commit comments

Comments
 (0)