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

core: always update volume size when creating a new image #267

Merged
merged 2 commits into from May 19, 2022
Merged

core: always update volume size when creating a new image #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e834d72
core: use content type to determine memory disks
bennyz May 17, 2022
e03dcb5
core: always update volume size when creating a new image
bennyz Apr 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java
View file
Open in desktop
Expand Up @@ -27,6 +27,7 @@
import org.ovirt.engine.core.common.businessentities.Snapshot.SnapshotType;
import org.ovirt.engine.core.common.businessentities.StorageDomain;
import org.ovirt.engine.core.common.businessentities.VMStatus;
import org.ovirt.engine.core.common.businessentities.storage.DiskContentType;
import org.ovirt.engine.core.common.businessentities.storage.DiskImage;
import org.ovirt.engine.core.common.errors.EngineException;
import org.ovirt.engine.core.common.errors.EngineMessage;
Expand Down Expand Up @@ -279,7 +280,7 @@ protected void endSuccessfully() {
private DiskImage getMemoryDumpDisk(List<ActionReturnValue> returnValues) {
for (ActionReturnValue returnValue : returnValues) {
DiskImage disk = returnValue.getActionReturnValue();
if (disk.getSize() != MemoryUtils.METADATA_SIZE_IN_BYTES) {
if (disk.getContentType() == DiskContentType.MEMORY_DUMP_VOLUME) {
return disk;
}
}
Expand All @@ -290,7 +291,7 @@ private DiskImage getMemoryDumpDisk(List<ActionReturnValue> returnValues) {
private DiskImage getMemoryMetadataDisk(List<ActionReturnValue> returnValues) {
for (ActionReturnValue returnValue : returnValues) {
DiskImage disk = returnValue.getActionReturnValue();
if (disk.getSize() == MemoryUtils.METADATA_SIZE_IN_BYTES) {
if (disk.getContentType() == DiskContentType.MEMORY_METADATA_VOLUME) {
return disk;
}
}
Expand Down
3 changes: 3 additions & 0 deletions ...les/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/BaseImagesCommand.java
View file
Open in desktop
Expand Up @@ -384,6 +384,9 @@ protected void endSuccessfully() {
newStorageDomainID,
getDestinationDiskImage());
}

// Update image's size if it's changed
getDestinationDiskImage().setSize(newImageIRS.getSize());
}
} catch (EngineException e) {
// Logging only
Expand Down