feat: vmdi missing image self heal

api/v1alpha1/vmdiskimage_types.go

@@ -34,20 +34,24 @@ const (
 
 // Condition Reasons
 const (
-	ReasonResourceCreationFailed string = "ResourceCreationFailed"
-	ReasonResouceUpdateFailed    string = "ResourceUpdateFailed"
-	ReasonQueued                 string = "Queued"
-	ReasonSyncing                string = "Syncing"
-	ReasonRetryLimitExceeded     string = "RetryLimitExceeded"
-	ReasonSynced                 string = "Synced"
+	ReasonResourceCreationFailed      string = "ResourceCreationFailed"
+	ReasonResouceUpdateFailed         string = "ResourceUpdateFailed"
+	ReasonQueued                      string = "Queued"
+	ReasonSyncing                     string = "Syncing"
+	ReasonRetryLimitExceeded          string = "RetryLimitExceeded"
+	ReasonMissingSourceArtifact       string = "MissingSourceArtifact"
+	ReasonSyncAttemptDurationExceeded string = "SyncAttemptDurationExceeded"
+	ReasonUnknownSyncFailure          string = "UnknownSyncFailure"
+	ReasonSynced                      string = "Synced"
 )
 
 // CRD phases
 const (
-	PhaseQueued  string = "Queued"
-	PhaseSyncing string = "Syncing"
-	PhaseReady   string = "Ready"
-	PhaseFailed  string = "Failed"
+	PhaseQueued           string = "Queued"
+	PhaseSyncing          string = "Syncing"
+	PhaseReady            string = "Ready"
+	PhaseRetryableFailure string = "RetryableFailure"
+	PhaseFailed           string = "Failed"
 )
 
 // VMDiskImage Labels
@@ -94,7 +98,7 @@ type VMDiskImageStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 
-	// +kubebuilder:validation:Enum=Queued;Syncing;Ready;Failed
+	// +kubebuilder:validation:Enum=Queued;Syncing;Ready;Failed;RetryableFailure
 	Phase string `json:"phase"`
 
 	// A human-readable message providing more details about the current phase.
@@ -103,7 +107,8 @@ type VMDiskImageStatus struct {
 	// Conditions of the VMDiskImage resource.
 	Conditions []metav1.Condition `json:"conditions,omitempty"`
 
-	FailureCount int `json:"failureCount,omitempty"`
+	FailureCount    int          `json:"failureCount,omitempty"`
+	LastFailureTime *metav1.Time `json:"lastFailureTime,omitempty"`
 }
 
 // +kubebuilder:object:root=true

charts/data-sync-operator/templates/crd/vmdiskimages.crd.pelotech.ot.yaml

@@ -137,6 +137,9 @@ spec:
                                 type: array
                             failureCount:
                                 type: integer
+                            lastFailureTime:
+                                format: date-time
+                                type: string
                             message:
                                 description: A human-readable message providing more details about the current phase.
                                 type: string
@@ -146,6 +149,7 @@ spec:
                                     - Syncing
                                     - Ready
                                     - Failed
+                                    - RetryableFailure
                                 type: string
                         required:
                             - phase

config/crd/bases/crd.pelotech.ot_vmdiskimages.yaml

@@ -140,6 +140,9 @@ spec:
                 type: array
               failureCount:
                 type: integer
+              lastFailureTime:
+                format: date-time
+                type: string
               message:
                 description: A human-readable message providing more details about
                   the current phase.
@@ -150,6 +153,7 @@ spec:
                 - Syncing
                 - Ready
                 - Failed
+                - RetryableFailure
                 type: string
             required:
             - phase

dist/install.yaml

@@ -148,6 +148,9 @@ spec:
                 type: array
               failureCount:
                 type: integer
+              lastFailureTime:
+                format: date-time
+                type: string
               message:
                 description: A human-readable message providing more details about
                   the current phase.
@@ -158,6 +161,7 @@ spec:
                 - Syncing
                 - Ready
                 - Failed
+                - RetryableFailure
                 type: string
             required:
             - phase

internal/vm-disk-image/config/vmdi-controller-config-reader.go

@@ -6,38 +6,44 @@ import (
 )
 
 const (
-	defaultConcurrency     = 10 // TODO: We will need to tune this default
-	defaultRetryLimit      = 2
-	defaultBackoffDuration = 10 * time.Second
-	defaultMaxSyncDuration = 1 * time.Hour
+	defaultConcurrency            = 5 // TODO: We will need to tune this default
+	defaultMaxBackoffDelay        = 1 * time.Hour
+	defaultMaxSyncDuration        = 12 * time.Hour
+	defaultMaxSyncAttemptRetries  = 3
+	defaultMaxSyncAttemptDuration = 1 * time.Hour
 )
 
 type VMDiskImageControllerConfig struct {
-	Concurrency          int
-	RetryLimit           int
-	RetryBackoffDuration time.Duration
-	MaxSyncDuration      time.Duration
+	Concurrency            int
+	MaxBackoffDelay        time.Duration
+	MaxSyncDuration        time.Duration
+	MaxSyncAttemptDuration time.Duration
+	MaxSyncAttemptRetries  int
 }
 
 // This function will allow us to get the required config variables from the environment.
 // Locally this is your "env" and in production these values will come from a configmap
 func LoadVMDIControllerConfigFromEnv() VMDiskImageControllerConfig {
 	// The max amount of VMDIs we can have syncing at one time.
-	concurrency := corecfg.GetIntEnvOrDefault("CONCURRENCY", defaultConcurrency)
+	concurrency := corecfg.GetIntEnvOrDefault("MAX_VMDI_SYNC_CONCURRENCY", defaultConcurrency)
 
-	// How many times we will retry a failed sync.
-	retryLimit := corecfg.GetIntEnvOrDefault("RETRY_LIMIT", defaultRetryLimit)
+	// The longest we will ever wait to retry.
+	maxBackoffDelay := corecfg.GetDurationEnvOrDefault("MAX_SYNC_RETRY_BACKOFF_DURATION", defaultMaxBackoffDelay)
 
-	// How long we want to wait before trying to resync a failed VMDI.
-	retryBackoffDuration := corecfg.GetDurationEnvOrDefault("RETRY_BACKOFF_DURATION", defaultBackoffDuration)
+	// How long we will try to run a sync before we fail it forever.
+	maxSyncDuration := corecfg.GetDurationEnvOrDefault("MAX_SYNC_DURATION", defaultMaxSyncDuration)
 
 	// How long we will let a VMDI sit in syncing status.
-	maxSyncDuration := corecfg.GetDurationEnvOrDefault("MAX_SYNC_DURATION", defaultMaxSyncDuration)
+	maxAttemptDuration := corecfg.GetDurationEnvOrDefault("MAX_SYNC_ATTEMPT_DURATION", defaultMaxSyncAttemptDuration)
+
+	// How many times we will retry on a given attempt.
+	maxSyncAttemptRetries := corecfg.GetIntEnvOrDefault("MAX_SYNC_ATTEMPT_RETRIES", defaultMaxSyncAttemptRetries)
 
 	return VMDiskImageControllerConfig{
-		Concurrency:          concurrency,
-		RetryLimit:           retryLimit,
-		RetryBackoffDuration: retryBackoffDuration,
-		MaxSyncDuration:      maxSyncDuration,
+		Concurrency:            concurrency,
+		MaxBackoffDelay:        maxBackoffDelay,
+		MaxSyncAttemptDuration: maxAttemptDuration,
+		MaxSyncAttemptRetries:  maxSyncAttemptRetries,
+		MaxSyncDuration:        maxSyncDuration,
 	}
 }

internal/vm-disk-image/controller/controller.go

@@ -75,13 +75,9 @@ func (r *VMDiskImageReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		return r.VMDiskImageOrchestrator.DeleteResource(ctx, &VMDiskImage)
 	}
 
-	resourceHasFinalizer := !crutils.ContainsFinalizer(&VMDiskImage, crdv1.VMDiskImageFinalizer)
-	if resourceHasFinalizer {
-		err := r.AddControllerFinalizer(ctx, &VMDiskImage)
-		if err != nil {
-			return r.HandleResourceUpdateError(ctx, &VMDiskImage, err, "Failed to add finalizer to our resource")
-		}
-
+	resourceMissingFinalizer := !crutils.ContainsFinalizer(&VMDiskImage, crdv1.VMDiskImageFinalizer)
+	if resourceMissingFinalizer {
+		return r.AddControllerFinalizer(ctx, &VMDiskImage)
 	}
 
 	currentPhase := VMDiskImage.Status.Phase
@@ -93,6 +89,8 @@ func (r *VMDiskImageReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		return r.AttemptSyncingOfResource(ctx, &VMDiskImage)
 	case crdv1.PhaseSyncing:
 		return r.TransitonFromSyncing(ctx, &VMDiskImage)
+	case crdv1.PhaseRetryableFailure:
+		return r.AttemptRetry(ctx, &VMDiskImage)
 	case crdv1.PhaseReady, crdv1.PhaseFailed:
 		return ctrl.Result{}, nil
 	default:
@@ -112,18 +110,18 @@ func (r *VMDiskImageReconciler) SetupWithManager(mgr ctrl.Manager) error {
 
 	resourceGenerator := &vmdi.Generator{}
 	vmdiProvisioner := vmdi.K8sVMDIProvisioner{
-		Client:            client,
-		ResourceGenerator: resourceGenerator,
-		MaxSyncDuration:   config.MaxSyncDuration,
-		RetryLimit:        config.RetryLimit,
+		Client:                 client,
+		ResourceGenerator:      resourceGenerator,
+		MaxSyncAttemptDuration: config.MaxSyncAttemptDuration,
+		MaxSyncAttemptRetries:  config.MaxSyncAttemptRetries,
 	}
 	orchestrator := vmdi.Orchestrator{
-		Client:       client,
-		Recorder:     mgr.GetEventRecorderFor(crdv1.VMDiskImageControllerName),
-		Provisioner:  vmdiProvisioner,
-		RetryLimit:   config.RetryLimit,
-		RetryBackoff: config.RetryBackoffDuration,
-		SyncLimit:    config.Concurrency,
+		Client:              client,
+		Recorder:            mgr.GetEventRecorderFor(crdv1.VMDiskImageControllerName),
+		Provisioner:         vmdiProvisioner,
+		MaxRetryBackoff:     config.MaxBackoffDelay,
+		MaxSyncTime:         config.MaxSyncDuration,
+		ConcurrentSyncLimit: config.Concurrency,
 	}
 	reconciler := &VMDiskImageReconciler{
 		Scheme:                  mgr.GetScheme(),