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: fail storage domain attach if getImagesList fails #736

Merged
merged 2 commits into from
Nov 6, 2022
Merged

core: fail storage domain attach if getImagesList fails #736

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45bcab1
core: fail storage domain attach if getImagesList fails
bennyz Nov 2, 2022
a8f51d7
Merge branch 'ovirt-engine-4.5.3.z' into fail-sd-backport
bennyz Nov 3, 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
14 changes: 11 additions & 3 deletions ...dules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
import org.ovirt.engine.core.common.errors.EngineException;
import org.ovirt.engine.core.common.errors.EngineMessage;
import org.ovirt.engine.core.common.queries.GetUnregisteredDisksQueryParameters;
import org.ovirt.engine.core.common.queries.QueryReturnValue;
import org.ovirt.engine.core.common.queries.QueryType;
import org.ovirt.engine.core.common.utils.Pair;
import org.ovirt.engine.core.common.vdscommands.IrsBaseVDSCommandParameters;
Expand Down Expand Up @@ -431,16 +432,23 @@ protected List<DiskImage> getAllOVFDisks(Guid storageDomainId, Guid storagePoolI
ovfDisks = new ArrayList<>();

// Get all unregistered disks.
List<DiskImage> disksFromStorage = backend.runInternalQuery(QueryType.GetUnregisteredDisks,
QueryReturnValue queryReturnValue = backend.runInternalQuery(QueryType.GetUnregisteredDisks,
new GetUnregisteredDisksQueryParameters(storageDomainId,
storagePoolId)).getReturnValue();
if (disksFromStorage == null) {
storagePoolId));
StorageDomain sd = storageDomainDao.get(storageDomainId);
if (sd.getStorageDomainType() == StorageDomainType.Data && !queryReturnValue.getSucceeded()) {
log.error("An error occurred while fetching unregistered disks from Storage Domain id '{}'",
storageDomainId);
throw new RuntimeException("Failed to retrieve unregistered disks");
}

List<DiskImage> disksFromStorage = queryReturnValue.getReturnValue();
if (disksFromStorage == null) {
return ovfDisks;
} else {
castDiskImagesToUnregisteredDisks(disksFromStorage, storageDomainId);
}

for (Disk disk : disksFromStorage) {
DiskImage ovfStoreDisk = (DiskImage) disk;
String diskDescription = ovfStoreDisk.getDescription();
Expand Down