Github user jburwell commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/672#discussion_r73613647
--- Diff:
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
---
@@ -4251,6 +4257,34 @@ public void rebootVM(final Connection conn, final VM
vm, final String vmName) th
}
}
+ protected String skipOrRemoveSR(Connection conn, SR sr) {
+ if (sr == null) {
+ return null;
+ }
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug(logX(sr, "Removing SR"));
+ }
+ try {
+ Set<VDI> vdis = sr.getVDIs(conn);
+ for (VDI vdi : vdis) {
+ Map<java.lang.String, Types.VdiOperations>
currentOperation = vdi.getCurrentOperations(conn);
+ if (currentOperation == null || currentOperation.size() ==
0) {
+ continue;
+ }
+ return null;
+ }
+ removeSR(conn, sr);
+ return null;
+ } catch (XenAPIException e) {
+ s_logger.warn(logX(sr, "Unable to get current opertions " +
e.toString()), e);
+ } catch (XmlRpcException e) {
+ s_logger.warn(logX(sr, "Unable to get current opertions " +
e.getMessage()), e);
+ }
+ String msg = "Remove SR failed";
+ s_logger.warn(msg);
+ return msg;
--- End diff --
I agree with @GabrielBrascher -- there appears to be no value added by
returning a ``String``. Why not change the return type to ``void``?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
