openstack/cinder
Code Issues Proposed changes

Merge "Revert "Correct RBD Provision stats&fix a perf problem""

Browse Source
This commit is contained in:
Jenkins 2017-07-13 09:03:31 +00:00 committed by Gerrit Code Review
commit 400f827e75
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cinder/volume/drivers/rbd.py
View File

@ -360,6 +360,10 @@ class RBDDriver(driver.CloneableImageVD,
ports.append(port) ports.append(port)
return hosts, ports return hosts, ports
def _iterate_cb(self, offset, length, exists):
if exists:
self._total_usage += length
def _get_usage_info(self): def _get_usage_info(self):
with RADOSClient(self) as client: with RADOSClient(self) as client:
for t in self.RBDProxy().list(client.ioctx): for t in self.RBDProxy().list(client.ioctx):
@ -368,7 +372,7 @@ class RBDDriver(driver.CloneableImageVD,
# non-default volume_name_template settings. Template # non-default volume_name_template settings. Template
# must start with "volume". # must start with "volume".
with RBDVolumeProxy(self, t, read_only=True) as v: with RBDVolumeProxy(self, t, read_only=True) as v:
self._total_usage += v.size() v.diff_iterate(0, v.size(), None, self._iterate_cb)
def _update_volume_stats(self): def _update_volume_stats(self):
stats = { stats = {