Update

Signed-off-by: Wenqi Qiu <[email protected]>
wenqiq · Sep 24, 2024 · 7c8d783 · 7c8d783
1 parent 6a301a3
commit 7c8d783
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/pkg/controllers/subnet/subnet_controller.go b/pkg/controllers/subnet/subnet_controller.go
@@ -49,8 +49,7 @@ type SubnetReconciler struct {
 func (r *SubnetReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	startTime := time.Now()
 	defer func() {
-		d := time.Since(startTime)
-		log.Info("Finished reconciling Subnet", "Subnet", req.NamespacedName, "time", d)
+		log.Info("Finished reconciling Subnet", "Subnet", req.NamespacedName, "time", time.Since(startTime))
 	}()
 	metrics.CounterInc(r.SubnetService.NSXConfig, metrics.ControllerSyncTotal, MetricResTypeSubnet)
 
@@ -68,12 +67,12 @@ func (r *SubnetReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
 	if !subnetCR.DeletionTimestamp.IsZero() {
 		metrics.CounterInc(r.SubnetService.NSXConfig, metrics.ControllerDeleteTotal, MetricResTypeSubnet)
 		if err := r.DeleteSubnetByID(*subnetCR); err != nil {
-			log.Error(err, "deletion failed, would retry exponentially", "Subnet", req.NamespacedName)
+			log.Error(err, "deletion NSX Subnet failed, would retry exponentially", "Subnet", req.NamespacedName)
 			deleteFail(r, ctx, subnetCR, err.Error())
 			return ResultRequeue, err
 		}
 		if err := r.Client.Delete(ctx, subnetCR); err != nil {
-			log.Error(err, "deletion failed, would retry exponentially", "Subnet", req.NamespacedName)
+			log.Error(err, "deletion Subnet CR failed, would retry exponentially", "Subnet", req.NamespacedName)
 			deleteFail(r, ctx, subnetCR, err.Error())
 			return ResultRequeue, err
 		}

diff --git a/pkg/controllers/subnetset/subnetset_controller.go b/pkg/controllers/subnetset/subnetset_controller.go
@@ -51,8 +51,7 @@ type SubnetSetReconciler struct {
 func (r *SubnetSetReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	startTime := time.Now()
 	defer func() {
-		d := time.Since(startTime)
-		log.Info("Finished reconciling SubnetSet", "SubnetSet", req.NamespacedName, "time", d)
+		log.Info("Finished reconciling SubnetSet", "SubnetSet", req.NamespacedName, "time", time.Since(startTime))
 	}()
 
 	subnetsetCR := &v1alpha1.SubnetSet{}
@@ -72,12 +71,12 @@ func (r *SubnetSetReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 		metrics.CounterInc(r.SubnetService.NSXConfig, metrics.ControllerDeleteTotal, MetricResTypeSubnetSet)
 		err := r.deleteSubnetForSubnetSet(*subnetsetCR, false)
 		if err != nil {
-			log.Error(err, "deletion failed, would retry exponentially", "SubnetSet", req.NamespacedName)
+			log.Error(err, "deletion NSX Subnet failed, would retry exponentially", "SubnetSet", req.NamespacedName)
 			deleteFail(r, ctx, subnetsetCR, err.Error())
 			return ResultRequeue, err
 		}
 		if err := r.Client.Delete(ctx, subnetsetCR); err != nil {
-			log.Error(err, "deletion failed, would retry exponentially", "SubnetSet", req.NamespacedName)
+			log.Error(err, "deletion Subnet CR failed, would retry exponentially", "SubnetSet", req.NamespacedName)
 			deleteFail(r, ctx, subnetsetCR, err.Error())
 			return ResultRequeue, err
 		}