openstack
/
cinder
Code Issues Proposed changes

Merge "Fix image cache db query when limits are enabled" into stable/ocata

This commit is contained in:
Jenkins 2017-07-25 15:19:24 +00:00 committed by Gerrit Code Review
parent 8267a97329 7246988316
commit 0d5ced6b6a
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cinder/image/cache.py
View File

@ -134,6 +134,7 @@ class ImageVolumeCache(object):
# Assume the entries are ordered by most recently used to least used.
entries = self.db.image_volume_cache_get_all(
context,
**self._get_query_filters(volume))
current_count = len(entries)

2
cinder/tests/unit/image/test_cache.py
View File

@ -254,6 +254,8 @@ class ImageVolumeCacheTestCase(test.TestCase):
self.assertEqual(2, mock_delete.call_count)
mock_delete.assert_any_call(self.context, entry2)
mock_delete.assert_any_call(self.context, entry3)
self.mock_db.image_volume_cache_get_all.assert_called_with(
self.context, cluster_name=self.volume_ovo.cluster_name)
def test_ensure_space_need_count(self):
cache = self._build_cache(max_gb=30, max_count=2)