You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mt...@apache.org on 2014/06/30 18:18:33 UTC
git commit: updated refs/heads/master to 03b1e86
Repository: cloudstack
Updated Branches:
refs/heads/master 2148a1a64 -> 03b1e86bd
CLOUDSTACK-7003
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/03b1e86b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/03b1e86b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/03b1e86b
Branch: refs/heads/master
Commit: 03b1e86bde7c58b04e2fa33a3aab884d6af322ad
Parents: 2148a1a
Author: Mike Tutkowski <mi...@solidfire.com>
Authored: Fri Jun 27 20:54:14 2014 -0600
Committer: Mike Tutkowski <mi...@solidfire.com>
Committed: Mon Jun 30 10:17:50 2014 -0600
----------------------------------------------------------------------
.../xenserver/resource/CitrixResourceBase.java | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/03b1e86b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
index b040633..f79edc4 100644
--- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
@@ -6191,8 +6191,6 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
}
protected VDI createVdi(SR sr, String vdiNameLabel, Long volumeSize) throws Types.XenAPIException, XmlRpcException {
- VDI vdi = null;
-
Connection conn = getConnection();
VDI.Record vdir = new VDI.Record();
@@ -6211,22 +6209,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
vdir.virtualSize = volumeSize;
- long maxNumberOfTries = (totalSrSpace / unavailableSrSpace >= 1) ? (totalSrSpace / unavailableSrSpace) : 1;
- long tryNumber = 0;
-
- while (tryNumber <= maxNumberOfTries) {
- try {
- vdi = VDI.create(conn, vdir);
-
- break;
- } catch (Exception ex) {
- tryNumber++;
-
- vdir.virtualSize -= unavailableSrSpace;
- }
- }
-
- return vdi;
+ return VDI.create(conn, vdir);
}
protected void handleSrAndVdiDetach(String iqn, Connection conn) throws Exception {