handle syncNodeSetSpecInline inside handleResourcesSync func

kobzonega · kobzonega · commit c295acdd0626 · 2025-01-28T01:34:28.000+08:00
diff --git a/internal/controllers/database/sync.go b/internal/controllers/database/sync.go
@@ -48,11 +48,6 @@ func (r *Reconciler) Sync(ctx context.Context, ydbCr *v1alpha1.Database) (ctrl.R
 		return result, err
 	}
 
-	stop, result, err = r.syncNodeSetSpecInline(ctx, &database)
-	if stop {
-		return result, err
-	}
-
 	if !meta.IsStatusConditionTrue(database.Status.Conditions, DatabaseInitializedCondition) {
 		return r.handleTenantCreation(ctx, &database)
 	}
@@ -464,6 +459,17 @@ func (r *Reconciler) handleResourcesSync(
 		}
 	}
 
+	if err := r.syncNodeSetSpecInline(ctx, database); err != nil {
+		meta.SetStatusCondition(&database.Status.Conditions, metav1.Condition{
+			Type:               DatabasePreparedCondition,
+			Status:             metav1.ConditionFalse,
+			Reason:             ReasonInProgress,
+			ObservedGeneration: database.Generation,
+			Message:            "Failed to sync NodeSet resources",
+		})
+		return r.updateStatus(ctx, database, DefaultRequeueDelay)
+	}
+
 	if !meta.IsStatusConditionTrue(database.Status.Conditions, DatabasePreparedCondition) {
 		meta.SetStatusCondition(&database.Status.Conditions, metav1.Condition{
 			Type:               DatabasePreparedCondition,
@@ -550,9 +556,7 @@ func (r *Reconciler) updateStatus(
 func (r *Reconciler) syncNodeSetSpecInline(
 	ctx context.Context,
 	database *resources.DatabaseBuilder,
-) (bool, ctrl.Result, error) {
-	r.Log.Info("running step syncNodeSetSpecInline")
-
+) error {
 	databaseNodeSets := &v1alpha1.DatabaseNodeSetList{}
 	if err := r.List(ctx, databaseNodeSets,
 		client.InNamespace(database.Namespace),
@@ -566,7 +570,7 @@ func (r *Reconciler) syncNodeSetSpecInline(
 			"ProvisioningFailed",
 			fmt.Sprintf("Failed to list DatabaseNodeSets: %s", err),
 		)
-		return Stop, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, err
+		return err
 	}
 
 	for _, databaseNodeSet := range databaseNodeSets.Items {
@@ -589,7 +593,7 @@ func (r *Reconciler) syncNodeSetSpecInline(
 					"ProvisioningFailed",
 					fmt.Sprintf("Failed to delete DatabaseNodeSet: %s", err),
 				)
-				return Stop, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, err
+				return err
 			}
 			r.Recorder.Event(
 				database,
@@ -616,7 +620,7 @@ func (r *Reconciler) syncNodeSetSpecInline(
 			"ProvisioningFailed",
 			fmt.Sprintf("Failed to list RemoteDatabaseNodeSets: %s", err),
 		)
-		return Stop, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, err
+		return err
 	}
 
 	for _, remoteDatabaseNodeSet := range remoteDatabaseNodeSets.Items {
@@ -640,7 +644,7 @@ func (r *Reconciler) syncNodeSetSpecInline(
 					"ProvisioningFailed",
 					fmt.Sprintf("Failed to delete RemoteDatabaseNodeSet: %s", err),
 				)
-				return Stop, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, err
+				return err
 			}
 			r.Recorder.Event(
 				database,
@@ -654,8 +658,7 @@ func (r *Reconciler) syncNodeSetSpecInline(
 		}
 	}
 
-	r.Log.Info("complete step syncNodeSetSpecInline")
-	return Continue, ctrl.Result{Requeue: false}, nil
+	return nil
 }
 
 func (r *Reconciler) handlePauseResume(
diff --git a/internal/controllers/storage/sync.go b/internal/controllers/storage/sync.go
@@ -41,11 +41,6 @@ func (r *Reconciler) Sync(ctx context.Context, cr *v1alpha1.Storage) (ctrl.Resul
 		return result, err
 	}
 
-	stop, result, err = r.syncNodeSetSpecInline(ctx, &storage)
-	if stop {
-		return result, err
-	}
-
 	if !meta.IsStatusConditionTrue(storage.Status.Conditions, StorageInitializedCondition) {
 		return r.handleBlobstorageInit(ctx, &storage)
 	}
@@ -400,6 +395,17 @@ func (r *Reconciler) handleResourcesSync(
 		}
 	}
 
+	if err := r.syncNodeSetSpecInline(ctx, storage); err != nil {
+		meta.SetStatusCondition(&storage.Status.Conditions, metav1.Condition{
+			Type:               StoragePreparedCondition,
+			Status:             metav1.ConditionFalse,
+			Reason:             ReasonInProgress,
+			ObservedGeneration: storage.Generation,
+			Message:            "Failed to sync NodeSet resources",
+		})
+		return r.updateStatus(ctx, storage, DefaultRequeueDelay)
+	}
+
 	if !meta.IsStatusConditionTrue(storage.Status.Conditions, StoragePreparedCondition) {
 		meta.SetStatusCondition(&storage.Status.Conditions, metav1.Condition{
 			Type:               StoragePreparedCondition,
@@ -418,8 +424,7 @@ func (r *Reconciler) handleResourcesSync(
 func (r *Reconciler) syncNodeSetSpecInline(
 	ctx context.Context,
 	storage *resources.StorageClusterBuilder,
-) (bool, ctrl.Result, error) {
-	r.Log.Info("running step syncNodeSetSpecInline")
+) error {
 	matchingFields := client.MatchingFields{
 		OwnerControllerField: storage.Name,
 	}
@@ -435,7 +440,7 @@ func (r *Reconciler) syncNodeSetSpecInline(
 			"ProvisioningFailed",
 			fmt.Sprintf("Failed to list StorageNodeSets: %s", err),
 		)
-		return Stop, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, err
+		return err
 	}
 
 	for _, storageNodeSet := range storageNodeSets.Items {
@@ -459,7 +464,7 @@ func (r *Reconciler) syncNodeSetSpecInline(
 					"ProvisioningFailed",
 					fmt.Sprintf("Failed to delete StorageNodeSet: %s", err),
 				)
-				return Stop, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, err
+				return err
 			}
 			r.Recorder.Event(
 				storage,
@@ -484,7 +489,7 @@ func (r *Reconciler) syncNodeSetSpecInline(
 			"ProvisioningFailed",
 			fmt.Sprintf("Failed to list RemoteStorageNodeSets: %s", err),
 		)
-		return Stop, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, err
+		return err
 	}
 
 	for _, remoteStorageNodeSet := range remoteStorageNodeSets.Items {
@@ -508,7 +513,7 @@ func (r *Reconciler) syncNodeSetSpecInline(
 					"ProvisioningFailed",
 					fmt.Sprintf("Failed to delete RemoteStorageNodeSet: %s", err),
 				)
-				return Stop, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, err
+				return err
 			}
 			r.Recorder.Event(
 				storage,
@@ -522,19 +527,7 @@ func (r *Reconciler) syncNodeSetSpecInline(
 		}
 	}
 
-	if !meta.IsStatusConditionTrue(storage.Status.Conditions, StoragePreparedCondition) {
-		meta.SetStatusCondition(&storage.Status.Conditions, metav1.Condition{
-			Type:               StoragePreparedCondition,
-			Status:             metav1.ConditionTrue,
-			Reason:             ReasonCompleted,
-			ObservedGeneration: storage.Generation,
-			Message:            "Successfully synced resources",
-		})
-		return r.updateStatus(ctx, storage, StatusUpdateRequeueDelay)
-	}
-
-	r.Log.Info("complete step syncNodeSetSpecInline")
-	return Continue, ctrl.Result{Requeue: false}, nil
+	return nil
 }
 
 func (r *Reconciler) runSelfCheck(

Original file line number	Diff line number	Diff line change
`@@ -48,11 +48,6 @@ func (r Reconciler) Sync(ctx context.Context, ydbCr v1alpha1.Database) (ctrl.R`
`48`	`48`	`return result, err`
`49`	`49`	`}`
`50`	`50`
`51`		`- stop, result, err = r.syncNodeSetSpecInline(ctx, &database)`
`52`		`- if stop {`
`53`		`- return result, err`
`54`		`- }`
`55`		`-`
`56`	`51`	`if !meta.IsStatusConditionTrue(database.Status.Conditions, DatabaseInitializedCondition) {`
`57`	`52`	`return r.handleTenantCreation(ctx, &database)`
`58`	`53`	`}`
`@@ -464,6 +459,17 @@ func (r *Reconciler) handleResourcesSync(`
`464`	`459`	`}`
`465`	`460`	`}`
`466`	`461`
	`462`	`+ if err := r.syncNodeSetSpecInline(ctx, database); err != nil {`
	`463`	`+ meta.SetStatusCondition(&database.Status.Conditions, metav1.Condition{`
	`464`	`+ Type: DatabasePreparedCondition,`
	`465`	`+ Status: metav1.ConditionFalse,`
	`466`	`+ Reason: ReasonInProgress,`
	`467`	`+ ObservedGeneration: database.Generation,`
	`468`	`+ Message: "Failed to sync NodeSet resources",`
	`469`	`+ })`
	`470`	`+ return r.updateStatus(ctx, database, DefaultRequeueDelay)`
	`471`	`+ }`
	`472`	`+`
`467`	`473`	`if !meta.IsStatusConditionTrue(database.Status.Conditions, DatabasePreparedCondition) {`
`468`	`474`	`meta.SetStatusCondition(&database.Status.Conditions, metav1.Condition{`
`469`	`475`	`Type: DatabasePreparedCondition,`
`@@ -550,9 +556,7 @@ func (r *Reconciler) updateStatus(`
`550`	`556`	`func (r *Reconciler) syncNodeSetSpecInline(`
`551`	`557`	`ctx context.Context,`
`552`	`558`	`database *resources.DatabaseBuilder,`
`553`		`-) (bool, ctrl.Result, error) {`
`554`		`- r.Log.Info("running step syncNodeSetSpecInline")`
`555`		`-`
	`559`	`+) error {`
`556`	`560`	`databaseNodeSets := &v1alpha1.DatabaseNodeSetList{}`
`557`	`561`	`if err := r.List(ctx, databaseNodeSets,`
`558`	`562`	`client.InNamespace(database.Namespace),`
`@@ -566,7 +570,7 @@ func (r *Reconciler) syncNodeSetSpecInline(`
`566`	`570`	`"ProvisioningFailed",`
`567`	`571`	`fmt.Sprintf("Failed to list DatabaseNodeSets: %s", err),`
`568`	`572`	`)`
`569`		`- return Stop, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, err`
	`573`	`+ return err`
`570`	`574`	`}`
`571`	`575`
`572`	`576`	`for _, databaseNodeSet := range databaseNodeSets.Items {`
`@@ -589,7 +593,7 @@ func (r *Reconciler) syncNodeSetSpecInline(`
`589`	`593`	`"ProvisioningFailed",`
`590`	`594`	`fmt.Sprintf("Failed to delete DatabaseNodeSet: %s", err),`
`591`	`595`	`)`
`592`		`- return Stop, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, err`
	`596`	`+ return err`
`593`	`597`	`}`
`594`	`598`	`r.Recorder.Event(`
`595`	`599`	`database,`
`@@ -616,7 +620,7 @@ func (r *Reconciler) syncNodeSetSpecInline(`
`616`	`620`	`"ProvisioningFailed",`
`617`	`621`	`fmt.Sprintf("Failed to list RemoteDatabaseNodeSets: %s", err),`
`618`	`622`	`)`
`619`		`- return Stop, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, err`
	`623`	`+ return err`
`620`	`624`	`}`
`621`	`625`
`622`	`626`	`for _, remoteDatabaseNodeSet := range remoteDatabaseNodeSets.Items {`
`@@ -640,7 +644,7 @@ func (r *Reconciler) syncNodeSetSpecInline(`
`640`	`644`	`"ProvisioningFailed",`
`641`	`645`	`fmt.Sprintf("Failed to delete RemoteDatabaseNodeSet: %s", err),`
`642`	`646`	`)`
`643`		`- return Stop, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, err`
	`647`	`+ return err`
`644`	`648`	`}`
`645`	`649`	`r.Recorder.Event(`
`646`	`650`	`database,`
`@@ -654,8 +658,7 @@ func (r *Reconciler) syncNodeSetSpecInline(`
`654`	`658`	`}`
`655`	`659`	`}`
`656`	`660`
`657`		`- r.Log.Info("complete step syncNodeSetSpecInline")`
`658`		`- return Continue, ctrl.Result{Requeue: false}, nil`
	`661`	`+ return nil`
`659`	`662`	`}`
`660`	`663`
`661`	`664`	`func (r *Reconciler) handlePauseResume(`
Original file line number	Diff line number	Diff line change
`@@ -41,11 +41,6 @@ func (r Reconciler) Sync(ctx context.Context, cr v1alpha1.Storage) (ctrl.Resul`
`41`	`41`	`return result, err`
`42`	`42`	`}`
`43`	`43`
`44`		`- stop, result, err = r.syncNodeSetSpecInline(ctx, &storage)`
`45`		`- if stop {`
`46`		`- return result, err`
`47`		`- }`
`48`		`-`
`49`	`44`	`if !meta.IsStatusConditionTrue(storage.Status.Conditions, StorageInitializedCondition) {`
`50`	`45`	`return r.handleBlobstorageInit(ctx, &storage)`
`51`	`46`	`}`
`@@ -400,6 +395,17 @@ func (r *Reconciler) handleResourcesSync(`
`400`	`395`	`}`
`401`	`396`	`}`
`402`	`397`
	`398`	`+ if err := r.syncNodeSetSpecInline(ctx, storage); err != nil {`
	`399`	`+ meta.SetStatusCondition(&storage.Status.Conditions, metav1.Condition{`
	`400`	`+ Type: StoragePreparedCondition,`
	`401`	`+ Status: metav1.ConditionFalse,`
	`402`	`+ Reason: ReasonInProgress,`
	`403`	`+ ObservedGeneration: storage.Generation,`
	`404`	`+ Message: "Failed to sync NodeSet resources",`
	`405`	`+ })`
	`406`	`+ return r.updateStatus(ctx, storage, DefaultRequeueDelay)`
	`407`	`+ }`
	`408`	`+`
`403`	`409`	`if !meta.IsStatusConditionTrue(storage.Status.Conditions, StoragePreparedCondition) {`
`404`	`410`	`meta.SetStatusCondition(&storage.Status.Conditions, metav1.Condition{`
`405`	`411`	`Type: StoragePreparedCondition,`
`@@ -418,8 +424,7 @@ func (r *Reconciler) handleResourcesSync(`
`418`	`424`	`func (r *Reconciler) syncNodeSetSpecInline(`
`419`	`425`	`ctx context.Context,`
`420`	`426`	`storage *resources.StorageClusterBuilder,`
`421`		`-) (bool, ctrl.Result, error) {`
`422`		`- r.Log.Info("running step syncNodeSetSpecInline")`
	`427`	`+) error {`
`423`	`428`	`matchingFields := client.MatchingFields{`
`424`	`429`	`OwnerControllerField: storage.Name,`
`425`	`430`	`}`
`@@ -435,7 +440,7 @@ func (r *Reconciler) syncNodeSetSpecInline(`
`435`	`440`	`"ProvisioningFailed",`
`436`	`441`	`fmt.Sprintf("Failed to list StorageNodeSets: %s", err),`
`437`	`442`	`)`
`438`		`- return Stop, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, err`
	`443`	`+ return err`
`439`	`444`	`}`
`440`	`445`
`441`	`446`	`for _, storageNodeSet := range storageNodeSets.Items {`
`@@ -459,7 +464,7 @@ func (r *Reconciler) syncNodeSetSpecInline(`
`459`	`464`	`"ProvisioningFailed",`
`460`	`465`	`fmt.Sprintf("Failed to delete StorageNodeSet: %s", err),`
`461`	`466`	`)`
`462`		`- return Stop, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, err`
	`467`	`+ return err`
`463`	`468`	`}`
`464`	`469`	`r.Recorder.Event(`
`465`	`470`	`storage,`
`@@ -484,7 +489,7 @@ func (r *Reconciler) syncNodeSetSpecInline(`
`484`	`489`	`"ProvisioningFailed",`
`485`	`490`	`fmt.Sprintf("Failed to list RemoteStorageNodeSets: %s", err),`
`486`	`491`	`)`
`487`		`- return Stop, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, err`
	`492`	`+ return err`
`488`	`493`	`}`
`489`	`494`
`490`	`495`	`for _, remoteStorageNodeSet := range remoteStorageNodeSets.Items {`
`@@ -508,7 +513,7 @@ func (r *Reconciler) syncNodeSetSpecInline(`
`508`	`513`	`"ProvisioningFailed",`
`509`	`514`	`fmt.Sprintf("Failed to delete RemoteStorageNodeSet: %s", err),`
`510`	`515`	`)`
`511`		`- return Stop, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, err`
	`516`	`+ return err`
`512`	`517`	`}`
`513`	`518`	`r.Recorder.Event(`
`514`	`519`	`storage,`
`@@ -522,19 +527,7 @@ func (r *Reconciler) syncNodeSetSpecInline(`
`522`	`527`	`}`
`523`	`528`	`}`
`524`	`529`
`525`		`- if !meta.IsStatusConditionTrue(storage.Status.Conditions, StoragePreparedCondition) {`
`526`		`- meta.SetStatusCondition(&storage.Status.Conditions, metav1.Condition{`
`527`		`- Type: StoragePreparedCondition,`
`528`		`- Status: metav1.ConditionTrue,`
`529`		`- Reason: ReasonCompleted,`
`530`		`- ObservedGeneration: storage.Generation,`
`531`		`- Message: "Successfully synced resources",`
`532`		`- })`
`533`		`- return r.updateStatus(ctx, storage, StatusUpdateRequeueDelay)`
`534`		`- }`
`535`		`-`
`536`		`- r.Log.Info("complete step syncNodeSetSpecInline")`
`537`		`- return Continue, ctrl.Result{Requeue: false}, nil`
	`530`	`+ return nil`
`538`	`531`	`}`
`539`	`532`
`540`	`533`	`func (r *Reconciler) runSelfCheck(`