x/gantt
Code Issues Proposed changes

Add Docstring to some scheduler/driver.py methods

Browse Source 
Add/fix the Docstring of "handle_scheduler_error" and
"instance_update_db" methods

Fix bug 1233546

Change-Id: I133c569fc9496f6d727a72b6d8e4844774cd983d
This commit is contained in:
Inbar
2013-10-01 13:39:28 +02:00
parent c113454d36
commit 8a058acded
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nova/scheduler/driver.py
View File

@@ -54,13 +54,16 @@ CONF.register_opts(scheduler_driver_opts)
def handle_schedule_error(context, ex, instance_uuid, request_spec): def handle_schedule_error(context, ex, instance_uuid, request_spec):
"""On run_instance failure, update instance state and
send notifications.
"""
if not isinstance(ex, exception.NoValidHost): if not isinstance(ex, exception.NoValidHost):
LOG.exception(_("Exception during scheduler.run_instance")) LOG.exception(_("Exception during scheduler.run_instance"))
state = vm_states.ERROR.upper() state = vm_states.ERROR.upper()
LOG.warning(_('Setting instance to %s state.'), state, LOG.warning(_('Setting instance to %s state.'), state,
instance_uuid=instance_uuid) instance_uuid=instance_uuid)
# update instance state and notify on the transition
(old_ref, new_ref) = db.instance_update_and_get_original(context, (old_ref, new_ref) = db.instance_update_and_get_original(context,
instance_uuid, {'vm_state': vm_states.ERROR, instance_uuid, {'vm_state': vm_states.ERROR,
'task_state': None}) 'task_state': None})
@@ -83,10 +86,10 @@ def handle_schedule_error(context, ex, instance_uuid, request_spec):
def instance_update_db(context, instance_uuid, extra_values=None): def instance_update_db(context, instance_uuid, extra_values=None):
'''Clear the host and node - set the scheduled_at field of an Instance. """Clear the host and node - set the scheduled_at field of an Instance.
:returns: An Instance with the updated fields set properly. :returns: An Instance with the updated fields set properly.
''' """
now = timeutils.utcnow() now = timeutils.utcnow()
values = {'host': None, 'node': None, 'scheduled_at': now} values = {'host': None, 'node': None, 'scheduled_at': now}
if extra_values: if extra_values: