Add back initialization of _maxVolumeSizeInGb in VolumeApiServiceImpl. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/694ec684 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/694ec684 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/694ec684
Branch: refs/heads/object_store_migration Commit: 694ec684a372c95abf8d1a798714b6f074862816 Parents: 28f9952 Author: Min Chen <[email protected]> Authored: Fri Oct 25 21:24:08 2013 -0700 Committer: Min Chen <[email protected]> Committed: Fri Oct 25 21:24:08 2013 -0700 ---------------------------------------------------------------------- server/src/com/cloud/storage/VolumeApiServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/694ec684/server/src/com/cloud/storage/VolumeApiServiceImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/com/cloud/storage/VolumeApiServiceImpl.java index 071281c..e4c8264 100644 --- a/server/src/com/cloud/storage/VolumeApiServiceImpl.java +++ b/server/src/com/cloud/storage/VolumeApiServiceImpl.java @@ -25,6 +25,8 @@ import java.util.concurrent.ExecutionException; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.command.user.volume.AttachVolumeCmd; import org.apache.cloudstack.api.command.user.volume.CreateVolumeCmd; @@ -64,7 +66,6 @@ import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao; import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreDao; import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreVO; import org.apache.cloudstack.storage.image.datastore.ImageStoreEntity; -import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; @@ -1726,6 +1727,8 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic String _customDiskOfferingMinSizeStr = _configDao.getValue(Config.CustomDiskOfferingMinSize.toString()); _customDiskOfferingMinSize = NumbersUtil.parseInt(_customDiskOfferingMinSizeStr, Integer.parseInt(Config.CustomDiskOfferingMinSize.getDefaultValue())); + String maxVolumeSizeInGbString = _configDao.getValue(Config.MaxVolumeSize.toString()); + _maxVolumeSizeInGb = NumbersUtil.parseLong(maxVolumeSizeInGbString, 2000); return true; } @@ -1735,7 +1738,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic @Inject public void setStoragePoolAllocators(List<StoragePoolAllocator> storagePoolAllocators) { - this._storagePoolAllocators = storagePoolAllocators; + _storagePoolAllocators = storagePoolAllocators; } }
