From b73cd9eeef0845d986c7ad717145ce2f61146995 Mon Sep 17 00:00:00 2001 From: Erkan Erol Date: Tue, 30 Jul 2024 16:10:30 +0300 Subject: [PATCH 1/2] Add more logs to debug --- CHANGELOG.md | 4 ++++ controllers/vspherecluster_controller.go | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 056960f..588657f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed + +- Add more logs to improve debugging. + ## [0.3.0] - 2024-07-24 ### Changed diff --git a/controllers/vspherecluster_controller.go b/controllers/vspherecluster_controller.go index 0307261..f97552c 100644 --- a/controllers/vspherecluster_controller.go +++ b/controllers/vspherecluster_controller.go @@ -100,6 +100,7 @@ func (r *VSphereClusterReconciler) SetupWithManager(mgr ctrl.Manager) error { } func (r *VSphereClusterReconciler) reconcileNormal(ctx context.Context, log logr.Logger, vsphereCluster *capv.VSphereCluster) (reconcile.Result, error) { + log.V(1).Info("Reconciling for normal state") // If the vsphereCluster doesn't have the finalizer, add it. err := r.addFinalizer(ctx, log, vsphereCluster) if err != nil { @@ -124,8 +125,10 @@ func (r *VSphereClusterReconciler) reconcileNormal(ctx context.Context, log logr } func (r *VSphereClusterReconciler) reconcileDelete(ctx context.Context, log logr.Logger, vsphereCluster *capv.VSphereCluster) (reconcile.Result, error) { + log.V(1).Info("Reconciling for deletion") if !controllerutil.ContainsFinalizer(vsphereCluster, key.CleanerFinalizerName) { - // no-op in case the finalizer is not there (it could have been deleted manually) + // the cleanup is already done + log.V(1).Info("There is no finalizer on VsphereCluster CR. Deletion should have already been done") return ctrl.Result{}, nil } @@ -139,6 +142,7 @@ func (r *VSphereClusterReconciler) reconcileDelete(ctx context.Context, log logr sess, err := r.getVCenterSession(ctx, vsphereCluster) if err != nil { + log.V(1).Error(err, "Error while getting vcenter session") return reconcile.Result{}, microerror.Mask(err) } From f35c6d0e3a95a07bc26da2a96b7db01d0f01dd66 Mon Sep 17 00:00:00 2001 From: Erkan Erol Date: Thu, 1 Aug 2024 11:51:40 +0300 Subject: [PATCH 2/2] Set keep alive false to fix session problems --- CHANGELOG.md | 1 + controllers/vspherecluster_controller.go | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 588657f..8307e31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Add more logs to improve debugging. +- Set `EnableKeepAlive=false` to avoid deadlock. ## [0.3.0] - 2024-07-24 diff --git a/controllers/vspherecluster_controller.go b/controllers/vspherecluster_controller.go index f97552c..bbcc377 100644 --- a/controllers/vspherecluster_controller.go +++ b/controllers/vspherecluster_controller.go @@ -190,7 +190,10 @@ func (r *VSphereClusterReconciler) getVCenterSession(ctx context.Context, cluste return nil, err } - params = params.WithUserInfo(creds.Username, creds.Password) + params = params. + WithUserInfo(creds.Username, creds.Password). + WithFeatures(session.Feature{EnableKeepAlive: false}) + return session.GetOrCreate(ctx, params) }