cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mtutkow...@apache.org
Subject [1/2] git commit: updated refs/heads/master to abfe33a
Date Wed, 05 Aug 2015 22:24:39 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 97eb0f752 -> abfe33a24


The lowest the hypervisor snapshot reserve value can be is 10 (down from 50).

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2cbc1688
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2cbc1688
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2cbc1688

Branch: refs/heads/master
Commit: 2cbc1688220b6af086ea4a367f2132d892a97cb9
Parents: 97eb0f7
Author: Mike Tutkowski <mike.tutkowski@solidfire.com>
Authored: Wed Aug 5 15:47:57 2015 -0600
Committer: Mike Tutkowski <mike.tutkowski@solidfire.com>
Committed: Wed Aug 5 15:47:57 2015 -0600

----------------------------------------------------------------------
 .../datastore/driver/SolidFirePrimaryDataStoreDriver.java       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2cbc1688/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java
----------------------------------------------------------------------
diff --git a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java
b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java
index 62a03a4..46ecd69 100644
--- a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java
+++ b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java
@@ -77,6 +77,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
 public class SolidFirePrimaryDataStoreDriver implements PrimaryDataStoreDriver {
     private static final Logger s_logger = Logger.getLogger(SolidFirePrimaryDataStoreDriver.class);
     private static final int s_lockTimeInSeconds = 300;
+    private static final int s_lowestHypervisorSnapshotReserve = 10;
 
     @Inject private AccountDao _accountDao;
     @Inject private AccountDetailsDao _accountDetailsDao;
@@ -352,9 +353,7 @@ public class SolidFirePrimaryDataStoreDriver implements PrimaryDataStoreDriver
{
         Integer hypervisorSnapshotReserve = volume.getHypervisorSnapshotReserve();
 
         if (hypervisorSnapshotReserve != null) {
-            if (hypervisorSnapshotReserve < 50) {
-                hypervisorSnapshotReserve = 50;
-            }
+            hypervisorSnapshotReserve = Math.max(hypervisorSnapshotReserve, s_lowestHypervisorSnapshotReserve);
 
             volumeSize += volumeSize * (hypervisorSnapshotReserve / 100f);
         }


Mime
View raw message