Filter in store List calls instead of post-fetch loops

Signed-off-by: Daniel Gonzalez Nothnagel <daniel.gonzalez.nothnagel@sap.com>

Author: gonzolino

cmd/libvirt-provider/app/app.go

@@ -17,6 +17,7 @@ import (
 	"time"
 
 	claim "github.com/ironcore-dev/provider-utils/claimutils/claim"
+	"github.com/ironcore-dev/provider-utils/storeutils/store"
 
 	"github.com/go-logr/logr"
 	"github.com/ironcore-dev/ironcore-image/oci/remote"
@@ -296,6 +297,11 @@ func Run(ctx context.Context, opts Options) error {
 		NewFunc:        func() *api.Machine { return &api.Machine{} },
 		CreateStrategy: strategy.MachineStrategy,
 		Dir:            providerHost.MachineStoreDir(),
+		FieldIndexers: map[string]store.IndexerFunc[*api.Machine]{
+			api.MachineMetadataDeletedField: api.SetupMachineMetadataDeletedFieldIndexer,
+			api.MachineSpecImageField:       api.SetupMachineSpecImageFieldIndexer,
+			api.MachineSpecHasGpuField:      api.SetupMachineSpecHasGpuFieldIndexer,
+		},
 	})
 	if err != nil {
 		setupLog.Error(err, "failed to initialize machine store")

internal/controllers/machine_controller.go

@@ -157,18 +157,16 @@ func (r *MachineReconciler) Start(ctx context.Context) error {
 
 	r.imageCache.AddListener(ociutils.ListenerFuncs{
 		HandlePullDoneFunc: func(evt ociutils.PullDoneEvent) {
-			machines, err := r.machines.List(ctx)
+			machines, err := r.machines.List(ctx, store.MatchingFields{api.MachineSpecImageField: evt.Ref})
 			if err != nil {
 				log.Error(err, "failed to list machine")
 				return
 			}
 
 			for _, machine := range machines {
-				if api.IsImageReferenced(machine, evt.Ref) {
-					r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeNormal, "ImagePullSucceeded", "PullImage", "Pulled image %s", evt.Ref)
-					log.V(1).Info("Image pulled: Requeue machines", "Image", evt.Ref, "Machine", machine.ID)
-					r.queue.Add(machine.ID)
-				}
+				r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeNormal, "ImagePullSucceeded", "PullImage", "Pulled image %s", evt.Ref)
+				log.V(1).Info("Image pulled: Requeue machines", "Image", evt.Ref, "Machine", machine.ID)
+				r.queue.Add(machine.ID)
 			}
 		},
 	})
@@ -262,14 +260,14 @@ func (r *MachineReconciler) startEnqueueMachineByLibvirtEvent(ctx context.Contex
 func (r *MachineReconciler) startGarbageCollector(ctx context.Context, log logr.Logger) {
 	wait.UntilWithContext(ctx, func(ctx context.Context) {
 		log.V(1).Info("starting garbage-collector loop")
-		machines, err := r.machines.List(ctx)
+		machines, err := r.machines.List(ctx, store.MatchingFields{api.MachineMetadataDeletedField: "true"})
 		if err != nil {
 			log.Error(err, "failed to list machines")
 			return
 		}
 
 		for _, machine := range machines {
-			if !slices.Contains(machine.Finalizers, MachineFinalizer) || machine.DeletedAt == nil {
+			if !slices.Contains(machine.Finalizers, MachineFinalizer) {
 				continue
 			}
 

internal/server/machine_list.go

@@ -32,17 +32,13 @@ func (s *Server) getLibvirtMachine(ctx context.Context, id string) (*api.Machine
 }
 
 func (s *Server) listMachines(ctx context.Context, log logr.Logger) ([]*iri.Machine, error) {
-	machines, err := s.machineStore.List(ctx)
+	machines, err := s.machineStore.List(ctx, store.MatchingLabels{api.ManagerLabel: api.MachineManager})
 	if err != nil {
 		return nil, fmt.Errorf("error listing machines: %w", err)
 	}
 
 	var res []*iri.Machine
 	for _, machine := range machines {
-		if !api.IsManagedBy(machine, api.MachineManager) {
-			continue
-		}
-
 		iriMachine, err := s.convertMachineToIRIMachine(ctx, log, machine)
 		if err != nil {
 			return nil, err

internal/utils/claims.go

@@ -9,19 +9,18 @@ import (
 	"github.com/ironcore-dev/libvirt-provider/api"
 	"github.com/ironcore-dev/provider-utils/claimutils/pci"
 	hostutils "github.com/ironcore-dev/provider-utils/storeutils/host"
+	"github.com/ironcore-dev/provider-utils/storeutils/store"
 )
 
 func GetClaimedPCIAddressesFromMachineStore(ctx context.Context, machineStore *hostutils.Store[*api.Machine]) ([]pci.Address, error) {
-	machines, err := machineStore.List(ctx)
+	machines, err := machineStore.List(ctx, store.MatchingFields{api.MachineSpecHasGpuField: "true"})
 	if err != nil {
 		return nil, err
 	}
 
 	var pciAddrs []pci.Address
 	for _, machine := range machines {
-		if machine.Spec.Gpu != nil {
-			pciAddrs = append(pciAddrs, machine.Spec.Gpu...)
-		}
+		pciAddrs = append(pciAddrs, machine.Spec.Gpu...)
 	}
 	return pciAddrs, nil
 }

internal/utils/claims_test.go

@@ -12,6 +12,7 @@ import (
 	apiutils "github.com/ironcore-dev/provider-utils/apiutils/api"
 	"github.com/ironcore-dev/provider-utils/claimutils/pci"
 	hostutils "github.com/ironcore-dev/provider-utils/storeutils/host"
+	"github.com/ironcore-dev/provider-utils/storeutils/store"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
@@ -25,6 +26,9 @@ var _ = Describe("Claims Utils", func() {
 				NewFunc:        func() *api.Machine { return &api.Machine{} },
 				CreateStrategy: strategy.MachineStrategy,
 				Dir:            filepath.Join(tempDir, "store", "machines"),
+				FieldIndexers: map[string]store.IndexerFunc[*api.Machine]{
+					api.MachineSpecHasGpuField: api.SetupMachineSpecHasGpuFieldIndexer,
+				},
 			})
 			Expect(err).NotTo(HaveOccurred())