openstack/watcher
Code Issues Proposed changes

Merge "Repair log parameter error"

Browse Source
This commit is contained in:
Jenkins 2016-12-16 09:55:54 +00:00 committed by Gerrit Code Review
commit c5ff387ae9
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py
View File

@ -110,9 +110,9 @@ class VMWorkloadConsolidation(base.ServerConsolidationBaseStrategy):
return state.value
else:
LOG.error(_LE('Unexpexted resource state type, '
'state=%(state)s, state_type=%(st)s.'),
state=state,
st=type(state))
'state=%(state)s, state_type=%(st)s.') % dict(
state=state,
st=type(state)))
raise exception.WatcherException
def add_action_enable_compute_node(self, node):
@ -161,9 +161,9 @@ class VMWorkloadConsolidation(base.ServerConsolidationBaseStrategy):
# migration mechanism to move non active VMs.
LOG.error(
_LE('Cannot live migrate: instance_uuid=%(instance_uuid)s, '
'state=%(instance_state)s.'),
instance_uuid=instance_uuid,
instance_state=instance_state_str)
'state=%(instance_state)s.') % dict(
instance_uuid=instance_uuid,
instance_state=instance_state_str))
return
migration_type = 'live'
@ -240,10 +240,8 @@ class VMWorkloadConsolidation(base.ServerConsolidationBaseStrategy):
if not instance_ram_util or not instance_disk_util:
LOG.error(
_LE('No values returned by %(resource_id)s '
'for memory.usage or disk.root.size'),
resource_id=instance_uuid
)
_LE('No values returned by %s for memory.usage '
'or disk.root.size'), instance_uuid)
raise exception.NoDataFound
self.ceilometer_instance_data_cache[instance_uuid] = dict(