Skip to content

Commit e8bb8f7

Browse files
committed
remove unintended changes
1 parent e92aaab commit e8bb8f7

4 files changed

Lines changed: 24 additions & 60 deletions

File tree

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint
156156

157157
## Tool Versions
158158
KUSTOMIZE_VERSION ?= v5.7.1
159-
CONTROLLER_TOOLS_VERSION ?= v0.19.0
159+
CONTROLLER_TOOLS_VERSION ?= v0.17.3
160160
ADDLICENSE_VERSION ?= v1.2.0
161161
GOLANGCI_LINT_VERSION ?= v2.5
162162
#ENVTEST_VERSION is the version of controller-runtime release branch to fetch the envtest setup script (i.e. release-0.20)

‎cmd/volumeprovider/app/app.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ func Run(ctx context.Context, opts Options) error {
208208
}
209209

210210
setupLog.Info("Configuring image store", "OmapName", omap.NameVolumes)
211-
imageStore, err := omap.New(conn, opts.Ceph.Pool, log.WithName("image-store"), omap.Options[*providerapi.Image]{
211+
imageStore, err := omap.New(conn, opts.Ceph.Pool, omap.Options[*providerapi.Image]{
212212
OmapName: omap.NameVolumes,
213213
NewFunc: func() *providerapi.Image { return &providerapi.Image{} },
214214
CreateStrategy: strategy.ImageStrategy,
@@ -227,7 +227,7 @@ func Run(ctx context.Context, opts Options) error {
227227
}
228228

229229
setupLog.Info("Configuring snapshot store", "OmapName", omap.NameSnapshots)
230-
snapshotStore, err := omap.New(conn, opts.Ceph.Pool, log.WithName("snapshot-store"), omap.Options[*providerapi.Snapshot]{
230+
snapshotStore, err := omap.New(conn, opts.Ceph.Pool, omap.Options[*providerapi.Snapshot]{
231231
OmapName: omap.NameSnapshots,
232232
NewFunc: func() *providerapi.Snapshot { return &providerapi.Snapshot{} },
233233
CreateStrategy: strategy.SnapshotStrategy,

‎internal/omap/omap.go‎

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"time"
1414

1515
"github.com/ceph/go-ceph/rados"
16-
"github.com/go-logr/logr"
1716
utilssync "github.com/ironcore-dev/ceph-provider/internal/sync"
1817
"github.com/ironcore-dev/ceph-provider/internal/utils"
1918
apiutils "github.com/ironcore-dev/provider-utils/apiutils/api"
@@ -33,7 +32,7 @@ type Options[E apiutils.Object] struct {
3332
CreateStrategy CreateStrategy[E]
3433
}
3534

36-
func New[E apiutils.Object](conn *rados.Conn, pool string, log logr.Logger, opts Options[E]) (*Store[E], error) {
35+
func New[E apiutils.Object](conn *rados.Conn, pool string, opts Options[E]) (*Store[E], error) {
3736
if conn == nil {
3837
return nil, fmt.Errorf("must specify conn")
3938
}
@@ -63,7 +62,6 @@ func New[E apiutils.Object](conn *rados.Conn, pool string, log logr.Logger, opts
6362

6463
newFunc: opts.NewFunc,
6564
createStrategy: opts.CreateStrategy,
66-
log: log,
6765
}, nil
6866
}
6967

@@ -73,7 +71,6 @@ type Store[E apiutils.Object] struct {
7371
conn *rados.Conn
7472
pool string
7573
omapName string
76-
log logr.Logger
7774

7875
newFunc func() E
7976
createStrategy CreateStrategy[E]
@@ -91,7 +88,6 @@ func formatLabel(key, value string) string {
9188

9289
// updateLabelIndex updates the index for a single object based on its labels.
9390
func (s *Store[E]) updateLabelIndex(objID string, oldLabels, newLabels map[string]string) {
94-
s.log.V(2).Info("Updating label index", "id", objID)
9591
oldLabelSet := sets.New[string]()
9692
for k, v := range oldLabels {
9793
oldLabelSet.Insert(formatLabel(k, v))
@@ -121,12 +117,10 @@ func (s *Store[E]) updateLabelIndex(objID string, oldLabels, newLabels map[strin
121117
s.labelIndex[label].Insert(objID)
122118
}
123119
s.labelIndexMu.Unlock()
124-
s.log.V(2).Info("Label index updated", "id", objID)
125120
}
126121

127122
// removeFromLabelIndex removes an object entirely from the label index.
128123
func (s *Store[E]) removeFromLabelIndex(objID string, labels map[string]string) {
129-
s.log.V(2).Info("Removing object from label index", "id", objID)
130124
s.labelIndexMu.Lock()
131125
for k, v := range labels {
132126
label := formatLabel(k, v)
@@ -138,7 +132,6 @@ func (s *Store[E]) removeFromLabelIndex(objID string, labels map[string]string)
138132
}
139133
}
140134
s.labelIndexMu.Unlock()
141-
s.log.V(2).Info("Object removed from label index", "id", objID)
142135
}
143136

144137
func (s *Store[E]) enqueue(evt store.WatchEvent[E]) {
@@ -173,9 +166,6 @@ func (s *Store[E]) getSingleOmapValue(ioCtx *rados.IOContext, omapName, key stri
173166

174167
func (s *Store[E]) deleteOmapValue(ioCtx *rados.IOContext, omapName, key string) error {
175168
if err := ioCtx.RmOmapKeys(omapName, []string{key}); err != nil {
176-
if errors.Is(err, rados.ErrNotFound) {
177-
return err
178-
}
179169
return fmt.Errorf("unable to delete mapping omap value: %w", err)
180170
}
181171
return nil
@@ -238,7 +228,7 @@ func (s *Store[E]) Delete(ctx context.Context, id string) error {
238228

239229
ioCtx, err := s.conn.OpenIOContext(s.pool)
240230
if err != nil {
241-
return fmt.Errorf("unable to get io context for delete: %w", err)
231+
return fmt.Errorf("unable to get io context: %w", err)
242232
}
243233
defer ioCtx.Destroy()
244234

@@ -275,7 +265,6 @@ func (s *Store[E]) Delete(ctx context.Context, id string) error {
275265
func (s *Store[E]) delete(ioCtx *rados.IOContext, id string) error {
276266
if err := s.deleteOmapValue(ioCtx, s.omapName, id); err != nil {
277267
if errors.Is(err, rados.ErrNotFound) {
278-
s.log.V(1).Info("Attempted to delete non-existent key from omap", "id", id)
279268
return store.ErrNotFound
280269
}
281270
return fmt.Errorf("failed to delete object from omap: %w", err)
@@ -314,23 +303,18 @@ func (s *Store[E]) Update(ctx context.Context, obj E) (E, error) {
314303
newLabels := obj.GetLabels()
315304

316305
if obj.GetDeletedAt() != nil && len(obj.GetFinalizers()) == 0 {
317-
s.log.V(1).Info("Update triggers physical deletion", "id", obj.GetID())
318306
if oldObj.GetResourceVersion() != obj.GetResourceVersion() {
319-
s.log.V(1).Info("ResourceVersion mismatch during update-triggered delete", "id", obj.GetID(), "expected", oldObj.GetResourceVersion(), "got", obj.GetResourceVersion())
320307
return utils.Zero[E](), fmt.Errorf("failed to delete object during update: %w", ErrResourceVersionNotLatest)
321308
}
322309

323310
if err := s.delete(ioCtx, obj.GetID()); err != nil {
324311
if !errors.Is(err, store.ErrNotFound) {
325312
return utils.Zero[E](), fmt.Errorf("failed to delete object from omap during update: %w", err)
326313
}
327-
s.log.V(1).Info("Object already deleted from OMAP during update", "id", obj.GetID())
328314
}
329315
deleted = true
330316
} else {
331-
s.log.V(1).Info("Performing standard update", "id", obj.GetID())
332317
if oldObj.GetResourceVersion() != obj.GetResourceVersion() {
333-
s.log.V(1).Info("ResourceVersion mismatch during update", "id", obj.GetID(), "expected", oldObj.GetResourceVersion(), "got", obj.GetResourceVersion())
334318
return utils.Zero[E](), fmt.Errorf("failed to update object: %w", ErrResourceVersionNotLatest)
335319
}
336320
obj.IncrementResourceVersion()
@@ -339,18 +323,15 @@ func (s *Store[E]) Update(ctx context.Context, obj E) (E, error) {
339323
if err != nil {
340324
return utils.Zero[E](), err
341325
}
342-
s.log.V(1).Info("Object updated in OMAP", "id", obj.GetID(), "newResourceVersion", obj.GetResourceVersion())
343326
}
344327

345328
var eventType store.WatchEventType
346329
if deleted {
347330
s.removeFromLabelIndex(obj.GetID(), oldLabels)
348331
eventType = store.WatchEventTypeDeleted
349-
s.log.V(1).Info("Object removed from label index", "id", obj.GetID())
350332
} else {
351333
s.updateLabelIndex(obj.GetID(), oldLabels, newLabels)
352334
eventType = store.WatchEventTypeUpdated
353-
s.log.V(1).Info("Object updated in label index", "id", obj.GetID())
354335
}
355336

356337
s.enqueue(store.WatchEvent[E]{
@@ -458,12 +439,9 @@ type sizedLabel struct {
458439

459440
func (s *Store[E]) ListByLabels(ctx context.Context, labelSelector map[string]string) ([]E, error) {
460441
if len(labelSelector) == 0 {
461-
s.log.V(1).Info("Empty label selector provided, returning all items (like List)")
462442
return s.List(ctx)
463443
}
464444

465-
s.log.V(1).Info("Listing objects by labels", "selector", labelSelector)
466-
467445
// pre-allocate the slice to avoid extra memory allocations
468446
labelSelect := make([]sizedLabel, 0, len(labelSelector))
469447
var intersection sets.Set[string]
@@ -474,7 +452,6 @@ func (s *Store[E]) ListByLabels(ctx context.Context, labelSelector map[string]st
474452
label := formatLabel(key, value)
475453
ids, found := s.labelIndex[label]
476454
if !found {
477-
s.log.V(1).Info("Label not found in index, no objects match the full selector", "label", label, "selector", labelSelector)
478455
return []E{}, nil
479456
}
480457

@@ -499,17 +476,13 @@ func (s *Store[E]) ListByLabels(ctx context.Context, labelSelector map[string]st
499476
if isFirstLabel {
500477
// Use the smallest set to initialize the intersection (copy to avoid modifying the index set).
501478
intersection = ids.Clone()
502-
s.log.V(1).Info("Initialized intersection set with label", "initial_count", intersection.Len())
503479
isFirstLabel = false
504480
} else {
505481
// Intersect the current result with the next smallest set.
506-
prevCount := intersection.Len()
507482
intersection = intersection.Intersection(ids)
508-
s.log.V(1).Info("Computed intersection", "previous_count", prevCount, "new_count", intersection.Len())
509483
}
510484

511485
if intersection.Len() == 0 {
512-
s.log.V(1).Info("Intersection of label matches became empty, returning empty list", "selector", labelSelector)
513486
return []E{}, nil
514487
}
515488
}
@@ -520,15 +493,12 @@ func (s *Store[E]) ListByLabels(ctx context.Context, labelSelector map[string]st
520493
if err != nil {
521494
if errors.Is(err, store.ErrNotFound) {
522495
// Object was deleted after index lookup; skip stale entry
523-
s.log.V(1).Info("Object removed between index lookup and Get, skipping", "id", id)
524496
continue
525497
}
526-
s.log.Error(err, "Failed to get object from store during ListByLabels", "id", id)
527498
return nil, err
528499
}
529500
objs = append(objs, obj)
530501
}
531502

532-
s.log.V(1).Info("Successfully retrieved objects matching label selector", "count", len(objs), "selector", labelSelector)
533503
return objs, nil
534504
}

‎internal/volumeserver/volume_list.go‎

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ import (
1414
iri "github.com/ironcore-dev/ironcore/iri/apis/volume/v1alpha1"
1515
providerapi "github.com/ironcore-dev/provider-utils/apiutils/api"
1616
"github.com/ironcore-dev/provider-utils/storeutils/store"
17-
"google.golang.org/grpc/codes"
18-
"google.golang.org/grpc/status"
1917
)
2018

2119
// imageListerWithLabels type parameter E is constrained to be a providerapi.Object.
@@ -24,20 +22,16 @@ type imageListerWithLabels[E providerapi.Object] interface {
2422
ListByLabels(ctx context.Context, labelSelector map[string]string) ([]E, error)
2523
}
2624

27-
func (s *Server) getIriVolume(ctx context.Context, log logr.Logger, imageId string) (*iri.Volume, error) {
25+
func (s *Server) getIriVolume(ctx context.Context, imageId string) (*iri.Volume, error) {
2826
cephImage, err := s.imageStore.Get(ctx, imageId)
2927
if err != nil {
30-
if errors.Is(err, store.ErrNotFound) {
31-
log.V(1).Info("Volume not found in store", "imageID", imageId)
32-
return nil, status.Errorf(codes.NotFound, "volume %s not found", imageId)
28+
if errors.Is(err, utils.ErrVolumeNotFound) {
29+
return nil, fmt.Errorf("failed to get image %s: %w", imageId, utils.ErrVolumeNotFound)
3330
}
34-
log.Error(err, "Failed to get volume from store", "imageID", imageId)
35-
return nil, fmt.Errorf("failed to get image: %w", err)
3631
}
3732

3833
if !api.IsObjectManagedBy(cephImage, api.VolumeManager) {
39-
log.V(1).Info("Volume is not managed by this manager", "volumeID", imageId, "managerLabel", cephImage.GetLabels()["ceph-volume-manager"])
40-
return nil, status.Errorf(codes.NotFound, "volume %s not found (not managed)", imageId)
34+
return nil, fmt.Errorf("failed to get image %s: %w", imageId, utils.ErrVolumeIsntManaged)
4135
}
4236

4337
return s.convertImageToIriVolume(cephImage)
@@ -50,19 +44,18 @@ func (s *Server) listVolumes(ctx context.Context, log logr.Logger) ([]*iri.Volum
5044
return nil, fmt.Errorf("error listing volumes: %w", err)
5145
}
5246
log.V(1).Info("Listed all volumes from store", "count", len(cephImages))
53-
return s.listAndConvert(log, cephImages)
47+
return s.listAndConvert(cephImages)
5448
}
5549

56-
func (s *Server) listAndConvert(log logr.Logger, cephImages []*api.Image) ([]*iri.Volume, error) {
50+
func (s *Server) listAndConvert(cephImages []*api.Image) ([]*iri.Volume, error) {
5751
res := make([]*iri.Volume, 0, len(cephImages))
5852
for _, cephImage := range cephImages {
5953
if !api.IsObjectManagedBy(cephImage, api.VolumeManager) {
6054
continue
6155
}
6256
iriVolume, err := s.convertImageToIriVolume(cephImage)
6357
if err != nil {
64-
log.Error(err, "Failed to convert ceph image to ori volume", "imageID", cephImage.GetID())
65-
continue
58+
return nil, err
6659
}
6760
res = append(res, iriVolume)
6861
}
@@ -75,19 +68,20 @@ func (s *Server) ListVolumes(ctx context.Context, req *iri.ListVolumesRequest) (
7568
log.V(2).Info("Listing volumes")
7669

7770
// Fast path for ID filter
78-
if filter != nil && filter.Id != "" {
79-
log.V(1).Info("Filtering by Volume ID", "VolumeID", filter.Id)
80-
volume, err := s.getIriVolume(ctx, log, filter.Id)
71+
if filter := req.Filter; filter != nil && filter.Id != "" {
72+
volume, err := s.getIriVolume(ctx, filter.Id)
8173
if err != nil {
82-
if status.Code(err) == codes.NotFound {
83-
log.V(1).Info("Volume not found by ID", "VolumeID", filter.Id)
84-
return &iri.ListVolumesResponse{Volumes: []*iri.Volume{}}, nil
74+
if !errors.Is(err, utils.ErrVolumeNotFound) && !errors.Is(err, utils.ErrVolumeIsntManaged) {
75+
return nil, utils.ConvertInternalErrorToGRPC(err)
8576
}
86-
log.Error(err, "Error getting volume by ID", "VolumeID", filter.Id)
87-
return nil, err
77+
return &iri.ListVolumesResponse{
78+
Volumes: []*iri.Volume{},
79+
}, nil
8880
}
89-
// Found by ID
90-
return &iri.ListVolumesResponse{Volumes: []*iri.Volume{volume}}, nil
81+
82+
return &iri.ListVolumesResponse{
83+
Volumes: []*iri.Volume{volume},
84+
}, nil
9185
}
9286

9387
// Fast path for LabelSelector filter (using the new index)
@@ -102,7 +96,7 @@ func (s *Server) ListVolumes(ctx context.Context, req *iri.ListVolumesRequest) (
10296
log.V(1).Info("Listed volumes using label index", "count", len(cephImages))
10397

10498
// Convert results
105-
volumes, err := s.listAndConvert(log, cephImages)
99+
volumes, err := s.listAndConvert(cephImages)
106100
if err != nil {
107101
log.Error(err, "Error converting volumes found by label", "Selector", filter.LabelSelector)
108102
return nil, fmt.Errorf("error converting listed volumes: %w", err)

0 commit comments

Comments
 (0)