JoaoJandre commented on code in PR #9143:
URL: https://github.com/apache/cloudstack/pull/9143#discussion_r1618917914
##########
plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/util/LinstorUtil.java:
##########
@@ -109,4 +110,36 @@ public static boolean isResourceInUse(DevelopersApi api,
String rscName) throws
s_logger.error("isResourceInUse: null returned from resourceList");
return false;
}
+
+ /**
+ * Try to get the device path for the given resource name.
+ * This could be made a bit more direct after java-linstor api is fixed
for layer data subtypes.
+ * @param api developer api object to use
+ * @param rscName resource name to get the device path
+ * @return The device path of the resource.
+ * @throws ApiException if Linstor API call failed.
+ * @throws CloudRuntimeException if no device path could be found.
+ */
+ public static String getDevicePath(DevelopersApi api, String rscName)
throws ApiException, CloudRuntimeException {
+ List<ResourceWithVolumes> resources = api.viewResources(
+ Collections.emptyList(),
+ Collections.singletonList(rscName),
+ Collections.emptyList(),
+ null,
+ null,
+ null);
+ for (ResourceWithVolumes rsc : resources) {
+ if (!rsc.getVolumes().isEmpty()) {
+ // CloudStack resource always only have 1 volume
+ String devicePath = rsc.getVolumes().get(0).getDevicePath();
+ if (devicePath != null && !devicePath.isEmpty()) {
+ s_logger.info(String.format("getDevicePath: %s -> %s",
rscName, devicePath));
+ return devicePath;
+ }
+ }
+ }
+
+ s_logger.error("viewResources didn't return resources or volumes for "
+ rscName);
Review Comment:
Maybe extract this to a variable and reuse in the line right below?
##########
plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/util/LinstorUtil.java:
##########
@@ -109,4 +110,36 @@ public static boolean isResourceInUse(DevelopersApi api,
String rscName) throws
s_logger.error("isResourceInUse: null returned from resourceList");
return false;
}
+
+ /**
+ * Try to get the device path for the given resource name.
+ * This could be made a bit more direct after java-linstor api is fixed
for layer data subtypes.
+ * @param api developer api object to use
+ * @param rscName resource name to get the device path
+ * @return The device path of the resource.
+ * @throws ApiException if Linstor API call failed.
+ * @throws CloudRuntimeException if no device path could be found.
+ */
+ public static String getDevicePath(DevelopersApi api, String rscName)
throws ApiException, CloudRuntimeException {
+ List<ResourceWithVolumes> resources = api.viewResources(
+ Collections.emptyList(),
+ Collections.singletonList(rscName),
+ Collections.emptyList(),
+ null,
+ null,
+ null);
+ for (ResourceWithVolumes rsc : resources) {
+ if (!rsc.getVolumes().isEmpty()) {
+ // CloudStack resource always only have 1 volume
+ String devicePath = rsc.getVolumes().get(0).getDevicePath();
+ if (devicePath != null && !devicePath.isEmpty()) {
+ s_logger.info(String.format("getDevicePath: %s -> %s",
rscName, devicePath));
Review Comment:
```suggestion
s_logger.debug(String.format("getDevicePath: %s -> %s",
rscName, devicePath));
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
