openstack
/
cinder
Code Issues Proposed changes

Merge "Add log if resource_filters json does not exist"

This commit is contained in:
Zuul 2020-05-29 21:27:26 +00:00 committed by Gerrit Code Review
parent cb52912eb6 be9d5f3fa5
commit 307fccea4c
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cinder/api/common.py
View File

@ -354,9 +354,17 @@ def get_cluster_host(req, params, cluster_version=None):
def _initialize_filters():
global _FILTERS_COLLECTION
if not _FILTERS_COLLECTION:
with open(CONF.resource_query_filters_file, 'r') as filters_file:
_FILTERS_COLLECTION = json.load(filters_file)
if _FILTERS_COLLECTION:
return
if not os.path.exists(CONF.resource_query_filters_file):
LOG.error(
"resource query filters file does not exist: %s",
CONF.resource_query_filters_file)
return
with open(CONF.resource_query_filters_file, 'r') as filters_file:
_FILTERS_COLLECTION = json.load(filters_file)
def get_enabled_resource_filters(resource=None):