From ea9aa51ebc953a39797b124f80b4cedb9bdbdf3c Mon Sep 17 00:00:00 2001 From: Adam Harwell Date: Wed, 9 May 2018 11:17:58 -0700 Subject: [PATCH] Slightly reorder member flows The pool should be marked active before the LB/Listener, because the LB status is what locks the LB. Everything should be finished before that status is unlocked. Change-Id: I4c9916aff1b1f73f183ac98faee49a074ba28c90 --- octavia/controller/worker/flows/member_flows.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/octavia/controller/worker/flows/member_flows.py b/octavia/controller/worker/flows/member_flows.py index 00b23f7637..1cd5f0b84e 100644 --- a/octavia/controller/worker/flows/member_flows.py +++ b/octavia/controller/worker/flows/member_flows.py @@ -51,12 +51,12 @@ class MemberFlows(object): requires=(constants.LOADBALANCER, constants.LISTENERS))) create_member_flow.add(database_tasks.MarkMemberActiveInDB( requires=constants.MEMBER)) + create_member_flow.add(database_tasks.MarkPoolActiveInDB( + requires=constants.POOL)) create_member_flow.add(database_tasks. MarkLBAndListenersActiveInDB( requires=(constants.LOADBALANCER, constants.LISTENERS))) - create_member_flow.add(database_tasks.MarkPoolActiveInDB( - requires=constants.POOL)) return create_member_flow @@ -82,12 +82,12 @@ class MemberFlows(object): requires=[constants.LOADBALANCER, constants.LISTENERS])) delete_member_flow.add(database_tasks.DecrementMemberQuota( requires=constants.MEMBER)) + delete_member_flow.add(database_tasks.MarkPoolActiveInDB( + requires=constants.POOL)) delete_member_flow.add(database_tasks. MarkLBAndListenersActiveInDB( requires=[constants.LOADBALANCER, constants.LISTENERS])) - delete_member_flow.add(database_tasks.MarkPoolActiveInDB( - requires=constants.POOL)) return delete_member_flow