Skip to content

fix(vd): do not require ds when exporting #2060

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

Draft
eofff wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −1
Draft

fix(vd): do not require ds when exporting #2060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions images/virtualization-artifact/pkg/controller/vd/internal/datasource_ready.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,13 @@ func (h DatasourceReadyHandler) Handle(ctx context.Context, vd *v1alpha2.Virtual
return reconcile.Result{}, nil
}

// Data is already on PV or provisioning is done; DataSource is not needed for export, migration, or when disk is ready/lost.
if vd.Status.Phase == v1alpha2.DiskExporting || vd.Status.Phase == v1alpha2.DiskMigrating ||
vd.Status.Phase == v1alpha2.DiskReady || vd.Status.Phase == v1alpha2.DiskLost {
conditions.RemoveCondition(vdcondition.DatasourceReadyType, &vd.Status.Conditions)
return reconcile.Result{}, nil
}

readyCondition, _ := conditions.GetCondition(vdcondition.ReadyType, vd.Status.Conditions)
if source.IsDiskProvisioningFinished(readyCondition) {
conditions.RemoveCondition(vdcondition.DatasourceReadyType, &vd.Status.Conditions)
Expand Down
6 changes: 5 additions & 1 deletion images/virtualization-artifact/pkg/controller/vd/internal/life_cycle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,11 @@ func (h LifeCycleHandler) Handle(ctx context.Context, vd *v1alpha2.VirtualDisk)

cb := conditions.NewConditionBuilder(vdcondition.ReadyType).Generation(vd.Generation)

if !source.IsDiskProvisioningFinished(readyCondition) {
// DataSource is not required when data is already on PV (exporting or migrating).
requireDatasourceReady := !source.IsDiskProvisioningFinished(readyCondition) &&
vd.Status.Phase != v1alpha2.DiskExporting && vd.Status.Phase != v1alpha2.DiskMigrating

if requireDatasourceReady {
ds, _ := conditions.GetCondition(vdcondition.DatasourceReadyType, vd.Status.Conditions)

if ds.Status != metav1.ConditionTrue || !conditions.IsLastUpdated(ds, vd) {
Expand Down
Loading