openstack/cinder
Code Issues Proposed changes

3PAR drivers volume size conversion is incorrect

Browse Source 
The 3PAR drivers conversion of the volume size to gibibytes (GiBs) is
incorrect, resulting in slightly smaller volumes than expected. The
drivers were assuming the input was gigabytes (GBs) when in fact the
input was gibibytes (GiBs) as documented by the cinder API.

Change-Id: I5c86f506790723195f8f9433c9e5eedddd53a4ab
Closes-bug: 1513158
This commit is contained in:
Kurt Martin
2015-11-06 08:42:50 -08:00
parent cb029f2cab
commit 0ed514cb0a
2 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cinder/tests/unit/test_hp3par.py
View File

@@ -669,7 +669,7 @@ class HP3PARBaseDriver(object):
mock.call.createVolume(
self.VOLUME_3PAR_NAME,
HP3PAR_CPG,
1907, {
2048, {
'comment': comment,
'tpvv': True,
'tdvv': False,
@@ -698,7 +698,7 @@ class HP3PARBaseDriver(object):
mock.call.createVolume(
self.VOLUME_3PAR_NAME,
HP3PAR_CPG2,
1907, {
2048, {
'comment': comment,
'tpvv': True,
'tdvv': False,
@@ -854,7 +854,7 @@ class HP3PARBaseDriver(object):
mock.call.createVolume(
self.VOLUME_3PAR_NAME,
HP3PAR_CPG,
1907, {
2048, {
'comment': comment,
'tpvv': True,
'tdvv': False,
@@ -899,7 +899,7 @@ class HP3PARBaseDriver(object):
mock.call.createVolume(
self.VOLUME_3PAR_NAME,
HP3PAR_CPG,
1907, {
2048, {
'comment': comment,
'tpvv': False,
'tdvv': True,
@@ -949,7 +949,7 @@ class HP3PARBaseDriver(object):
mock.call.createVolume(
self.VOLUME_3PAR_NAME,
HP3PAR_CPG,
1907, {
2048, {
'comment': comment,
'tpvv': True,
'tdvv': False,

18
cinder/volume/drivers/san/hp/hp_3par_common.py
View File

@@ -201,11 +201,12 @@ class HP3PARCommon(object):
2.0.49 - Added client CPG stats to driver volume stats. bug #1482741
2.0.50 - Add over subscription support
2.0.51 - Adds consistency group support
2.0.52 - Added update_migrated_volume. bug # 1492023
2.0.52 - Added update_migrated_volume. bug #1492023
2.0.53 - Fix volume size conversion. bug #1513158
"""
VERSION = "2.0.52"
VERSION = "2.0.53"
stats = {}
@@ -789,18 +790,13 @@ class HP3PARCommon(object):
return vol_encoded
def _capacity_from_size(self, vol_size):
# because 3PAR volume sizes are in
# Mebibytes, Gigibytes, not Megabytes.
MB = 1000
MiB = 1.048576
# because 3PAR volume sizes are in Mebibytes.
if int(vol_size) == 0:
capacity = MB # default: 1GB
capacity = units.Gi # default: 1GiB
else:
capacity = vol_size * MB
capacity = vol_size * units.Gi
capacity = int(round(capacity / MiB))
capacity = int(math.ceil(capacity / units.Mi))
return capacity
def _delete_3par_host(self, hostname):