openstack/ceilometer
Code Issues Proposed changes

Merge "use configured max_retries and retry_interval for database connection"

Browse Source
This commit is contained in:
Jenkins 2015-02-15 03:06:25 +00:00 committed by Gerrit Code Review
commit fea37703be
4 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ceilometer/alarm/storage/impl_sqlalchemy.py
View File

@ -77,10 +77,13 @@ class Connection(base.Connection):
) )
def __init__(self, url): def __init__(self, url):
self._engine_facade = db_session.EngineFacade( # Set max_retries to 0, since oslo.db in certain cases may attempt
url, # to retry making the db connection retried max_retries ^ 2 times
**dict(cfg.CONF.database.items()) # in failure case and db reconnection has already been implemented
) # in storage.__init__.get_connection_from_config function
options = dict(cfg.CONF.database.items())
options['max_retries'] = 0
self._engine_facade = db_session.EngineFacade(url, **options)
def upgrade(self): def upgrade(self):
# NOTE(gordc): to minimise memory, only import migration when needed # NOTE(gordc): to minimise memory, only import migration when needed

11
ceilometer/event/storage/impl_sqlalchemy.py
View File

@ -85,10 +85,13 @@ class Connection(base.Connection):
) )
def __init__(self, url): def __init__(self, url):
self._engine_facade = db_session.EngineFacade( # Set max_retries to 0, since oslo.db in certain cases may attempt
url, # to retry making the db connection retried max_retries ^ 2 times
**dict(cfg.CONF.database.items()) # in failure case and db reconnection has already been implemented
) # in storage.__init__.get_connection_from_config function
options = dict(cfg.CONF.database.items())
options['max_retries'] = 0
self._engine_facade = db_session.EngineFacade(url, **options)
def upgrade(self): def upgrade(self):
# NOTE(gordc): to minimise memory, only import migration when needed # NOTE(gordc): to minimise memory, only import migration when needed

31
ceilometer/storage/__init__.py
View File

@ -88,21 +88,24 @@ class StorageBadAggregate(Exception):
code = 400 code = 400
# Convert retry_interval secs to msecs for retry decorator
@retrying.retry(wait_fixed=cfg.CONF.database.retry_interval * 1000,
stop_max_attempt_number=cfg.CONF.database.max_retries
if cfg.CONF.database.max_retries >= 0
else None)
def get_connection_from_config(conf, purpose=None): def get_connection_from_config(conf, purpose=None):
if conf.database_connection: retries = conf.database.max_retries
conf.set_override('connection', conf.database_connection,
group='database') # Convert retry_interval secs to msecs for retry decorator
namespace = 'ceilometer.metering.storage' @retrying.retry(wait_fixed=conf.database.retry_interval * 1000,
url = conf.database.connection stop_max_attempt_number=retries if retries >= 0 else None)
if purpose: def _inner():
namespace = 'ceilometer.%s.storage' % purpose if conf.database_connection:
url = getattr(conf.database, '%s_connection' % purpose) or url conf.set_override('connection', conf.database_connection,
return get_connection(url, namespace) group='database')
namespace = 'ceilometer.metering.storage'
url = conf.database.connection
if purpose:
namespace = 'ceilometer.%s.storage' % purpose
url = getattr(conf.database, '%s_connection' % purpose) or url
return get_connection(url, namespace)
return _inner()
def get_connection(url, namespace): def get_connection(url, namespace):

8
ceilometer/storage/impl_sqlalchemy.py
View File

@ -221,11 +221,9 @@ class Connection(base.Connection):
# to retry making the db connection retried max_retries ^ 2 times # to retry making the db connection retried max_retries ^ 2 times
# in failure case and db reconnection has already been implemented # in failure case and db reconnection has already been implemented
# in storage.__init__.get_connection_from_config function # in storage.__init__.get_connection_from_config function
cfg.CONF.set_override('max_retries', 0, group='database') options = dict(cfg.CONF.database.items())
self._engine_facade = db_session.EngineFacade( options['max_retries'] = 0
url, self._engine_facade = db_session.EngineFacade(url, **options)
**dict(cfg.CONF.database.items())
)
def upgrade(self): def upgrade(self):
# NOTE(gordc): to minimise memory, only import migration when needed # NOTE(gordc): to minimise memory, only import migration when needed