diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-09-16 06:38:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-09-16 06:38:40 +0000 |
| commit | c5b76e3c9cb63f393cebd83d878633ee543a7165 (patch) | |
| tree | d11e5f1858e51a9706dd3e30fa8a1a843195875e | |
| parent | 500388c3fe8be48be046908acd549f5e28608921 (diff) | |
| parent | f3a70ddc5e727f14527bf576489b65fb23dc4bda (diff) | |
| download | ceilometer-c5b76e3c9cb63f393cebd83d878633ee543a7165.tar.gz | |
Merge "minimise ceilometer memory usage"
| -rw-r--r-- | ceilometer/alarm/storage/impl_sqlalchemy.py | 3 | ||||
| -rw-r--r-- | ceilometer/storage/impl_sqlalchemy.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ceilometer/alarm/storage/impl_sqlalchemy.py b/ceilometer/alarm/storage/impl_sqlalchemy.py index e0cc6c9c..059b41d5 100644 --- a/ceilometer/alarm/storage/impl_sqlalchemy.py +++ b/ceilometer/alarm/storage/impl_sqlalchemy.py @@ -20,7 +20,6 @@ from __future__ import absolute_import import os from oslo.config import cfg -from oslo.db.sqlalchemy import migration from oslo.db.sqlalchemy import session as db_session from sqlalchemy import desc @@ -87,6 +86,8 @@ class Connection(base.Connection): ) def upgrade(self): + # NOTE(gordc): to minimise memory, only import migration when needed + from oslo.db.sqlalchemy import migration path = os.path.join(os.path.abspath(os.path.dirname(__file__)), '..', '..', 'storage', 'sqlalchemy', 'migrate_repo') diff --git a/ceilometer/storage/impl_sqlalchemy.py b/ceilometer/storage/impl_sqlalchemy.py index f4d7de02..d1f7671e 100644 --- a/ceilometer/storage/impl_sqlalchemy.py +++ b/ceilometer/storage/impl_sqlalchemy.py @@ -24,7 +24,6 @@ import os from oslo.config import cfg from oslo.db import exception as dbexc -from oslo.db.sqlalchemy import migration from oslo.db.sqlalchemy import session as db_session from oslo.utils import timeutils import six @@ -227,6 +226,8 @@ class Connection(base.Connection): ) def upgrade(self): + # NOTE(gordc): to minimise memory, only import migration when needed + from oslo.db.sqlalchemy import migration path = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'sqlalchemy', 'migrate_repo') migration.db_sync(self._engine_facade.get_engine(), path) |