Skip to content

<fix>[storage]: <description #3848

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
zstack-robot-2 wants to merge 1 commit into
base: zsv_5.0.0
Choose a base branch
from
Open

<fix>[storage]: <description #3848

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: 4 additions & 3 deletions storage/src/main/java/org/zstack/storage/volume/VolumeCascadeExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ private List<String> volumesCleanupFromAction(CascadeAction action) {
}

volumeUuids = ResourceHelper.findOwnResourceUuidList(VolumeEO.class, auuids,
q -> q.eq(VolumeVO_.type, VolumeType.Data));
q -> q.in(VolumeVO_.type, Arrays.asList(VolumeType.Data, VolumeType.Memory)));
return volumeUuids;
}

Expand All @@ -168,15 +168,16 @@ private List<VolumeDeletionStruct> volumesFromAction(CascadeAction action) {
List<String> psUuids = CollectionUtils.transform(pinvs, PrimaryStorageInventory::getUuid);

SimpleQuery<VolumeVO> q = dbf.createQuery(VolumeVO.class);
q.add(VolumeVO_.type, Op.EQ, VolumeType.Data);
q.add(VolumeVO_.type, Op.IN, Arrays.asList(VolumeType.Data, VolumeType.Memory));
q.add(VolumeVO_.primaryStorageUuid, Op.IN, psUuids);
List<VolumeVO> vos = q.list();
return toVolumeDeletionStruct(action, vos);
} else if (AccountVO.class.getSimpleName().equals(action.getParentIssuer())) {
final List<String> auuids = CollectionUtils.transform(action.getParentIssuerContext(), AccountInventory::getUuid);

List<VolumeVO> vos = ResourceHelper.findOwnResources(VolumeVO.class, auuids);
vos.removeIf(volume -> volume.getType() != VolumeType.Data);
vos.removeIf(volume -> volume.getType() != VolumeType.Data
&& volume.getType() != VolumeType.Memory);

if (!vos.isEmpty()) {
return toVolumeDeletionStruct(action, vos);
Expand Down