> On March 17, 2013, 5:27 p.m., Nitin Mehta wrote: > > server/src/com/cloud/storage/VolumeManagerImpl.java, line 744 > > <https://reviews.apache.org/r/9541/diff/8/?file=269907#file269907line744> > > > > It can be a compressed image as well so this might not work in that > > case. You would need to increment the exact size.
Added checks in downloadMonitor and downloadListener files, as after uncompressing the file, CS will check the resource limit with the diff size (difference between the actual size and compressed size) and generate an alert if it exceeds the limit. After this it will also update the count accordingly in resource_count table. The initial increment is still there in place (UriUtils.getRemoteSize(url)), this is to increment the count just after persisting the template/volume in DB. This will take care of check if user fire registerTemplate/uploadVolume API cmd immediately after the first command. - Sanjay ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/9541/#review18042 ----------------------------------------------------------- On March 13, 2013, 5:44 a.m., Sanjay Tripathi wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/9541/ > ----------------------------------------------------------- > > (Updated March 13, 2013, 5:44 a.m.) > > > Review request for cloudstack, Devdeep Singh, Nitin Mehta, Sateesh > Chodapuneedi, mice xia, and Min Chen. > > > Description > ------- > > CLOUDSTACK-1156: Limit Primary and Secondary storage for domain/accounts > > Addition of two new resource types i.e. Primary and Secondary storage > space in the existing pool of > resource types. > Added methods to set the limits on these resources using > updateResourceLimit > API command and to get a count using updateResourceCount. Also added > calls in the > Templates, Volumes, Snapshots life cycle to check these limits and to > increment/decrement the new > resource types > > Resource Name :: Resource type number > Primary Storage 10 > Secondary Storage 11 > > Also added jUnit Tests for the same. > > > This addresses bug CLOUDSTACK-1156. > > > Diffs > ----- > > api/src/com/cloud/configuration/Resource.java 7614c8a > api/src/com/cloud/storage/VolumeApiService.java 8517988 > > api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java > f6d3a98 > > api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java > 0039f62 > api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java > 955727a > api/src/org/apache/cloudstack/api/response/AccountResponse.java 9a98a35 > api/src/org/apache/cloudstack/api/response/ResourceCountResponse.java > a7fbbf2 > api/src/org/apache/cloudstack/api/response/ResourceLimitResponse.java > b444e7a > > plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java > 33725f6 > server/src/com/cloud/api/ApiResponseHelper.java fbfc955 > server/src/com/cloud/api/query/dao/AccountJoinDaoImpl.java 898bafc > server/src/com/cloud/api/query/vo/AccountJoinVO.java cd7231c > server/src/com/cloud/configuration/Config.java 64465a2 > server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java 23c0796 > server/src/com/cloud/storage/VolumeManager.java af3cbbf > server/src/com/cloud/storage/VolumeManagerImpl.java 4951975 > server/src/com/cloud/storage/dao/SnapshotDao.java 0e378a7 > server/src/com/cloud/storage/dao/SnapshotDaoImpl.java 825b6d5 > server/src/com/cloud/storage/dao/VolumeDao.java d7a2667 > server/src/com/cloud/storage/dao/VolumeDaoImpl.java 40ed875 > server/src/com/cloud/storage/download/DownloadMonitorImpl.java 0bc89e3 > server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java bacca01 > server/src/com/cloud/template/HypervisorTemplateAdapter.java 1426421 > server/src/com/cloud/template/TemplateManagerImpl.java d843dbc > server/src/com/cloud/vm/UserVmManagerImpl.java 88086ce > server/test/com/cloud/resourcelimit/ResourceLimitManagerImplTest.java > d311ad3 > server/test/com/cloud/vpc/MockResourceLimitManagerImpl.java b9fc861 > setup/db/db/schema-40to410.sql b9bfe1a > setup/db/db/schema-410to420.sql ca15bda > utils/src/com/cloud/utils/UriUtils.java a8b5ccb > > Diff: https://reviews.apache.org/r/9541/diff/ > > > Testing > ------- > > Tested life cycle of templates, volumes, snapshots, vm on my local CloudStack > setup. > > > Thanks, > > Sanjay Tripathi > >
