openstack/deb-nova
Code Issues Proposed changes

Merge "Sending volume IO usage broken"

Browse Source
This commit is contained in:
Jenkins
2013-06-13 19:06:20 +00:00
committed by Gerrit Code Review
parent 739e6137b8 4aee80dd31
commit 2ebca96d40
8 changed files with 129 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nova/compute/utils.py
View File

@@ -290,8 +290,13 @@ def usage_volume_info(vol_usage):
tot_refreshed = vol_usage['tot_last_refreshed']
curr_refreshed = vol_usage['curr_last_refreshed']
last_refreshed_time = (tot_refreshed if tot_refreshed > curr_refreshed
else curr_refreshed)
if tot_refreshed and curr_refreshed:
last_refreshed_time = max(tot_refreshed, curr_refreshed)
elif tot_refreshed:
last_refreshed_time = tot_refreshed
else:
# curr_refreshed must be set
last_refreshed_time = curr_refreshed
usage_info = dict(
volume_id=vol_usage['volume_id'],