Skip to content

fix: handle missing LVMVolumeGroupNodeStatus gracefully in vg-manager #2462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lmiccini wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −19
Open

fix: handle missing LVMVolumeGroupNodeStatus gracefully in vg-manager #2462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions internal/controllers/vgmanager/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,10 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu

nodeStatus := r.getLVMVolumeGroupNodeStatus()
if err := r.Get(ctx, client.ObjectKeyFromObject(nodeStatus), nodeStatus); err != nil {
if apierrors.IsNotFound(err) {
logger.Info("LVMVolumeGroupNodeStatus not yet created by LVMCluster controller, requeueing")
return ctrl.Result{RequeueAfter: 10 * time.Second}, nil
}
return ctrl.Result{}, fmt.Errorf("could not get LVMVolumeGroupNodeStatus: %w", err)
}

Expand Down
32 changes: 13 additions & 19 deletions internal/controllers/vgmanager/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,26 +801,19 @@ func testNodeSelector(ctx context.Context) {
Expect(err).ToNot(HaveOccurred(), "should not error on invalid node selector, but filter out")
Expect(res).To(Equal(reconcile.Result{}))

By("then verifying incorrect node resolution because nodestatus cannot be created")
funcs := interceptor.Funcs{Create: func(ctx context.Context, client client.WithWatch, obj client.Object, opts ...client.CreateOption) error {
if obj.GetName() == "test-node" {
return fmt.Errorf("mock creation failure for LVMVolumeGroupNodeStatus")
}
return client.Create(ctx, obj, opts...)
}}
By("then verifying requeue when LVMVolumeGroupNodeStatus does not exist yet")
fakeClient = fake.NewClientBuilder().WithScheme(scheme.Scheme).
WithObjects(matchingNode, notMatchingNode, volumeGroup, invalidVolumeGroup).
WithInterceptorFuncs(funcs).
Build()
r = &Reconciler{
Client: fakeClient,
Scheme: scheme.Scheme,
NodeName: "test-node",
Client: fakeClient,
Scheme: scheme.Scheme,
NodeName: "test-node",
Namespace: volumeGroup.GetNamespace(),
}
By("verifying incorrect node resolution because nodestatus cannot be created")
res, err = r.Reconcile(ctx, reconcile.Request{NamespacedName: client.ObjectKeyFromObject(volumeGroup)})
Expect(err).To(HaveOccurred(), "should error on valid node selector due to failure of nodestatus creation")
Expect(res).To(Equal(reconcile.Result{}))
Expect(err).ToNot(HaveOccurred(), "should not error when LVMVolumeGroupNodeStatus is not found, but requeue")
Expect(res).To(Equal(reconcile.Result{RequeueAfter: 10 * time.Second}))
Comment thread
coderabbitai[bot] marked this conversation as resolved.

fakeClient = fake.NewClientBuilder().WithScheme(scheme.Scheme).
WithObjects(matchingNode, notMatchingNode, volumeGroup, invalidVolumeGroup).
Expand All @@ -834,8 +827,8 @@ func testNodeSelector(ctx context.Context) {
Expect(err).To(HaveOccurred(), "should error during node match resolution")
Expect(res).To(Equal(reconcile.Result{}))

By("then verifying incorrect node resolution because nodestatus cannot be created")
funcs = interceptor.Funcs{Get: func(ctx context.Context, client client.WithWatch, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
By("then verifying error when LVMVolumeGroupNodeStatus get fails with non-NotFound error")
funcs := interceptor.Funcs{Get: func(ctx context.Context, client client.WithWatch, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
if key.Name == matchingNode.Name {
if nodeStatus, ok := obj.(*lvmv1alpha1.LVMVolumeGroupNodeStatus); ok {
return fmt.Errorf("mock get failure for LVMVolumeGroupNodeStatus %s", nodeStatus.GetName())
Expand All @@ -848,9 +841,10 @@ func testNodeSelector(ctx context.Context) {
WithInterceptorFuncs(funcs).
Build()
r = &Reconciler{
Client: fakeClient,
Scheme: scheme.Scheme,
NodeName: "test-node",
Client: fakeClient,
Scheme: scheme.Scheme,
NodeName: "test-node",
Namespace: volumeGroup.GetNamespace(),
}
By("verifying incorrect node resolution because nodestatus cannot be fetched from cluster")
res, err = r.Reconcile(ctx, reconcile.Request{NamespacedName: client.ObjectKeyFromObject(volumeGroup)})
Expand Down