openstack
/
cinder
Code Issues Proposed changes

Merge "Fix image volume cache max size and max count limits" into stable/queens

This commit is contained in:
Zuul 2018-10-05 16:31:27 +00:00 committed by Gerrit Code Review
parent 493e1cda08 fe0c082529
commit 8b1aa5f99b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cinder/image/cache.py
View File

@ -155,8 +155,10 @@ class ImageVolumeCache(object):
'count': current_count,
'max_count': self.max_cache_size_count})
while ((current_size > self.max_cache_size_gb
or current_count > self.max_cache_size_count)
while (((current_size > self.max_cache_size_gb and
self.max_cache_size_gb > 0)
or (current_count > self.max_cache_size_count and
self.max_cache_size_count > 0))
and len(entries)):
entry = entries.pop()
LOG.debug('Reclaiming image-volume cache space; removing cache '

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

@ -236,7 +236,7 @@ class ImageVolumeCacheTestCase(test.TestCase):
self.assertFalse(has_space)
def test_ensure_space_need_gb(self):
cache = self._build_cache(max_gb=30, max_count=10)
cache = self._build_cache(max_gb=30, max_count=0)
mock_delete = mock.patch.object(cache, '_delete_image_volume').start()
entries = []
@ -258,7 +258,7 @@ class ImageVolumeCacheTestCase(test.TestCase):
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)
cache = self._build_cache(max_gb=0, max_count=2)
mock_delete = mock.patch.object(cache, '_delete_image_volume').start()
entries = []