apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge release branch 4.18 to 4.19

Browse Source 
* 4.18:
  linstor: disconnect-disk also search for resource name in Linstor (#9035)
This commit is contained in:
Daan Hoogland 2024-05-06 10:35:27 +02:00
commit 92ba476593
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
View File

@ -316,7 +316,7 @@ public class LinstorStorageAdaptor implements StorageAdaptor {
null, null,
null); null);
optRsc = getResourceByPath(resources, volumePath); optRsc = getResourceByPathOrName(resources, volumePath);
} catch (ApiException apiEx) { } catch (ApiException apiEx) {
// couldn't query linstor controller // couldn't query linstor controller
s_logger.error(apiEx.getBestMessage()); s_logger.error(apiEx.getBestMessage());
@ -376,9 +376,10 @@ public class LinstorStorageAdaptor implements StorageAdaptor {
return false; return false;
} }
private Optional<ResourceWithVolumes> getResourceByPath(final List<ResourceWithVolumes> resources, String path) { private Optional<ResourceWithVolumes> getResourceByPathOrName(
final List<ResourceWithVolumes> resources, String path) {
return resources.stream() return resources.stream()
.filter(rsc -> rsc.getVolumes().stream() .filter(rsc -> getLinstorRscName(path).equalsIgnoreCase(rsc.getName()) || rsc.getVolumes().stream()
.anyMatch(v -> path.equals(v.getDevicePath()))) .anyMatch(v -> path.equals(v.getDevicePath())))
.findFirst(); .findFirst();
} }