Skip to content

fix(vd): time spent in the WaitForFirstConsumer phase is no longer included in totalProvisioning #2379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eofff wants to merge 5 commits into
base: main
Choose a base branch
from
Open

fix(vd): time spent in the WaitForFirstConsumer phase is no longer included in totalProvisioning #2379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7630bdb
fix totalProvisioning
May 20, 2026
39f5e4a
Update api/core/v1alpha2/virtual_disk.go
eofff May 28, 2026
d3eaa8e
Update crds/virtualdisks.yaml
eofff May 28, 2026
4503b4c
correct counting
May 29, 2026
6bd7a4d
fix?
May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions api/core/v1alpha2/virtual_disk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ type VirtualDiskStatsCreationDuration struct {
// Waiting time for dependent resources.
// +nullable
WaitingForDependencies *metav1.Duration `json:"waitingForDependencies,omitempty"`
// Waiting time in the `WaitForFirstConsumer` phase.
// +nullable
WaitingForFirstConsumer *metav1.Duration `json:"waitingForFirstConsumer,omitempty"`
// Duration of the loading into DVCR.
// +nullable
DVCRProvisioning *metav1.Duration `json:"dvcrProvisioning,omitempty"`
Expand Down
5 changes: 5 additions & 0 deletions api/core/v1alpha2/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions crds/doc-ru-virtualdisks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,9 @@ spec:
waitingForDependencies:
description: |
Длительность ожидания зависимостей для создания виртуального диска.
waitingForFirstConsumer:
description: |
Длительность ожидания в фазе `WaitForFirstConsumer`.
dvcrProvisioning:
description: |
Длительность загрузки в Deckhouse Virtualization Container Registry (DVCR).
Expand Down
4 changes: 4 additions & 0 deletions crds/virtualdisks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,10 @@ spec:
description: Waiting time for dependent resources.
nullable: true
type: string
waitingForFirstConsumer:
description: Waiting time in the `WaitForFirstConsumer` phase.
nullable: true
type: string
type: object
type: object
storageClassName:
Expand Down
59 changes: 21 additions & 38 deletions images/virtualization-artifact/pkg/controller/vd/internal/source/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vd *v1alpha2.VirtualDisk) (re
case IsDiskProvisioningFinished(condition):
log.Debug("Disk provisioning finished: clean up")

setPhaseConditionForFinishedDisk(pvc, cb, &vd.Status.Phase, supgen)
setPhaseConditionForFinishedDisk(vd, pvc, cb, &vd.Status.Phase, supgen)

// Protect Ready Disk and underlying PVC.
err = ds.diskService.Protect(ctx, supgen, vd, nil, pvc)
Expand Down Expand Up @@ -161,17 +161,14 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vd *v1alpha2.VirtualDisk) (re
// OK.
case common.ErrQuotaExceeded(err):
ds.recorder.Event(vd, corev1.EventTypeWarning, v1alpha2.ReasonDataSourceQuotaExceeded, "DataSource quota exceed")
return setQuotaExceededPhaseCondition(cb, &vd.Status.Phase, err, vd.CreationTimestamp), nil
return setQuotaExceededPhaseCondition(vd, cb, &vd.Status.Phase, err, vd.CreationTimestamp), nil
default:
setPhaseConditionToFailed(cb, &vd.Status.Phase, fmt.Errorf("unexpected error: %w", err))
setPhaseConditionToFailed(vd, cb, &vd.Status.Phase, fmt.Errorf("unexpected error: %w", err))
return reconcile.Result{}, err
}

vd.Status.Phase = v1alpha2.DiskProvisioning
cb.
Status(metav1.ConditionFalse).
Reason(vdcondition.Provisioning).
Message("DVCR Provisioner not found: create the new one.")
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.Provisioning, "DVCR Provisioner not found: create the new one.")

return reconcile.Result{RequeueAfter: time.Second}, nil
case !podutil.IsPodComplete(pod):
Expand All @@ -188,17 +185,21 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vd *v1alpha2.VirtualDisk) (re
}

vd.Status.Phase = v1alpha2.DiskProvisioning
cb.
Status(metav1.ConditionFalse).
Reason(vdcondition.Provisioning).
Message("Import is in the process of provisioning to DVCR.")
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.Provisioning, "Import is in the process of provisioning to DVCR.")

vd.Status.Progress = ds.statService.GetProgress(vd.GetUID(), pod, vd.Status.Progress, service.NewScaleOption(0, 50))
vd.Status.DownloadSpeed = ds.statService.GetDownloadSpeed(vd.GetUID(), pod)
case dv == nil:
if isStorageClassWFFC(sc) && len(vd.Status.AttachedToVirtualMachines) != 1 {
vd.Status.Progress = "50%"
vd.Status.Phase = v1alpha2.DiskWaitForFirstConsumer
setReadyConditionWithWFFCAccounting(
vd,
cb,
metav1.ConditionFalse,
vdcondition.WaitingForFirstConsumer,
"The provisioning has been suspended: a created and scheduled virtual machine is awaited.",
)
return reconcile.Result{}, nil
}

Expand All @@ -216,10 +217,7 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vd *v1alpha2.VirtualDisk) (re
switch {
case errors.Is(err, service.ErrProvisioningFailed):
ds.recorder.Event(vd, corev1.EventTypeWarning, v1alpha2.ReasonDataSourceDiskProvisioningFailed, "Disk provisioning failed")
cb.
Status(metav1.ConditionFalse).
Reason(vdcondition.ProvisioningFailed).
Message(service.CapitalizeFirstLetter(err.Error() + "."))
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.ProvisioningFailed, service.CapitalizeFirstLetter(err.Error()+"."))
return reconcile.Result{}, nil
default:
return reconcile.Result{}, err
Expand All @@ -230,14 +228,14 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vd *v1alpha2.VirtualDisk) (re
vd.Status.DownloadSpeed = ds.statService.GetDownloadSpeed(vd.GetUID(), pod)

if imageformat.IsISO(ds.statService.GetFormat(pod)) {
setPhaseConditionToFailed(cb, &vd.Status.Phase, ErrISOSourceNotSupported)
setPhaseConditionToFailed(vd, cb, &vd.Status.Phase, ErrISOSourceNotSupported)
return reconcile.Result{}, nil
}

var diskSize resource.Quantity
diskSize, err = ds.getPVCSize(vd, pod)
if err != nil {
setPhaseConditionToFailed(cb, &vd.Status.Phase, err)
setPhaseConditionToFailed(vd, cb, &vd.Status.Phase, err)

if errors.Is(err, service.ErrInsufficientPVCSize) {
return reconcile.Result{}, nil
Expand All @@ -251,7 +249,7 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vd *v1alpha2.VirtualDisk) (re
var nodePlacement *provisioner.NodePlacement
nodePlacement, err = getNodePlacement(ctx, ds.client, vd)
if err != nil {
setPhaseConditionToFailed(cb, &vd.Status.Phase, fmt.Errorf("unexpected error: %w", err))
setPhaseConditionToFailed(vd, cb, &vd.Status.Phase, fmt.Errorf("unexpected error: %w", err))
return reconcile.Result{}, fmt.Errorf("failed to get importer tolerations: %w", err)
}

Expand All @@ -261,39 +259,27 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vd *v1alpha2.VirtualDisk) (re
}

vd.Status.Phase = v1alpha2.DiskProvisioning
cb.
Status(metav1.ConditionFalse).
Reason(vdcondition.Provisioning).
Message("PVC Provisioner not found: create the new one.")
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.Provisioning, "PVC Provisioner not found: create the new one.")

return reconcile.Result{RequeueAfter: time.Second}, nil
case dvQuotaNotExceededCondition != nil && dvQuotaNotExceededCondition.Status == corev1.ConditionFalse:
vd.Status.Phase = v1alpha2.DiskPending
if dv.Status.ClaimName != "" && isStorageClassWFFC(sc) {
vd.Status.Phase = v1alpha2.DiskWaitForFirstConsumer
}
cb.
Status(metav1.ConditionFalse).
Reason(vdcondition.QuotaExceeded).
Message(dvQuotaNotExceededCondition.Message)
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.QuotaExceeded, dvQuotaNotExceededCondition.Message)
return reconcile.Result{}, nil
case dvRunningCondition != nil && dvRunningCondition.Status != corev1.ConditionTrue && dvRunningCondition.Reason == DVImagePullFailedReason:
vd.Status.Phase = v1alpha2.DiskPending
if dv.Status.ClaimName != "" && isStorageClassWFFC(sc) {
vd.Status.Phase = v1alpha2.DiskWaitForFirstConsumer
}
cb.
Status(metav1.ConditionFalse).
Reason(vdcondition.ImagePullFailed).
Message(dvRunningCondition.Message)
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.ImagePullFailed, dvRunningCondition.Message)
ds.recorder.Event(vd, corev1.EventTypeWarning, vdcondition.ImagePullFailed.String(), dvRunningCondition.Message)
return reconcile.Result{}, nil
case pvc == nil:
vd.Status.Phase = v1alpha2.DiskProvisioning
cb.
Status(metav1.ConditionFalse).
Reason(vdcondition.Provisioning).
Message("PVC not found: waiting for creation.")
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.Provisioning, "PVC not found: waiting for creation.")
return reconcile.Result{RequeueAfter: time.Second}, nil
case ds.diskService.IsImportDone(dv, pvc):
log.Info("Import has completed", "dvProgress", dv.Status.Progress, "dvPhase", dv.Status.Phase, "pvcPhase", pvc.Status.Phase)
Expand All @@ -306,10 +292,7 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vd *v1alpha2.VirtualDisk) (re
)

vd.Status.Phase = v1alpha2.DiskReady
cb.
Status(metav1.ConditionTrue).
Reason(vdcondition.Ready).
Message("")
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionTrue, vdcondition.Ready, "")

vd.Status.Progress = "100%"
vd.Status.Capacity = ds.diskService.GetCapacity(pvc)
Expand Down
59 changes: 21 additions & 38 deletions images/virtualization-artifact/pkg/controller/vd/internal/source/registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vd *v1alpha2.VirtualDisk)
case IsDiskProvisioningFinished(condition):
log.Debug("Disk provisioning finished: clean up")

setPhaseConditionForFinishedDisk(pvc, cb, &vd.Status.Phase, supgen)
setPhaseConditionForFinishedDisk(vd, pvc, cb, &vd.Status.Phase, supgen)

// Protect Ready Disk and underlying PVC.
err = ds.diskService.Protect(ctx, supgen, vd, nil, pvc)
Expand Down Expand Up @@ -163,17 +163,14 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vd *v1alpha2.VirtualDisk)
// OK.
case common.ErrQuotaExceeded(err):
ds.recorder.Event(vd, corev1.EventTypeWarning, v1alpha2.ReasonDataSourceQuotaExceeded, "DataSource quota exceed")
return setQuotaExceededPhaseCondition(cb, &vd.Status.Phase, err, vd.CreationTimestamp), nil
return setQuotaExceededPhaseCondition(vd, cb, &vd.Status.Phase, err, vd.CreationTimestamp), nil
default:
setPhaseConditionToFailed(cb, &vd.Status.Phase, fmt.Errorf("unexpected error: %w", err))
setPhaseConditionToFailed(vd, cb, &vd.Status.Phase, fmt.Errorf("unexpected error: %w", err))
return reconcile.Result{}, err
}

vd.Status.Phase = v1alpha2.DiskPending
cb.
Status(metav1.ConditionFalse).
Reason(vdcondition.WaitForUserUpload).
Message("DVCR Provisioner not found: create the new one.")
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.WaitForUserUpload, "DVCR Provisioner not found: create the new one.")

return reconcile.Result{RequeueAfter: time.Second}, nil
case !podutil.IsPodComplete(pod):
Expand All @@ -185,10 +182,7 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vd *v1alpha2.VirtualDisk)
}

vd.Status.Phase = v1alpha2.DiskProvisioning
cb.
Status(metav1.ConditionFalse).
Reason(vdcondition.Provisioning).
Message("DVCR Provisioner not found: create the new one.")
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.Provisioning, "DVCR Provisioner not found: create the new one.")

vd.Status.Progress = ds.statService.GetProgress(vd.GetUID(), pod, vd.Status.Progress, service.NewScaleOption(0, 50))

Expand All @@ -200,6 +194,13 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vd *v1alpha2.VirtualDisk)
if isStorageClassWFFC(sc) && len(vd.Status.AttachedToVirtualMachines) != 1 {
vd.Status.Progress = "50%"
vd.Status.Phase = v1alpha2.DiskWaitForFirstConsumer
setReadyConditionWithWFFCAccounting(
vd,
cb,
metav1.ConditionFalse,
vdcondition.WaitingForFirstConsumer,
"The provisioning has been suspended: a created and scheduled virtual machine is awaited.",
)
return reconcile.Result{}, nil
}

Expand All @@ -217,10 +218,7 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vd *v1alpha2.VirtualDisk)
switch {
case errors.Is(err, service.ErrProvisioningFailed):
ds.recorder.Event(vd, corev1.EventTypeWarning, v1alpha2.ReasonDataSourceDiskProvisioningFailed, "Disk provisioning failed")
cb.
Status(metav1.ConditionFalse).
Reason(vdcondition.ProvisioningFailed).
Message(service.CapitalizeFirstLetter(err.Error() + "."))
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.ProvisioningFailed, service.CapitalizeFirstLetter(err.Error()+"."))
return reconcile.Result{}, nil
default:
return reconcile.Result{}, err
Expand All @@ -230,14 +228,14 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vd *v1alpha2.VirtualDisk)
vd.Status.Progress = "50%"

if imageformat.IsISO(ds.statService.GetFormat(pod)) {
setPhaseConditionToFailed(cb, &vd.Status.Phase, ErrISOSourceNotSupported)
setPhaseConditionToFailed(vd, cb, &vd.Status.Phase, ErrISOSourceNotSupported)
return reconcile.Result{}, nil
}

var diskSize resource.Quantity
diskSize, err = ds.getPVCSize(vd, pod)
if err != nil {
setPhaseConditionToFailed(cb, &vd.Status.Phase, err)
setPhaseConditionToFailed(vd, cb, &vd.Status.Phase, err)

if errors.Is(err, service.ErrInsufficientPVCSize) {
return reconcile.Result{}, nil
Expand All @@ -251,7 +249,7 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vd *v1alpha2.VirtualDisk)
var nodePlacement *provisioner.NodePlacement
nodePlacement, err = getNodePlacement(ctx, ds.client, vd)
if err != nil {
setPhaseConditionToFailed(cb, &vd.Status.Phase, fmt.Errorf("unexpected error: %w", err))
setPhaseConditionToFailed(vd, cb, &vd.Status.Phase, fmt.Errorf("unexpected error: %w", err))
return reconcile.Result{}, fmt.Errorf("failed to get importer tolerations: %w", err)
}

Expand All @@ -266,39 +264,27 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vd *v1alpha2.VirtualDisk)
return reconcile.Result{}, err
}
vd.Status.Phase = v1alpha2.DiskProvisioning
cb.
Status(metav1.ConditionFalse).
Reason(vdcondition.Provisioning).
Message("PVC Provisioner not found: create the new one.")
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.Provisioning, "PVC Provisioner not found: create the new one.")

return reconcile.Result{RequeueAfter: time.Second}, nil
case dvQuotaNotExceededCondition != nil && dvQuotaNotExceededCondition.Status == corev1.ConditionFalse:
vd.Status.Phase = v1alpha2.DiskPending
if dv.Status.ClaimName != "" && isStorageClassWFFC(sc) {
vd.Status.Phase = v1alpha2.DiskWaitForFirstConsumer
}
cb.
Status(metav1.ConditionFalse).
Reason(vdcondition.QuotaExceeded).
Message(dvQuotaNotExceededCondition.Message)
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.QuotaExceeded, dvQuotaNotExceededCondition.Message)
return reconcile.Result{}, nil
case dvRunningCondition != nil && dvRunningCondition.Status != corev1.ConditionTrue && dvRunningCondition.Reason == DVImagePullFailedReason:
vd.Status.Phase = v1alpha2.DiskPending
if dv.Status.ClaimName != "" && isStorageClassWFFC(sc) {
vd.Status.Phase = v1alpha2.DiskWaitForFirstConsumer
}
cb.
Status(metav1.ConditionFalse).
Reason(vdcondition.ImagePullFailed).
Message(dvRunningCondition.Message)
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.ImagePullFailed, dvRunningCondition.Message)
ds.recorder.Event(vd, corev1.EventTypeWarning, vdcondition.ImagePullFailed.String(), dvRunningCondition.Message)
return reconcile.Result{}, nil
case pvc == nil:
vd.Status.Phase = v1alpha2.DiskProvisioning
cb.
Status(metav1.ConditionFalse).
Reason(vdcondition.Provisioning).
Message("PVC not found: waiting for creation.")
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.Provisioning, "PVC not found: waiting for creation.")
return reconcile.Result{RequeueAfter: time.Second}, nil
case ds.diskService.IsImportDone(dv, pvc):
log.Info("Import has completed", "dvProgress", dv.Status.Progress, "dvPhase", dv.Status.Phase, "pvcPhase", pvc.Status.Phase)
Expand All @@ -311,10 +297,7 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vd *v1alpha2.VirtualDisk)
)

vd.Status.Phase = v1alpha2.DiskReady
cb.
Status(metav1.ConditionTrue).
Reason(vdcondition.Ready).
Message("")
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionTrue, vdcondition.Ready, "")

vd.Status.Progress = "100%"
vd.Status.Capacity = ds.diskService.GetCapacity(pvc)
Expand Down
Loading
Loading