Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
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 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

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
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
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 WaitForFirstConsumer phase.
nullable: true
type: string
type: object
type: object
storageClassName:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ func setPhaseConditionForPVCProvisioningDisk(
switch {
case err == nil:
if dv == nil {
addWaitingForFirstConsumerDuration(vd, vdcondition.Provisioning.String())
vd.Status.Phase = v1alpha2.DiskProvisioning
cb.
Status(metav1.ConditionFalse).
Expand All @@ -193,13 +194,15 @@ func setPhaseConditionForPVCProvisioningDisk(
return nil
}

addWaitingForFirstConsumerDuration(vd, vdcondition.Provisioning.String())
vd.Status.Phase = v1alpha2.DiskProvisioning
cb.
Status(metav1.ConditionFalse).
Reason(vdcondition.Provisioning).
Message("Import is in the process of provisioning to PVC.")
return nil
case errors.Is(err, service.ErrDataVolumeNotRunning):
addWaitingForFirstConsumerDuration(vd, vdcondition.ProvisioningFailed.String())
vd.Status.Phase = v1alpha2.DiskFailed
cb.
Status(metav1.ConditionFalse).
Expand All @@ -211,6 +214,31 @@ func setPhaseConditionForPVCProvisioningDisk(
}
}

func addWaitingForFirstConsumerDuration(vd *v1alpha2.VirtualDisk, nextReason string) {
readyCondition, ok := conditions.GetCondition(vdcondition.ReadyType, vd.Status.Conditions)
if !ok || readyCondition.Reason != vdcondition.WaitingForFirstConsumer.String() || nextReason == vdcondition.WaitingForFirstConsumer.String() {
return
}

if readyCondition.LastTransitionTime.IsZero() {
return
}

wffcDuration := time.Since(readyCondition.LastTransitionTime.Time).Truncate(time.Second)
if wffcDuration <= 0 {
return
}

if vd.Status.Stats.CreationDuration.WaitingForFirstConsumer == nil {
vd.Status.Stats.CreationDuration.WaitingForFirstConsumer = &metav1.Duration{
Duration: wffcDuration,
}
return
}

vd.Status.Stats.CreationDuration.WaitingForFirstConsumer.Duration += wffcDuration
}

func setPhaseConditionFromPodError(
ctx context.Context,
podErr error,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ func (h StatsHandler) Handle(ctx context.Context, vd *v1alpha2.VirtualDisk) (rec
if vd.Status.Stats.CreationDuration.WaitingForDependencies != nil {
duration -= vd.Status.Stats.CreationDuration.WaitingForDependencies.Duration
}
if vd.Status.Stats.CreationDuration.WaitingForFirstConsumer != nil {
duration -= vd.Status.Stats.CreationDuration.WaitingForFirstConsumer.Duration
}

vd.Status.Stats.CreationDuration.TotalProvisioning = &metav1.Duration{
Duration: duration,
Expand Down
Loading