Move recording of generation to end of reconcile

migtools · Mar 26, 2021 · c437b28 · c437b28
1 parent 2a81bf1
commit c437b28
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 22 deletions.
diff --git a/pkg/controller/directimagemigration/directimagemigration_controller.go b/pkg/controller/directimagemigration/directimagemigration_controller.go
@@ -133,8 +133,6 @@ func (r *ReconcileDirectImageMigration) Reconcile(request reconcile.Request) (re
 	if r.uidGenerationMap.IsCacheStale(imageMigration.UID, imageMigration.Generation) {
 		return reconcile.Result{Requeue: true}, nil
 	}
-	// Record reconciled generation
-	defer r.uidGenerationMap.RecordReconciledGeneration(imageMigration.UID, imageMigration.Generation)
 
 	// Set up jaeger tracing
 	reconcileSpan := r.initTracer(imageMigration)
@@ -185,6 +183,9 @@ func (r *ReconcileDirectImageMigration) Reconcile(request reconcile.Request) (re
 		return reconcile.Result{Requeue: true}, nil
 	}
 
+	// Record reconciled generation
+	r.uidGenerationMap.RecordReconciledGeneration(imageMigration.UID, imageMigration.Generation)
+
 	// Requeue
 	if requeueAfter > 0 {
 		return reconcile.Result{RequeueAfter: requeueAfter}, nil

diff --git a/pkg/controller/directimagestreammigration/directimagestreammigration_controller.go b/pkg/controller/directimagestreammigration/directimagestreammigration_controller.go
@@ -124,9 +124,6 @@ func (r *ReconcileDirectImageStreamMigration) Reconcile(request reconcile.Reques
 	if r.uidGenerationMap.IsCacheStale(imageStreamMigration.UID, imageStreamMigration.Generation) {
 		return reconcile.Result{Requeue: true}, nil
 	}
-	// Record reconciled generation
-	defer r.uidGenerationMap.RecordReconciledGeneration(
-		imageStreamMigration.UID, imageStreamMigration.Generation)
 
 	// Set up jaeger tracing
 	reconcileSpan, err := r.initTracer(*imageStreamMigration)
@@ -177,6 +174,10 @@ func (r *ReconcileDirectImageStreamMigration) Reconcile(request reconcile.Reques
 		return reconcile.Result{Requeue: true}, nil
 	}
 
+	// Record reconciled generation
+	r.uidGenerationMap.RecordReconciledGeneration(
+		imageStreamMigration.UID, imageStreamMigration.Generation)
+
 	// Requeue
 	if requeueAfter > 0 {
 		return reconcile.Result{RequeueAfter: requeueAfter}, nil

diff --git a/pkg/controller/directvolumemigration/directvolumemigration_controller.go b/pkg/controller/directvolumemigration/directvolumemigration_controller.go
@@ -117,8 +117,6 @@ func (r *ReconcileDirectVolumeMigration) Reconcile(request reconcile.Request) (r
 	if r.uidGenerationMap.IsCacheStale(direct.UID, direct.Generation) {
 		return reconcile.Result{Requeue: true}, nil
 	}
-	// Record reconciled generation
-	defer r.uidGenerationMap.RecordReconciledGeneration(direct.UID, direct.Generation)
 
 	// Set up jaeger tracing
 	reconcileSpan := r.initTracer(direct)
@@ -172,6 +170,9 @@ func (r *ReconcileDirectVolumeMigration) Reconcile(request reconcile.Request) (r
 		return reconcile.Result{Requeue: true}, nil
 	}
 
+	// Record reconciled generation
+	r.uidGenerationMap.RecordReconciledGeneration(direct.UID, direct.Generation)
+
 	// Requeue
 	if requeueAfter > 0 {
 		return reconcile.Result{RequeueAfter: requeueAfter}, nil

diff --git a/pkg/controller/directvolumemigrationprogress/directvolumemigrationprogress_controller.go b/pkg/controller/directvolumemigrationprogress/directvolumemigrationprogress_controller.go
@@ -147,8 +147,6 @@ func (r *ReconcileDirectVolumeMigrationProgress) Reconcile(request reconcile.Req
 	if r.uidGenerationMap.IsCacheStale(pvProgress.UID, pvProgress.Generation) {
 		return reconcile.Result{Requeue: true}, nil
 	}
-	// Record reconciled generation
-	defer r.uidGenerationMap.RecordReconciledGeneration(pvProgress.UID, pvProgress.Generation)
 
 	// Set up jaeger tracing
 	reconcileSpan, err := r.initTracer(*pvProgress)
@@ -191,7 +189,10 @@ func (r *ReconcileDirectVolumeMigrationProgress) Reconcile(request reconcile.Req
 		return reconcile.Result{Requeue: true}, nil
 	}
 
-	// we will requeue this every 5 seconds
+	// Record reconciled generation
+	r.uidGenerationMap.RecordReconciledGeneration(pvProgress.UID, pvProgress.Generation)
+
+	// Requeue every 5 seconds
 	return reconcile.Result{Requeue: true, RequeueAfter: time.Second * 5}, nil
 }
 

diff --git a/pkg/controller/miganalytic/miganalytics_controller.go b/pkg/controller/miganalytic/miganalytics_controller.go
@@ -149,8 +149,6 @@ func (r *ReconcileMigAnalytic) Reconcile(request reconcile.Request) (reconcile.R
 	if r.uidGenerationMap.IsCacheStale(analytic.UID, analytic.Generation) {
 		return reconcile.Result{Requeue: true}, nil
 	}
-	// Record reconciled generation
-	defer r.uidGenerationMap.RecordReconciledGeneration(analytic.UID, analytic.Generation)
 
 	// Exit early if the MigAnalytic already has a ready condition
 	// and Refresh boolean is unset
@@ -224,6 +222,9 @@ func (r *ReconcileMigAnalytic) Reconcile(request reconcile.Request) (reconcile.R
 		return reconcile.Result{Requeue: true}, nil
 	}
 
+	// Record reconciled generation
+	r.uidGenerationMap.RecordReconciledGeneration(analytic.UID, analytic.Generation)
+
 	// Done
 	return reconcile.Result{Requeue: false}, nil
 }

diff --git a/pkg/controller/migcluster/migcluster_controller.go b/pkg/controller/migcluster/migcluster_controller.go
@@ -132,8 +132,6 @@ func (r *ReconcileMigCluster) Reconcile(request reconcile.Request) (reconcile.Re
 	if r.uidGenerationMap.IsCacheStale(cluster.UID, cluster.Generation) {
 		return reconcile.Result{Requeue: true}, nil
 	}
-	// Record reconciled generation
-	defer r.uidGenerationMap.RecordReconciledGeneration(cluster.UID, cluster.Generation)
 
 	// Report reconcile error.
 	defer func() {
@@ -193,6 +191,9 @@ func (r *ReconcileMigCluster) Reconcile(request reconcile.Request) (reconcile.Re
 		return reconcile.Result{Requeue: true}, nil
 	}
 
+	// Record reconciled generation
+	r.uidGenerationMap.RecordReconciledGeneration(cluster.UID, cluster.Generation)
+
 	// Done
 	return reconcile.Result{Requeue: false}, nil
 }
diff --git a/pkg/controller/mighook/mighook_controller.go b/pkg/controller/mighook/mighook_controller.go
@@ -104,8 +104,6 @@ func (r *ReconcileMigHook) Reconcile(request reconcile.Request) (reconcile.Resul
 	if r.uidGenerationMap.IsCacheStale(hook.UID, hook.Generation) {
 		return reconcile.Result{Requeue: true}, nil
 	}
-	// Record reconciled generation
-	defer r.uidGenerationMap.RecordReconciledGeneration(hook.UID, hook.Generation)
 
 	// Report reconcile error.
 	defer func() {
@@ -148,6 +146,9 @@ func (r *ReconcileMigHook) Reconcile(request reconcile.Request) (reconcile.Resul
 		return reconcile.Result{Requeue: true}, nil
 	}
 
+	// Record reconciled generation
+	r.uidGenerationMap.RecordReconciledGeneration(hook.UID, hook.Generation)
+
 	// Done
 	return reconcile.Result{Requeue: false}, nil
 }
diff --git a/pkg/controller/migmigration/migmigration_controller.go b/pkg/controller/migmigration/migmigration_controller.go
@@ -174,8 +174,6 @@ func (r *ReconcileMigMigration) Reconcile(request reconcile.Request) (reconcile.
 	if r.uidGenerationMap.IsCacheStale(migration.UID, migration.Generation) {
 		return reconcile.Result{Requeue: true}, nil
 	}
-	// Record reconciled generation
-	defer r.uidGenerationMap.RecordReconciledGeneration(migration.UID, migration.Generation)
 
 	// Get jaeger spans for migration and reconcile
 	_, reconcileSpan := r.initTracer(migration)
@@ -276,6 +274,9 @@ func (r *ReconcileMigMigration) Reconcile(request reconcile.Request) (reconcile.
 		return reconcile.Result{Requeue: true}, nil
 	}
 
+	// Record reconciled generation
+	r.uidGenerationMap.RecordReconciledGeneration(migration.UID, migration.Generation)
+
 	// Requeue
 	if requeueAfter > 0 {
 		return reconcile.Result{RequeueAfter: requeueAfter}, nil

diff --git a/pkg/controller/migplan/migplan_controller.go b/pkg/controller/migplan/migplan_controller.go
@@ -204,8 +204,6 @@ func (r *ReconcileMigPlan) Reconcile(request reconcile.Request) (reconcile.Resul
 	if r.uidGenerationMap.IsCacheStale(plan.UID, plan.Generation) {
 		return reconcile.Result{Requeue: true}, nil
 	}
-	// Record reconciled generation
-	defer r.uidGenerationMap.RecordReconciledGeneration(plan.UID, plan.Generation)
 
 	// Report reconcile error.
 	defer func() {
@@ -332,6 +330,9 @@ func (r *ReconcileMigPlan) Reconcile(request reconcile.Request) (reconcile.Resul
 		return reconcile.Result{Requeue: true}, nil
 	}
 
+	// Record reconciled generation
+	r.uidGenerationMap.RecordReconciledGeneration(plan.UID, plan.Generation)
+
 	// Timed requeue on Plan conflict.
 	if plan.Status.HasCondition(PlanConflict) {
 		return reconcile.Result{RequeueAfter: time.Second * 10}, nil

diff --git a/pkg/controller/migstorage/migstorage_controller.go b/pkg/controller/migstorage/migstorage_controller.go
@@ -130,8 +130,6 @@ func (r *ReconcileMigStorage) Reconcile(request reconcile.Request) (reconcile.Re
 	if r.uidGenerationMap.IsCacheStale(storage.UID, storage.Generation) {
 		return reconcile.Result{Requeue: true}, nil
 	}
-	// Record reconciled generation
-	defer r.uidGenerationMap.RecordReconciledGeneration(storage.UID, storage.Generation)
 
 	// Report reconcile error.
 	defer func() {
@@ -177,6 +175,9 @@ func (r *ReconcileMigStorage) Reconcile(request reconcile.Request) (reconcile.Re
 		return reconcile.Result{Requeue: true}, nil
 	}
 
+	// Record reconciled generation
+	r.uidGenerationMap.RecordReconciledGeneration(storage.UID, storage.Generation)
+
 	// Done
 	return reconcile.Result{Requeue: false}, nil
 }