From df6af33b8221c2ebe4401f07b0ccb357414bbfba Mon Sep 17 00:00:00 2001
From: Daniel Clavijo Coca <dclavijo@opennebula.systems>
Date: Thu, 2 Sep 2021 03:58:04 -0500
Subject: [PATCH] B OpenNebula/one#5526: Fix oneflow recover (#1428)
(cherry picked from commit f18fb4cf537e62f8867274dd417c106c3e76d90c)
(cherry picked from commit d87c885795be089a6398a7d9cd5bb5ce791664d4)
---
src/flow/lib/LifeCycleManager.rb | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/flow/lib/LifeCycleManager.rb b/src/flow/lib/LifeCycleManager.rb
index 7670bb6daf..ab667c8324 100644
--- a/src/flow/lib/LifeCycleManager.rb
+++ b/src/flow/lib/LifeCycleManager.rb
@@ -896,18 +896,21 @@ class ServiceLCM
nodes, up = role.recover_scale(service.report_ready?)
if up
- action = :wait_scaleup
+ @event_manager.trigger_action(:wait_scaleup,
+ service.id,
+ client,
+ service.id,
+ name,
+ nodes,
+ service.report_ready?)
else
- action = :wait_scaledown
+ @event_manager.trigger_action(:wait_scaledown,
+ service.id,
+ client,
+ service.id,
+ name,
+ nodes)
end
-
- @event_manager.trigger_action(action,
- service.id,
- client,
- service.id,
- name,
- nodes,
- service.report_ready?)
end
end