diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-23 17:43:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-23 17:43:20 +0000 |
| commit | dda5f5afe4f1529a0e468107cdb8145db8a136c5 (patch) | |
| tree | d72205ebbec9ef16167140a43cbd7fe519f6bed7 /cinderclient/base.py | |
| parent | 8799dd4db08272818eb5e42a8fe5f6c9e3c9c078 (diff) | |
| parent | b7f52a8248cfa26b96d2151301f546085509dfef (diff) | |
| download | python-cinderclient-dda5f5afe4f1529a0e468107cdb8145db8a136c5.tar.gz | |
Merge "_human_id_cache or _uuid_cache error about completion_cache"
Diffstat (limited to 'cinderclient/base.py')
| -rw-r--r-- | cinderclient/base.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cinderclient/base.py b/cinderclient/base.py index 0705a5e..4716b7f 100644 --- a/cinderclient/base.py +++ b/cinderclient/base.py @@ -297,7 +297,12 @@ class Manager(common_base.HookableMixin): cache = getattr(self, cache_attr, None) if cache: cache.close() - delattr(self, cache_attr) + try: + delattr(self, cache_attr) + except AttributeError: + # NOTE(kiall): If this attr is deleted by another + # operation, don't fail any way. + pass def write_to_completion_cache(self, cache_type, val): cache = getattr(self, "_%s_cache" % cache_type, None) |