openstack/nova
Code Issues Proposed changes

Merge "Use pick_context_manager throughout DB APIs"

Browse Source
This commit is contained in:
Jenkins
2016-11-24 08:09:56 +00:00
committed by Gerrit Code Review
parent ce23061488 9ffa622b6f
commit d49f901b43
6 changed files with 185 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

350
nova/db/sqlalchemy/api.py
View File

File diff suppressed because it is too large Load Diff

4
nova/objects/aggregate.py
View File

@@ -328,7 +328,7 @@ class Aggregate(base.NovaPersistentObject, base.NovaObject):
return cls._from_db_object(context, cls(), db_aggregate) return cls._from_db_object(context, cls(), db_aggregate)
@staticmethod @staticmethod
@db_api.main_context_manager.reader @db_api.pick_context_manager_reader
def _ensure_migrated(context): def _ensure_migrated(context):
result = context.session.query(main_models.Aggregate).\ result = context.session.query(main_models.Aggregate).\
filter_by(deleted=0).count() filter_by(deleted=0).count()
@@ -561,7 +561,7 @@ class AggregateList(base.ObjectListBase, base.NovaObject):
all_aggregates) all_aggregates)
@db_api.main_context_manager.reader @db_api.pick_context_manager_reader
def _get_main_db_aggregate_ids(context, limit): def _get_main_db_aggregate_ids(context, limit):
from nova.db.sqlalchemy import models from nova.db.sqlalchemy import models
return [x[0] for x in context.session.query(models.Aggregate.id). return [x[0] for x in context.session.query(models.Aggregate.id).

6
nova/objects/flavor.py
View File

@@ -187,7 +187,7 @@ def _flavor_destroy(context, flavor_id=None, flavorid=None):
context.session.delete(result) context.session.delete(result)
@db_api.main_context_manager.reader @db_api.pick_context_manager_reader
def _ensure_migrated(context): def _ensure_migrated(context):
result = context.session.query(main_models.InstanceTypes).\ result = context.session.query(main_models.InstanceTypes).\
filter_by(deleted=0).count() filter_by(deleted=0).count()
@@ -682,7 +682,7 @@ class FlavorList(base.ObjectListBase, base.NovaObject):
expected_attrs=['extra_specs']) expected_attrs=['extra_specs'])
@db_api.main_context_manager.reader @db_api.pick_context_manager_reader
def _get_main_db_flavor_ids(context, limit): def _get_main_db_flavor_ids(context, limit):
# NOTE(danms): We don't need this imported at runtime, so # NOTE(danms): We don't need this imported at runtime, so
# keep it separate here # keep it separate here
@@ -692,7 +692,7 @@ def _get_main_db_flavor_ids(context, limit):
limit(limit)] limit(limit)]
@db_api.main_context_manager.writer @db_api.pick_context_manager_writer
def _destroy_flavor_hard(context, name): def _destroy_flavor_hard(context, name):
# NOTE(danms): We don't need this imported at runtime, so # NOTE(danms): We don't need this imported at runtime, so
# keep it separate here # keep it separate here

2
nova/objects/instance.py
View File

@@ -1354,7 +1354,7 @@ class InstanceList(base.ObjectListBase, base.NovaObject):
return [inst['uuid'] for inst in db_instances] return [inst['uuid'] for inst in db_instances]
@db_api.main_context_manager.writer @db_api.pick_context_manager_writer
def _migrate_instance_keypairs(ctxt, count): def _migrate_instance_keypairs(ctxt, count):
db_extras = ctxt.session.query(models.InstanceExtra).\ db_extras = ctxt.session.query(models.InstanceExtra).\
options(joinedload('instance')).\ options(joinedload('instance')).\

2
nova/objects/instance_group.py
View File

@@ -512,7 +512,7 @@ class InstanceGroupList(base.ObjectListBase, base.NovaObject):
api_db_groups + main_db_groups) api_db_groups + main_db_groups)
@db_api.main_context_manager.reader @db_api.pick_context_manager_reader
def _get_main_instance_groups(context, limit): def _get_main_instance_groups(context, limit):
return context.session.query(main_models.InstanceGroup).\ return context.session.query(main_models.InstanceGroup).\
options(joinedload('_policies')).\ options(joinedload('_policies')).\

4
nova/objects/keypair.py
View File

@@ -239,7 +239,7 @@ class KeyPairList(base.ObjectListBase, base.NovaObject):
db.key_pair_count_by_user(context, user_id)) db.key_pair_count_by_user(context, user_id))
@db_api.main_context_manager.reader @db_api.pick_context_manager_reader
def _count_unmigrated_instances(context): def _count_unmigrated_instances(context):
return context.session.query(main_models.InstanceExtra).\ return context.session.query(main_models.InstanceExtra).\
filter_by(keypairs=None).\ filter_by(keypairs=None).\
@@ -247,7 +247,7 @@ def _count_unmigrated_instances(context):
count() count()
@db_api.main_context_manager.reader @db_api.pick_context_manager_reader
def _get_main_keypairs(context, limit): def _get_main_keypairs(context, limit):
return context.session.query(main_models.KeyPair).\ return context.session.query(main_models.KeyPair).\
filter_by(deleted=0).\ filter_by(deleted=0).\