openstack
/
watcher
Code Issues Proposed changes

[Trivialfix]Fix typos in watcher 

Fix the typos in watcher.

Change-Id: I3ab77e2a1f862d3790065de4a6ff6c3ef42f226d
This commit is contained in:
shangxiaobj 2017-08-31 20:47:09 -07:00
parent 50935af15f
commit 162aaa75ee
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/contributor/environment.rst
View File

@ -4,7 +4,7 @@
https://creativecommons.org/licenses/by/3.0/ https://creativecommons.org/licenses/by/3.0/
.. _watcher_developement_environment: .. _watcher_development_environment:
========================================= =========================================
Set up a development environment manually Set up a development environment manually

2
doc/source/contributor/plugin/base-setup.rst
View File

@ -22,7 +22,7 @@ Pre-requisites
We assume that you have set up a working Watcher development environment. So if We assume that you have set up a working Watcher development environment. So if
this not already the case, you can check out our documentation which explains this not already the case, you can check out our documentation which explains
how to set up a :ref:`development environment how to set up a :ref:`development environment
<watcher_developement_environment>`. <watcher_development_environment>`.
.. _development environment: .. _development environment:

2
doc/source/strategies/workload-stabilization.rst
View File

@ -100,7 +100,7 @@ parameter type default Value description
into which the samples are into which the samples are
grouped for aggregation. grouped for aggregation.
Watcher uses only the last Watcher uses only the last
period of all recieved ones. period of all received ones.
==================== ====== ===================== ============================= ==================== ====== ===================== =============================
.. |metrics| replace:: ["cpu_util", "memory.resident"] .. |metrics| replace:: ["cpu_util", "memory.resident"]

2
watcher/applier/workflow_engine/base.py
View File

@ -241,7 +241,7 @@ class BaseTaskFlowActionContainer(flow_task.Task):
action_plan = objects.ActionPlan.get_by_id( action_plan = objects.ActionPlan.get_by_id(
self.engine.context, self._db_action.action_plan_id, eager=True) self.engine.context, self._db_action.action_plan_id, eager=True)
# NOTE: check if revert cause by cancel action plan or # NOTE: check if revert cause by cancel action plan or
# some other exception occured during action plan execution # some other exception occurred during action plan execution
# if due to some other exception keep the flow intact. # if due to some other exception keep the flow intact.
if action_plan.state not in CANCEL_STATE: if action_plan.state not in CANCEL_STATE:
self.do_revert() self.do_revert()

2
watcher/applier/workflow_engine/default.py
View File

@ -45,7 +45,7 @@ class DefaultWorkFlowEngine(base.BaseWorkFlowEngine):
# (or whether the execution of v should be ignored, # (or whether the execution of v should be ignored,
# and therefore not executed). It is expected to take as single # and therefore not executed). It is expected to take as single
# keyword argument history which will be the execution results of # keyword argument history which will be the execution results of
# all u decideable links that have v as a target. It is expected # all u decidable links that have v as a target. It is expected
# to return a single boolean # to return a single boolean
# (True to allow v execution or False to not). # (True to allow v execution or False to not).
return True return True

4
watcher/common/nova_helper.py
View File

@ -528,10 +528,10 @@ class NovaHelper(object):
instance_host = getattr(instance, 'OS-EXT-SRV-ATTR:host') instance_host = getattr(instance, 'OS-EXT-SRV-ATTR:host')
instance_status = getattr(instance, 'status') instance_status = getattr(instance, 'status')
# Abort live migration successfull, action is cancelled # Abort live migration successful, action is cancelled
if instance_host == source and instance_status == 'ACTIVE': if instance_host == source and instance_status == 'ACTIVE':
return True return True
# Nova Unable to abort live migration, action is succeded # Nova Unable to abort live migration, action is succeeded
elif instance_host == destination and instance_status == 'ACTIVE': elif instance_host == destination and instance_status == 'ACTIVE':
return False return False

2
watcher/decision_engine/model/collector/nova.py
View File

@ -117,7 +117,7 @@ class ModelBuilder(object):
# cpu_id, cpu_node = self.build_cpu_compute_node(base_id, node) # cpu_id, cpu_node = self.build_cpu_compute_node(base_id, node)
# self.add_node(cpu_id, cpu_node) # self.add_node(cpu_id, cpu_node)
# # Connect the base compute node to the dependant nodes. # # Connect the base compute node to the dependent nodes.
# self.add_edges_from([(base_id, disk_id), (base_id, mem_id), # self.add_edges_from([(base_id, disk_id), (base_id, mem_id),
# (base_id, cpu_id), (base_id, net_id)], # (base_id, cpu_id), (base_id, net_id)],
# label="contains") # label="contains")