Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix to reuse RabbitMQ connection

Browse Source 
Currently RabbitMQ connection gradually increases by CONTINUOUS audit
with auto-trigger option.
This patch fixes watcher to reuse RabbitMQ connection.

Change-Id: I818fc1ce982f67bac08c815821f1ad67f8f3c893
This commit is contained in:
Hidekazu Nakamura
2018-05-10 14:21:23 +09:00
parent 6efffd6d89
commit cdb1975530
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
watcher/api/controllers/v1/action_plan.py
View File

@@ -320,6 +320,7 @@ class ActionPlansController(rest.RestController):
def __init__(self): def __init__(self):
super(ActionPlansController, self).__init__() super(ActionPlansController, self).__init__()
self.applier_client = rpcapi.ApplierAPI()
from_actionsPlans = False from_actionsPlans = False
"""A flag to indicate if the requests to this controller are coming """A flag to indicate if the requests to this controller are coming
@@ -553,9 +554,8 @@ class ActionPlansController(rest.RestController):
a.save() a.save()
if launch_action_plan: if launch_action_plan:
applier_client = rpcapi.ApplierAPI() self.applier_client.launch_action_plan(pecan.request.context,
applier_client.launch_action_plan(pecan.request.context, action_plan.uuid)
action_plan.uuid)
action_plan_to_update = objects.ActionPlan.get_by_uuid( action_plan_to_update = objects.ActionPlan.get_by_uuid(
pecan.request.context, pecan.request.context,
@@ -584,9 +584,8 @@ class ActionPlansController(rest.RestController):
action_plan_to_start['state'] = objects.action_plan.State.PENDING action_plan_to_start['state'] = objects.action_plan.State.PENDING
action_plan_to_start.save() action_plan_to_start.save()
applier_client = rpcapi.ApplierAPI() self.applier_client.launch_action_plan(pecan.request.context,
applier_client.launch_action_plan(pecan.request.context, action_plan_uuid)
action_plan_uuid)
action_plan_to_start = objects.ActionPlan.get_by_uuid( action_plan_to_start = objects.ActionPlan.get_by_uuid(
pecan.request.context, action_plan_uuid) pecan.request.context, action_plan_uuid)

4
watcher/api/controllers/v1/audit.py
View File

@@ -403,6 +403,7 @@ class AuditsController(rest.RestController):
"""REST controller for Audits.""" """REST controller for Audits."""
def __init__(self): def __init__(self):
super(AuditsController, self).__init__() super(AuditsController, self).__init__()
self.dc_client = rpcapi.DecisionEngineAPI()
from_audits = False from_audits = False
"""A flag to indicate if the requests to this controller are coming """A flag to indicate if the requests to this controller are coming
@@ -575,8 +576,7 @@ class AuditsController(rest.RestController):
# trigger decision-engine to run the audit # trigger decision-engine to run the audit
if new_audit.audit_type == objects.audit.AuditType.ONESHOT.value: if new_audit.audit_type == objects.audit.AuditType.ONESHOT.value:
dc_client = rpcapi.DecisionEngineAPI() self.dc_client.trigger_audit(context, new_audit.uuid)
dc_client.trigger_audit(context, new_audit.uuid)
return Audit.convert_with_links(new_audit) return Audit.convert_with_links(new_audit)

6
watcher/decision_engine/audit/base.py
View File

@@ -63,6 +63,7 @@ class AuditHandler(BaseAuditHandler):
self._strategy_context = default_context.DefaultStrategyContext() self._strategy_context = default_context.DefaultStrategyContext()
self._planner_manager = planner_manager.PlannerManager() self._planner_manager = planner_manager.PlannerManager()
self._planner = None self._planner = None
self.applier_client = rpcapi.ApplierAPI()
@property @property
def planner(self): def planner(self):
@@ -125,9 +126,8 @@ class AuditHandler(BaseAuditHandler):
def post_execute(self, audit, solution, request_context): def post_execute(self, audit, solution, request_context):
action_plan = self.do_schedule(request_context, audit, solution) action_plan = self.do_schedule(request_context, audit, solution)
if audit.auto_trigger: if audit.auto_trigger:
applier_client = rpcapi.ApplierAPI() self.applier_client.launch_action_plan(request_context,
applier_client.launch_action_plan(request_context, action_plan.uuid)
action_plan.uuid)
def execute(self, audit, request_context): def execute(self, audit, request_context):
try: try: