stackforge-attic/murano-conductor
Code Issues Proposed changes

Merge "Special XML tag to format the Agent exceptions"

Browse Source
This commit is contained in:
Jenkins 2013-09-17 10:53:30 +00:00 committed by Gerrit Code Review
commit 355fe9aae1
8 changed files with 62 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
data/workflows/AD.xml
View File

@ -42,7 +42,7 @@
<failure> <failure>
<report entity="unit" level="error"> <report entity="unit" level="error">
<parameter name="id"><select path="id"/></parameter> <parameter name="id"><select path="id"/></parameter>
<parameter name="text">Unable to deploy instance <select path="state.hostname"/> (<select path="name"/>) due to <select source="exception" path="message" default="unknown Heat error"/> </parameter> <parameter name="text">Unable to deploy instance <select path="state.hostname"/> (<select path="name"/>) due to <format-error error="exception"/></parameter>
</report> </report>
<stop/> <stop/>
</failure> </failure>
@ -73,7 +73,7 @@
<failure> <failure>
<report entity="unit" level="warning"> <report entity="unit" level="warning">
<parameter name="id"><select path="id"/></parameter> <parameter name="id"><select path="id"/></parameter>
<parameter name="text">Unable to set admin password on unit <select path="state.hostname"/> (<select path="name"/>) due to <select source="exception" path="0.messages.0" default="unknown Agent error"/> </parameter> <parameter name="text">Unable to set admin password on unit <select path="state.hostname"/> (<select path="name"/>) due to <format-error error="exception"/></parameter>
</report> </report>
<mute/> <mute/>
</failure> </failure>
@ -104,7 +104,7 @@
<failure> <failure>
<report entity="unit" level="error"> <report entity="unit" level="error">
<parameter name="id"><select path="id"/></parameter> <parameter name="id"><select path="id"/></parameter>
<parameter name="text">Unable to set domain administrator password on unit <select path="state.hostname"/> (<select path="name"/>) due to <select source="exception" path="0.messages.0" default="unknown Agent error"/> </parameter> <parameter name="text">Unable to set domain administrator password on unit <select path="state.hostname"/> (<select path="name"/>) due to <format-error error="exception"/></parameter>
</report> </report>
<stop/> <stop/>
</failure> </failure>
@ -144,7 +144,7 @@
<failure> <failure>
<report entity="unit" level="error"> <report entity="unit" level="error">
<parameter name="id"><select path="id"/></parameter> <parameter name="id"><select path="id"/></parameter>
<parameter name="text">Unable to create a Primary DC on unit <select path="state.hostname"/> (<select path="name"/>) due to <select source="exception" path="0.messages.0" default="unknown Agent error"/> </parameter> <parameter name="text">Unable to create a Primary DC on unit <select path="state.hostname"/> (<select path="name"/>) due to <format-error error="exception"/></parameter>
</report> </report>
<stop/> <stop/>
</failure> </failure>
@ -168,7 +168,7 @@
<failure> <failure>
<report entity="unit" level="error"> <report entity="unit" level="error">
<parameter name="id"><select path="id"/></parameter> <parameter name="id"><select path="id"/></parameter>
<parameter name="text">Unable assign DNS IP on unit <select path="state.hostname"/> (<select path="name"/>) due to <select source="exception" path="0.messages.0" default="unknown Agent error"/> </parameter> <parameter name="text">Unable assign DNS IP on unit <select path="state.hostname"/> (<select path="name"/>) due to <format-error error="exception"/></parameter>
</report> </report>
<stop/> <stop/>
</failure> </failure>
@ -202,7 +202,7 @@
<failure> <failure>
<report entity="unit" level="error"> <report entity="unit" level="error">
<parameter name="id"><select path="id"/></parameter> <parameter name="id"><select path="id"/></parameter>
<parameter name="text">Unit <select path="state.hostname" source="unit"/> (<select path="name" source="unit"/>) was unable to leave the domain due to <select source="exception" path="0.messages.0" default="unknown Agent error"/> </parameter> <parameter name="text">Unit <select path="state.hostname" source="unit"/> (<select path="name" source="unit"/>) was unable to leave the domain due to <format-error error="exception"/></parameter>
</report> </report>
<stop/> <stop/>
</failure> </failure>
@ -259,7 +259,7 @@
<failure> <failure>
<report entity="unit" level="error"> <report entity="unit" level="error">
<parameter name="id"><select path="id"/></parameter> <parameter name="id"><select path="id"/></parameter>
<parameter name="text">Unit <select path="state.hostname" source="unit"/> (<select path="name" source="unit"/>) was unable to join the domain due to <select source="exception" path="0.messages.0" default="unknown Agent error"/> </parameter> <parameter name="text">Unit <select path="state.hostname" source="unit"/> (<select path="name" source="unit"/>) was unable to join the domain due to <format-error error="exception"/></parameter>
</report> </report>
<stop/> <stop/>
</failure> </failure>

12
data/workflows/AspNetApps.xml
View File

@ -41,7 +41,7 @@
<failure> <failure>
<report entity="unit" level="error"> <report entity="unit" level="error">
<parameter name="id"><select path="id"/></parameter> <parameter name="id"><select path="id"/></parameter>
<parameter name="text">Unable to deploy instance <select path="state.hostname"/> (<select path="name"/>) due to <select source="exception" path="message" default="unknown Heat error"/> </parameter> <parameter name="text">Unable to deploy instance <select path="state.hostname"/> (<select path="name"/>) due to <format-error error="exception"/></parameter>
</report> </report>
<stop/> <stop/>
</failure> </failure>
@ -65,7 +65,7 @@
<failure> <failure>
<report entity="unit" level="error"> <report entity="unit" level="error">
<parameter name="id"><select path="id"/></parameter> <parameter name="id"><select path="id"/></parameter>
<parameter name="text">Unable to create a Server Farm load balancer on unit <select path="state.hostname"/> (<select path="name"/>) due to <select source="exception" path="message" default="unknown Heat error"/> </parameter> <parameter name="text">Unable to create a Server Farm load balancer on unit <select path="state.hostname"/> (<select path="name"/>) due to <format-error error="exception"/></parameter>
</report> </report>
<stop/> <stop/>
</failure> </failure>
@ -96,7 +96,7 @@
<failure> <failure>
<report entity="unit" level="warning"> <report entity="unit" level="warning">
<parameter name="id"><select path="id"/></parameter> <parameter name="id"><select path="id"/></parameter>
<parameter name="text">Unable to set admin password on unit <select path="state.hostname"/> (<select path="name"/>) due to <select source="exception" path="0.messages.0" default="unknown Agent error"/> </parameter> <parameter name="text">Unable to set admin password on unit <select path="state.hostname"/> (<select path="name"/>) <format-error error="exception"/></parameter>
</report> </report>
<mute/> <mute/>
</failure> </failure>
@ -127,7 +127,7 @@
<failure> <failure>
<report entity="unit" level="error"> <report entity="unit" level="error">
<parameter name="id"><select path="id"/></parameter> <parameter name="id"><select path="id"/></parameter>
<parameter name="text">Unable to install IIS on <select path="state.hostname"/> (<select path="name"/>) due to <select source="exception" path="0.messages.0" default="unknown Agent error"/> </parameter> <parameter name="text">Unable to install IIS on <select path="state.hostname"/> (<select path="name"/>) <format-error error="exception"/></parameter>
</report> </report>
<stop/> <stop/>
</failure> </failure>
@ -164,11 +164,11 @@
<failure> <failure>
<report entity="unit" level="error"> <report entity="unit" level="error">
<parameter name="id"><select path="id"/></parameter> <parameter name="id"><select path="id"/></parameter>
<parameter name="text">Unable to deploy WebApp on <select path="state.hostname"/> (<select path="name"/>) due to <select source="exception" path="0.messages.0" default="unknown Agent error"/> </parameter> <parameter name="text">Unable to deploy WebApp on <select path="state.hostname"/> (<select path="name"/>) <format-error error="exception"/></parameter>
</report> </report>
<stop/> <stop/>
</failure> </failure>
</send-command> </send-command>
</rule> </rule>
</workflow> </workflow>

2
data/workflows/ExternalAD.xml.example
View File

@ -85,7 +85,7 @@
<failure> <failure>
<report entity="unit" level="error"> <report entity="unit" level="error">
<parameter name="id"><select path="id"/></parameter> <parameter name="id"><select path="id"/></parameter>
<parameter name="text">Unit <select path="state.hostname"/> (<select path="name"/>) was unable to join the domain due to <select source="exception" path="0.messages.0" default="unknown Agent error"/> </parameter> <parameter name="text">Unit <select path="state.hostname"/> (<select path="name"/>) was unable to join the domain due to <format-error error="exception"/></parameter>
</report> </report>
<stop/> <stop/>
</failure> </failure>

18
data/workflows/MsSqlCluster.xml
View File

@ -42,7 +42,7 @@
<failure> <failure>
<report entity="unit" level="error"> <report entity="unit" level="error">
<parameter name="id"><select path="id"/></parameter> <parameter name="id"><select path="id"/></parameter>
<parameter name="text">Unable to deploy instance <select path="state.hostname"/> (<select path="name"/>) due to <select source="exception" path="message" default="unknown Heat error"/> </parameter> <parameter name="text">Unable to deploy instance <select path="state.hostname"/> (<select path="name"/>) due to <format-error error="exception"/></parameter>
</report> </report>
<stop/> <stop/>
</failure> </failure>
@ -112,7 +112,7 @@
<failure> <failure>
<report entity="unit" level="warning"> <report entity="unit" level="warning">
<parameter name="id"><select path="id"/></parameter> <parameter name="id"><select path="id"/></parameter>
<parameter name="text">Unable to set admin password on unit <select path="state.hostname"/> (<select path="name"/>) due to <select source="exception" path="0.messages.0" default="unknown Agent error"/> </parameter> <parameter name="text">Unable to set admin password on unit <select path="state.hostname"/> (<select path="name"/>) due to <format-error error="exception"/></parameter>
</report> </report>
<mute/> <mute/>
</failure> </failure>
@ -151,7 +151,7 @@
<failure> <failure>
<report entity="unit" level="error"> <report entity="unit" level="error">
<parameter name="id"><select path="id"/></parameter> <parameter name="id"><select path="id"/></parameter>
<parameter name="text">Unable to install prerequisites on unit <select path="state.hostname"/> (<select path="name"/>) due to <select source="exception" path="0.messages.0" default="unknown Agent error"/> </parameter> <parameter name="text">Unable to install prerequisites on unit <select path="state.hostname"/> (<select path="name"/>) due to <format-error error="exception"/></parameter>
</report> </report>
<stop/> <stop/>
</failure> </failure>
@ -202,7 +202,7 @@
<failure> <failure>
<report entity="Service" level="error"> <report entity="Service" level="error">
<parameter name="id"><select path="::id"/></parameter> <parameter name="id"><select path="::id"/></parameter>
<parameter name="text">Unable to create failover cluster for SQL Server Service <select path="::name"/> due to <select source="exception" path="0.messages.0" default="unknown Agent error"/> </parameter> <parameter name="text">Unable to create failover cluster for SQL Server Service <select path="::name"/> due to <format-error error="exception"/></parameter>
</report> </report>
<stop/> <stop/>
</failure> </failure>
@ -235,7 +235,7 @@
<failure> <failure>
<report entity="service" level="error"> <report entity="service" level="error">
<parameter name="id"><select path="::id"/></parameter> <parameter name="id"><select path="::id"/></parameter>
<parameter name="text">Unable to configure the environment for AlwaysOn Availability Group of SQL Server Cluster service (<select path="::name"/>) due to <select source="exception" path="0.messages.0" default="unknown Agent error"/> </parameter> <parameter name="text">Unable to configure the environment for AlwaysOn Availability Group of SQL Server Cluster service (<select path="::name"/>) due to <format-error error="exception"/></parameter>
</report> </report>
<stop/> <stop/>
</failure> </failure>
@ -280,7 +280,7 @@
<failure> <failure>
<report entity="unit" level="error"> <report entity="unit" level="error">
<parameter name="id"><select path="id"/></parameter> <parameter name="id"><select path="id"/></parameter>
<parameter name="text">Unable to install SQL Server on unit <select path="state.hostname"/> (<select path="name"/>) due to <select source="exception" path="0.messages.0" default="unknown Agent error"/> </parameter> <parameter name="text">Unable to install SQL Server on unit <select path="state.hostname"/> (<select path="name"/>) due to <format-error error="exception"/></parameter>
</report> </report>
<stop/> <stop/>
</failure> </failure>
@ -325,7 +325,7 @@
<failure> <failure>
<report entity="unit" level="error"> <report entity="unit" level="error">
<parameter name="id"><select path="id"/></parameter> <parameter name="id"><select path="id"/></parameter>
<parameter name="text">Unable to initialize AlwaysOn AG for <select path="state.hostname"/> (<select path="name"/>) due to <select source="exception" path="0.messages.0" default="unknown Agent error"/> </parameter> <parameter name="text">Unable to initialize AlwaysOn AG for <select path="state.hostname"/> (<select path="name"/>) due to <format-error error="exception"/></parameter>
</report> </report>
<stop/> <stop/>
</failure> </failure>
@ -385,7 +385,7 @@
<failure> <failure>
<report entity="unit" level="error"> <report entity="unit" level="error">
<parameter name="id"><select path="id"/></parameter> <parameter name="id"><select path="id"/></parameter>
<parameter name="text">Unable to initialize primary replica for SQL Server AG for <select path="state.hostname"/> (<select path="name"/>) due to <select source="exception" path="0.messages.0" default="unknown Agent error"/> </parameter> <parameter name="text">Unable to initialize primary replica for SQL Server AG for <select path="state.hostname"/> (<select path="name"/>) due to <format-error error="exception"/></parameter>
</report> </report>
<stop/> <stop/>
</failure> </failure>
@ -430,7 +430,7 @@
<failure> <failure>
<report entity="unit" level="error"> <report entity="unit" level="error">
<parameter name="id"><select path="id"/></parameter> <parameter name="id"><select path="id"/></parameter>
<parameter name="text">Unable to initialize secondary replica for SQL Server AG for <select path="state.hostname"/> (<select path="name"/>) due to <select source="exception" path="0.messages.0" default="unknown Agent error"/> </parameter> <parameter name="text">Unable to initialize secondary replica for SQL Server AG for <select path="state.hostname"/> (<select path="name"/>) due to <format-error error="exception"/></parameter>
</report> </report>
<stop/> <stop/>
</failure> </failure>

8
data/workflows/MsSqlServer.xml
View File

@ -41,7 +41,7 @@
<failure> <failure>
<report entity="unit" level="error"> <report entity="unit" level="error">
<parameter name="id"><select path="id"/></parameter> <parameter name="id"><select path="id"/></parameter>
<parameter name="text">Unable to deploy instance <select path="state.hostname"/> (<select path="name"/>) due to <select source="exception" path="message" default="unknown Heat error"/> </parameter> <parameter name="text">Unable to deploy instance <select path="state.hostname"/> (<select path="name"/>) due to <format-error error="exception"/></parameter>
</report> </report>
<stop/> <stop/>
</failure> </failure>
@ -97,7 +97,7 @@
<failure> <failure>
<report entity="unit" level="warning"> <report entity="unit" level="warning">
<parameter name="id"><select path="id"/></parameter> <parameter name="id"><select path="id"/></parameter>
<parameter name="text">Unable to set admin password on unit <select path="state.hostname"/> (<select path="name"/>) due to <select source="exception" path="0.messages.0" default="unknown Agent error"/> </parameter> <parameter name="text">Unable to set admin password on unit <select path="state.hostname"/> (<select path="name"/>) due to <format-error error="exception"/></parameter>
</report> </report>
<mute/> <mute/>
</failure> </failure>
@ -139,11 +139,11 @@
<failure> <failure>
<report entity="unit" level="error"> <report entity="unit" level="error">
<parameter name="id"><select path="id"/></parameter> <parameter name="id"><select path="id"/></parameter>
<parameter name="text">Unable to install MS SQL Server on unit <select path="state.hostname"/> (<select path="name"/>) due to <select source="exception" path="0.messages.0" default="unknown Agent error"/> </parameter> <parameter name="text">Unable to install MS SQL Server on unit <select path="state.hostname"/> (<select path="name"/>) due to <format-error error="exception"/></parameter>
</report> </report>
<stop/> <stop/>
</failure> </failure>
</send-command> </send-command>
</rule> </rule>
</workflow> </workflow>

3
muranoconductor/cloud_formation.py
View File

@ -18,6 +18,7 @@ import config
import random import random
import string import string
import time import time
import datetime
import xml_code_engine import xml_code_engine
from openstack.common import log as logging from openstack.common import log as logging
@ -38,7 +39,7 @@ def update_cf_stack(engine, context, body, template, result=None, error=None,
context[error] = { context[error] = {
'message': getattr(error_result, 'message', None), 'message': getattr(error_result, 'message', None),
'strerror': getattr(error_result, 'strerror', None), 'strerror': getattr(error_result, 'strerror', None),
'timestamp': time.time() 'timestamp': datetime.datetime.now().isoformat()
} }
failure_handler = body.find('failure') failure_handler = body.find('failure')
if failure_handler is not None: if failure_handler is not None:

42
muranoconductor/windows_agent.py
View File

@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import os.path import os.path
import datetime
from muranoconductor.commands.windows_agent import AgentTimeoutException from muranoconductor.commands.windows_agent import AgentTimeoutException
from muranoconductor.commands.windows_agent import UnhandledAgentException from muranoconductor.commands.windows_agent import UnhandledAgentException
@ -42,26 +43,20 @@ def send_command(engine, context, body, template, service, unit,
errors = [] errors = []
if isinstance(result_value, AgentTimeoutException): if isinstance(result_value, AgentTimeoutException):
errors.append({ errors.append({
'type': "timeout", 'source': 'timeout',
'messages': [result_value.message], 'message': result_value.message,
'timeout': result_value.timeout 'timeout': result_value.timeout,
'timestamp': datetime.datetime.now().isoformat()
}) })
else: else:
if result_value['IsException']: if result_value['IsException']:
msg = "A general exception has occurred in the Agent: " + \ errors.append(dict(_get_exception_info(
result_value['Result'] result_value.get('Result', [])), source='execution_plan'))
errors.append({
'type': "general",
'messages': [msg],
})
else: else:
for res in result_value['Result']: for res in result_value.get('Result', []):
if res['IsException']: if res['IsException']:
errors.append({ errors.append(dict(_get_exception_info(
'type': 'inner', res.get('Result', [])), source='command'))
'messages': res['Result']
})
else: else:
ok.append(res) ok.append(res)
@ -77,8 +72,7 @@ def send_command(engine, context, body, template, service, unit,
failure_handler = body.find('failure') failure_handler = body.find('failure')
if failure_handler is not None: if failure_handler is not None:
log.warning( log.warning(
"Handling errors ({0}) in failure block".format(errors), 'Handling errors ({0}) in failure block'.format(errors))
exc_info=True)
engine.evaluate_content(failure_handler, context) engine.evaluate_content(failure_handler, context)
else: else:
log.error("No failure block found for errors", exc_info=True) log.error("No failure block found for errors", exc_info=True)
@ -92,4 +86,18 @@ def send_command(engine, context, body, template, service, unit,
unit=unit, service=service, callback=callback, timeout=timeout) unit=unit, service=service, callback=callback, timeout=timeout)
def _get_array_item(array, index):
return array[index] if len(array) > index else None
def _get_exception_info(data):
data = data or []
return {
'type': _get_array_item(data, 0),
'message': _get_array_item(data, 1),
'command': _get_array_item(data, 2),
'details': _get_array_item(data, 3),
'timestamp': datetime.datetime.now().isoformat()
}
xml_code_engine.XmlCodeEngine.register_function(send_command, "send-command") xml_code_engine.XmlCodeEngine.register_function(send_command, "send-command")

8
muranoconductor/workflow.py
View File

@ -14,6 +14,7 @@
# limitations under the License. # limitations under the License.
import logging import logging
import anyjson
import jsonpath import jsonpath
import re import re
import types import types
@ -283,6 +284,10 @@ class Workflow(object):
context['/dataSource']['temp']['_stop_requested'] = True context['/dataSource']['temp']['_stop_requested'] = True
def format_error(context, error, **kwargs):
error_data = context[error]
return anyjson.dumps(error_data)
xml_code_engine.XmlCodeEngine.register_function( xml_code_engine.XmlCodeEngine.register_function(
Workflow._rule_func, 'rule') Workflow._rule_func, 'rule')
@ -301,6 +306,9 @@ xml_code_engine.XmlCodeEngine.register_function(
xml_code_engine.XmlCodeEngine.register_function( xml_code_engine.XmlCodeEngine.register_function(
Workflow._select_all_func, 'select-all') Workflow._select_all_func, 'select-all')
xml_code_engine.XmlCodeEngine.register_function(
format_error, "format-error")
xml_code_engine.XmlCodeEngine.register_function( xml_code_engine.XmlCodeEngine.register_function(
Workflow._select_single_func, 'select-single') Workflow._select_single_func, 'select-single')