Skip to content
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

Jump to bottom

fix(cvi,vi): unlock pending vi/cvi from vd ref #416

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

fix(cvi,vi): unlock pending vi/cvi from vd ref #416

wants to merge 62 commits into from

Conversation

LopatinDmitr
Copy link
Contributor

@LopatinDmitr LopatinDmitr commented Oct 2, 2024 •
edited
Loading

Description

  • Add conditon 'InUse" for VirtualDisk. This condition indicate:
    • that the VirtualDisk using for create ClusterVirtualImage or VirtualImage
    • that the VirtualDisk attached to running VirtualMachine
  • Fix problem with lock VirtualImage and ClusterVirtual image in phase 'Pending' after stopping or deleting VirtualMachine, when used needed VirtualDisk in them.

Why do we need it, and what problem does it solve?

What is the expected result?

Checklist

  • The code is covered by unit tests.
  • e2e tests passed.
  • Documentation updated according to the changes.
  • Changes were tested in the Kubernetes cluster manually.

@LopatinDmitr LopatinDmitr marked this pull request as ready for review October 7, 2024 15:28
@LopatinDmitr LopatinDmitr force-pushed the fix/vi/unlock-pending-vi-from-vd-ref branch from b1790dc to 9302aae Compare October 10, 2024 21:41
@LopatinDmitr
fix(vi): unlock pending vi from vd ref
91e158d 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
fix(vi): unlock pending vi from vd ref
8dc06f6 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
fix(cvi): unlock pending cvi from vd ref
ede1b4a 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
chore(vd): add condition 'Locked' when vd attached to running VM
230cba7 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
chore(vd): add condition 'Locked' when vd attached to running VM
0daee16 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
fix(vi,cvi): add check locked condition when filter VD
0d2816f 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
fix(vi,cvi): add check locked condition when filter VD
053c5b0 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
test
fbb9f0d 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
test
b27c646 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
test
1f85a9b 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
test
e86f471 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
test
57bcac5 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
add logs
a96b376 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
add logs
2c41680 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
fix
3c14cea 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
fix2
2d72a7e 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
add fix for cvi
89ae9cd 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
rename locked -> employed
ff59df2 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
add abort provisioning if disk was employed
0ac9da1 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
add abort provisioning if disk was employed
2ccebc9 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
add abort provisioning if disk was employed
402c944 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
add abort provisioning if disk was employed
675b7b7 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
resolve comments
9222bc6 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
change condition Employed -> InUse
fdf9184 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
add blocking vm if disk in use for create image
3d6ffc7 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
add blocking vm if disk if vm restarting
fb50232 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr LopatinDmitr changed the title fix(vi): unlock pending vi from vd ref fix(cvi,vi): unlock pending vi/cvi from vd ref Oct 13, 2024
@LopatinDmitr
fix
8397d1e 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
fix
0ba4b26 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
fix unit tests
78d08eb 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
fix go linter
5fc35de 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
Isteb4k
Isteb4k requested changes Oct 15, 2024
View reviewed changes
api/core/v1alpha2/vdcondition/condition.go Outdated Show resolved Hide resolved
api/core/v1alpha2/vdcondition/condition.go Outdated Show resolved Hide resolved
images/virtualization-artifact/pkg/controller/vd/internal/attachee.go Outdated Show resolved Hide resolved
images/virtualization-artifact/pkg/controller/vd/internal/attachee.go Outdated Show resolved Hide resolved
images/virtualization-artifact/pkg/controller/vd/internal/attachee.go Outdated Show resolved Hide resolved
images/virtualization-artifact/pkg/controller/vd/internal/inuse.go Show resolved Hide resolved
images/virtualization-artifact/pkg/controller/vd/vd_reconciler.go
return fmt.Errorf("error setting watch on VDSnapshots: %w", err)
}

viFromVDWatcher := watcher.NewVirtualImageWatcher()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is already watchers for vi and cvi (watchers.NewObjectRefWatcher)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, this is other watcher.

images/virtualization-artifact/pkg/controller/vi/internal/source/object_ref_vd.go Outdated Show resolved Hide resolved
images/virtualization-artifact/pkg/controller/vm/internal/block_device.go Outdated Show resolved Hide resolved
images/virtualization-artifact/pkg/controller/vm/internal/block_device.go Show resolved Hide resolved
@Isteb4k Isteb4k self-requested a review October 15, 2024 16:29
@LopatinDmitr
fix condition.go
4905c6a 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
fix condition.go
21c9fb8 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
fix condition.go
3f15157 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
fix attachee.go & inuse.go
c96a4d9 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
fix inuse.go
32b5e88 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
fix inuse.go
6038ea9 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
fix block_device.go, object_ref_vd.go
caeecbe 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
fix inuse.go
efc57c1 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
fix object_ref_vd.go
806bf11 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
fix inuse.go
6d4987a 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
fix inuse.go, object_ref_vd.go
fb9070d 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
fix inuse.go
fd3ee61 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
fix inuse.go
88b6e5e 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
fix inuse.go
896624e 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
fix inuse.go
f209bec 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
fix inuse.go
f8134b5 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr LopatinDmitr force-pushed the fix/vi/unlock-pending-vi-from-vd-ref branch from 523f4a4 to f8134b5 Compare October 21, 2024 08:36
@LopatinDmitr
fix block_device.go
9b6a40d 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
@LopatinDmitr
fix block_device.go & block_devices_test.go
701463b 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Isteb4k Isteb4k Isteb4k requested changes

Requested changes must be addressed to merge this pull request.

Assignees

@LopatinDmitr LopatinDmitr

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@LopatinDmitr @Isteb4k