From 631d707a35aca2fea2f9be290416758da3a59689 Mon Sep 17 00:00:00 2001 From: Rick Harris Date: Fri, 22 Jul 2011 17:11:18 -0500 Subject: [PATCH] Removing cache enabled flag from most confs --- etc/glance-api.conf | 3 --- etc/glance-prefetcher.conf | 3 --- etc/glance-pruner.conf | 3 --- etc/glance-reaper.conf | 3 --- glance/api/__init__.py | 1 + glance/image_cache/__init__.py | 3 +-- glance/image_cache/prefetcher.py | 5 ----- glance/image_cache/pruner.py | 5 ----- glance/image_cache/reaper.py | 7 +------ 9 files changed, 3 insertions(+), 30 deletions(-) diff --git a/etc/glance-api.conf b/etc/glance-api.conf index 7cfac9c4ba..1cf838e771 100644 --- a/etc/glance-api.conf +++ b/etc/glance-api.conf @@ -53,9 +53,6 @@ swift_store_create_container_on_put = False # ============ Image Cache Options ======================== -# Whether to enable the caching of image data -image_cache_enabled = False - # Directory that the Image Cache writes data to # Make sure this is also set in glance-pruner.conf image_cache_datadir = /var/lib/glance/image-cache/ diff --git a/etc/glance-prefetcher.conf b/etc/glance-prefetcher.conf index cb583c7b3a..0dfcbe719f 100644 --- a/etc/glance-prefetcher.conf +++ b/etc/glance-prefetcher.conf @@ -7,9 +7,6 @@ debug = False log_file = /var/log/glance/prefetcher.log -# Whether to enable the caching of image data -image_cache_enabled = False - # Directory that the Image Cache writes data to # Make sure this is also set in glance-api.conf image_cache_datadir = /var/lib/glance/image-cache/ diff --git a/etc/glance-pruner.conf b/etc/glance-pruner.conf index d402af9df8..9e6444baef 100644 --- a/etc/glance-pruner.conf +++ b/etc/glance-pruner.conf @@ -7,9 +7,6 @@ debug = False log_file = /var/log/glance/pruner.log -# Whether to enable the caching of image data -image_cache_enabled = False - image_cache_max_size_bytes = 1073741824 # Percentage of the cache that should be freed (in addition to the overage) diff --git a/etc/glance-reaper.conf b/etc/glance-reaper.conf index f38a632685..da3197cf91 100644 --- a/etc/glance-reaper.conf +++ b/etc/glance-reaper.conf @@ -7,9 +7,6 @@ debug = False log_file = /var/log/glance/reaper.log -# Whether to enable the caching of image data -image_cache_enabled = False - # Directory that the Image Cache writes data to # Make sure this is also set in glance-api.conf image_cache_datadir = /var/lib/glance/image-cache/ diff --git a/glance/api/__init__.py b/glance/api/__init__.py index fdd011fe99..5383eae966 100644 --- a/glance/api/__init__.py +++ b/glance/api/__init__.py @@ -17,6 +17,7 @@ import webob.exc from glance import registry +from glance.common import exception class BaseController(object): diff --git a/glance/image_cache/__init__.py b/glance/image_cache/__init__.py index 97c11d7539..abb8339b6a 100644 --- a/glance/image_cache/__init__.py +++ b/glance/image_cache/__init__.py @@ -98,8 +98,7 @@ class ImageCache(object): @property def enabled(self): - return config.get_option( - self.options, 'image_cache_enabled', type='bool', default=False) + return self.options.get('image_cache_enabled', False) @property def path(self): diff --git a/glance/image_cache/prefetcher.py b/glance/image_cache/prefetcher.py index e082c1df53..5c6b8c17f2 100644 --- a/glance/image_cache/prefetcher.py +++ b/glance/image_cache/prefetcher.py @@ -47,11 +47,6 @@ class Prefetcher(object): cache_file.write(chunk) def run(self): - if not self.cache.enabled: - logger.debug( - "Image caching is not enabled, going back to sleep...") - return - if self.cache.is_currently_prefetching_any_images(): logger.debug("Currently prefetching, going back to sleep...") return diff --git a/glance/image_cache/pruner.py b/glance/image_cache/pruner.py index 56fa8dcf67..117f636250 100644 --- a/glance/image_cache/pruner.py +++ b/glance/image_cache/pruner.py @@ -48,11 +48,6 @@ class Pruner(object): type='float', default=0.05) def run(self): - if not self.cache.enabled: - logger.debug( - "Image caching is not enabled, going back to sleep...") - return - self.prune_cache() def prune_cache(self): diff --git a/glance/image_cache/reaper.py b/glance/image_cache/reaper.py index 0ce9155bb5..2a728bb136 100644 --- a/glance/image_cache/reaper.py +++ b/glance/image_cache/reaper.py @@ -32,13 +32,8 @@ class Reaper(object): self.cache = ImageCache(options) def run(self): - if not self.cache.enabled: - logger.debug( - "Image caching is not enabled, going back to sleep...") - return - invalid_grace = int(self.options.get( - 'image_cache_invalid_entry_grace_period', + 'image_cache_invalid_entry_grace_period', 3600)) self.cache.reap_invalid(grace=invalid_grace) self.cache.reap_stalled()