cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From HrWiggles <...@git.apache.org>
Subject [GitHub] cloudstack pull request #1953: CLOUDSTACK-9794: Unable to attach more than 1...
Date Tue, 21 Feb 2017 11:41:29 GMT
Github user HrWiggles commented on a diff in the pull request:

    https://github.com/apache/cloudstack/pull/1953#discussion_r102179249
  
    --- Diff: server/src/com/cloud/storage/VolumeApiServiceImpl.java ---
    @@ -2639,22 +2639,23 @@ private int getMaxDataVolumesSupported(UserVmVO vm) {
             return maxDataVolumesSupported.intValue();
         }
     
    -    private Long getDeviceId(long vmId, Long deviceId) {
    +    private Long getDeviceId(UserVmVO vm, Long deviceId) {
             // allocate deviceId
    -        List<VolumeVO> vols = _volsDao.findByInstance(vmId);
    +        int maxDataVolumesSupported = getMaxDataVolumesSupported(vm);
    +        List<VolumeVO> vols = _volsDao.findByInstance(vm.getId());
             if (deviceId != null) {
    -            if (deviceId.longValue() > 15 || deviceId.longValue() == 3) {
    -                throw new RuntimeException("deviceId should be 1,2,4-15");
    +            if (deviceId.longValue() > maxDataVolumesSupported || deviceId.longValue()
== 3) {
    --- End diff --
    
    There's no check for whether `deviceId` is greater than `0`.  Should check for that here,
as well.  Otherwise, the method will accept `0` and negative values as valid device ids.


---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message