openstack/aodh
Code Issues Proposed changes

ensure collections created on upgrade

Browse Source 
upgrade does not check that collections exists. this can cause
issues when running upgrade before any data is inserted. this patch
creates collection on upgrade if it does not exist.

Change-Id: I1774d1c943050f1a87b386502392e18b0af8c840
Closes-Bug: #1434013
This commit is contained in:
gordon chung 2015-03-23 10:35:59 -04:00
parent 7e5a6711ce
commit 5c0762534b
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ceilometer/alarm/storage/impl_mongodb.py
View File

@ -58,6 +58,13 @@ class Connection(pymongo_base.Connection):
# needed. # needed.
self.upgrade() self.upgrade()
def upgrade(self):
# create collection if not present
if 'alarm' not in self.db.conn.collection_names():
self.db.conn.create_collection('alarm')
if 'alarm_history' not in self.db.conn.collection_names():
self.db.conn.create_collection('alarm_history')
def clear(self): def clear(self):
self.conn.drop_database(self.db.name) self.conn.drop_database(self.db.name)
# Connection will be reopened automatically if needed # Connection will be reopened automatically if needed

3
ceilometer/event/storage/impl_mongodb.py
View File

@ -53,6 +53,9 @@ class Connection(pymongo_base.Connection):
self.upgrade() self.upgrade()
def upgrade(self): def upgrade(self):
# create collection if not present
if 'event' not in self.db.conn.collection_names():
self.db.conn.create_collection('event')
# Establish indexes # Establish indexes
ttl = cfg.CONF.database.event_time_to_live ttl = cfg.CONF.database.event_time_to_live
impl_mongodb.Connection.update_ttl(ttl, 'event_ttl', 'timestamp', impl_mongodb.Connection.update_ttl(ttl, 'event_ttl', 'timestamp',

7
ceilometer/storage/impl_mongodb.py
View File

@ -442,6 +442,13 @@ class Connection(pymongo_base.Connection):
# project_id values are usually mutually exclusive in the # project_id values are usually mutually exclusive in the
# queries, so the database won't take advantage of an index # queries, so the database won't take advantage of an index
# including both. # including both.
# create collection if not present
if 'resource' not in self.db.conn.collection_names():
self.db.conn.create_collection('resource')
if 'meter' not in self.db.conn.collection_names():
self.db.conn.create_collection('meter')
name_qualifier = dict(user_id='', project_id='project_') name_qualifier = dict(user_id='', project_id='project_')
background = dict(user_id=False, project_id=True) background = dict(user_id=False, project_id=True)
for primary in ['user_id', 'project_id']: for primary in ['user_id', 'project_id']: