openstack/placement
Code Issues Proposed changes

Update Instance action's updated_at when action event updated.

Browse Source 
When we do some operation on instances, will record some
instance action(such as 'create') in 'instance_actions' table,
and some sub-event will record(such as
compute__do_build_and_run_instance) in 'instance_actions_events'
table.

we need update the instance action's updated_at when instance
action events are created and instance action created or finished.

Change-Id: I75a827b759b59773c08ffc6b1e3e54d6189b5853
Closes-Bug: #1719561
This commit is contained in:
Yikun Jiang 2017-09-26 18:33:00 +08:00 committed by Matt Riedemann
parent 0946a084e9
commit 612db97f4b
1 changed files with 26 additions and 2 deletions

28
nova/db/sqlalchemy/api.py

@ -6205,7 +6205,7 @@ def instance_fault_get_by_instance_uuids(context, instance_uuids,
@pick_context_manager_writer
def action_start(context, values):
convert_objects_related_datetimes(values, 'start_time')
convert_objects_related_datetimes(values, 'start_time', 'updated_at')
action_ref = models.InstanceAction()
action_ref.update(values)
action_ref.save(context.session)
@ -6214,7 +6214,8 @@ def action_start(context, values):
@pick_context_manager_writer
def action_finish(context, values):
convert_objects_related_datetimes(values, 'start_time', 'finish_time')
convert_objects_related_datetimes(values, 'start_time', 'finish_time',
'updated_at')
query = model_query(context, models.InstanceAction).\
filter_by(instance_uuid=values['instance_uuid']).\
filter_by(request_id=values['request_id'])
@ -6270,9 +6271,13 @@ def action_event_start(context, values):
# according to request_id. Try to get the last created action so that
# init_instance can continue to finish the recovery action, like:
# powering_off, unpausing, and so on.
update_action = True
if not action and not context.project_id:
action = _action_get_last_created_by_instance_uuid(
context, values['instance_uuid'])
# If we couldn't find an action by the request_id, we don't want to
# update this action since it likely represents an inactive action.
update_action = False
if not action:
raise exception.InstanceActionNotFound(
@ -6284,9 +6289,19 @@ def action_event_start(context, values):
event_ref = models.InstanceActionEvent()
event_ref.update(values)
context.session.add(event_ref)
# Update action updated_at.
if update_action:
action.update({'updated_at': values['start_time']})
action.save(context.session)
return event_ref
# NOTE: We need the retry_on_deadlock decorator for cases like resize where
# a lot of events are happening at once between multiple hosts trying to
# update the same action record in a small time window.
@oslo_db_api.wrap_db_retry(max_retries=5, retry_on_deadlock=True)
@pick_context_manager_writer
def action_event_finish(context, values):
"""Finish an event on an instance action."""
@ -6299,9 +6314,13 @@ def action_event_finish(context, values):
# according to request_id. Try to get the last created action so that
# init_instance can continue to finish the recovery action, like:
# powering_off, unpausing, and so on.
update_action = True
if not action and not context.project_id:
action = _action_get_last_created_by_instance_uuid(
context, values['instance_uuid'])
# If we couldn't find an action by the request_id, we don't want to
# update this action since it likely represents an inactive action.
update_action = False
if not action:
raise exception.InstanceActionNotFound(
@ -6321,6 +6340,11 @@ def action_event_finish(context, values):
if values['result'].lower() == 'error':
action.update({'message': 'Error'})
# Update action updated_at.
if update_action:
action.update({'updated_at': values['finish_time']})
action.save(context.session)
return event_ref