Add OrchestrationTemplateRunner to queue up orchestration stack deployment #18374

lfu · 2019-01-18T21:53:08Z

Provider specific provisions executed as part of a service provision are supposed to be queued to the provider zone.

~~Blocks ManageIQ/manageiq-content#500.~~

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1656351

@miq-bot assign @gmcculloug
@miq-bot add_label bug, gaprindashvili/yes, hammer/yes, services, orchestration

tinaafitz · 2019-01-21T20:06:31Z

@bzwei @mkanoor Please review.

bzwei · 2019-01-21T21:53:47Z

app/models/service_orchestration.rb

+    }
+    MiqTask.generic_action_with_callback(task_opts, queue_opts)
+  end
+
  def update_orchestration_stack


Similarly we should have a queue version for update too. It can be either included here or with a separate PR.

bzwei · 2019-01-21T21:55:22Z

app/models/service_orchestration.rb

@@ -35,6 +35,23 @@ def deploy_orchestration_stack
    save_create_options
  end

+  def deploy_orchestration_stack_queue
+    userid ||= User.current_user.try(:userid)


Is userid a local variable? || will be no effect.

miq-bot · 2019-02-12T14:52:03Z

This pull request is not mergeable. Please rebase and repush.

lfu · 2019-02-25T16:05:15Z

@bzwei @mkanoor Please review.

bzwei · 2019-02-25T21:45:56Z

The goal of this refactoring is that every promise ServiceOrchestration has made does not compromise so that the automate can continue to work.
@lfu Please rework ServiceOrchestration to fulfill the goal.

bzwei · 2019-02-28T20:26:42Z

app/models/manageiq/providers/cloud_manager/orchestration_template_runner.rb

+    end
+  end
+
+  def service


Try our best to decouple modules. Avoid service in this class. The job options should contain only parameters necessary to deploy a stack. For update the options can include stack_id too.

bzwei · 2019-02-28T20:28:14Z

app/models/manageiq/providers/cloud_manager/orchestration_template_runner.rb

+    self.name = "#{name}, Orchestration Stack ID: #{@orchestration_stack.id}"
+    miq_task.update_attributes(:name => name)
+    save!
+    service.add_resource(@orchestration_stack)


move this line back to service class. You can add orchestraiton_stack_id to job's options so that the service can read back the stack.

bzwei · 2019-02-28T20:28:29Z

app/models/manageiq/providers/cloud_manager/orchestration_template_runner.rb

+    my_signal(minimize_indirect, :post_stack_run, err.message, 'error')
+  ensure
+    # create options may never be saved before unless they were overridden
+    service.save_create_options


move back to service class

bzwei · 2019-02-28T20:36:10Z

app/models/manageiq/providers/cloud_manager/orchestration_template_runner.rb

+    time = Time.zone.now
+    update_attributes(:started_on => time)
+    miq_task.update_attributes(:started_on => time)
+    my_signal(false, :deploy_orchestration_stack)


increase the queue priority to high

lfu · 2019-03-04T22:25:48Z

@bzwei Updated.

bzwei · 2019-03-04T22:15:27Z

app/models/service_orchestration.rb

-    creation_options = stack_options
-    @orchestration_stack = ManageIQ::Providers::CloudManager::OrchestrationStack.create_stack(
-      orchestration_manager, stack_name, orchestration_template, creation_options
+    job_options = {


why not place all options together without a merge?

stack_options might change orchestration_manager and orchestration_template.

It is hard to understand. In this case, we can do

deploy_stack_options = stack_options job_options = { :create_options => deploy_stack_options, :orchestration_manager_id => orchestration_manager.id, ... }

bzwei · 2019-03-04T22:19:20Z

app/models/service_orchestration.rb

@@ -47,6 +68,8 @@ def orchestration_stack
    if @orchestration_stack.nil? && options.fetch_path(:orchestration_stack, 'ems_id')
      @orchestration_stack = OrchestrationStack.new(options[:orchestration_stack])
    end
+
+    @orchestration_stack ||= orchestration_runner_job.orchestration_stack if orchestration_runner_job


@orchestration_stack ||= orchestration_runner_job.try(:orchestration_stack)

bzwei · 2019-03-04T22:40:48Z

app/models/service_orchestration.rb

+  end
+
+  def wait_on_orchestration_stack
+    while orchestration_stack.blank?


You don't need to modify orchestration_stack method (for performance reason). Change this method to

while deploy_stack_job.orchestration_stack.blank? ... end @orchestration_stack = deploy_stack_job.orchestration_stack

This is the only place you need to get the stack from the runner job.

bzwei · 2019-03-04T22:45:33Z

app/models/service_orchestration.rb

-      orchestration_manager, stack_name, orchestration_template, creation_options
+    job_options = {
+      :create_options => stack_options,
+      :priority       => MiqQueue::HIGH_PRIORITY,


I don't think we need to set priority always to high. We need high priority to start the job because the current thread is waiting on it. Once it starts, the priority should reduce to normal.

bzwei · 2019-03-05T20:49:23Z

app/models/service_orchestration.rb

+  end
+
+  def wait_on_orchestration_stack
+    while orchestration_runner_job.orchestration_stack.blank?


clearly this only applies to deploy_stack_job. update_stack_job does not need to wait on the stack.

bzwei · 2019-03-05T20:54:05Z

app/models/service_orchestration.rb

-    creation_options = stack_options
-    @orchestration_stack = ManageIQ::Providers::CloudManager::OrchestrationStack.create_stack(
-      orchestration_manager, stack_name, orchestration_template, creation_options
+    job_options = {


It is hard to understand. In this case, we can do

deploy_stack_options = stack_options job_options = { :create_options => deploy_stack_options, :orchestration_manager_id => orchestration_manager.id, ... }

bzwei · 2019-03-05T21:19:53Z

app/models/service_orchestration.rb

+      # Code running with Rails QueryCache enabled,
+      # need to disable caching for the reload to see updates.
+      self.class.uncached { reload }
+      orchestration_runner_job.class.uncached { orchestration_runner_job.reload }


deploy_stack_job.class.uncached

bzwei · 2019-03-05T21:20:18Z

app/models/service_orchestration.rb

+      self.class.uncached { reload }
+      orchestration_runner_job.class.uncached { orchestration_runner_job.reload }
+    end
+    @orchestration_stack = orchestration_runner_job.orchestration_stack


deploy_stack_job.orchestration_stack

All provider calls should be placed in the queue with the correct provider zone. Add OrchestrationTemplateRunner to handle the provider calls via MiqQueue. https://bugzilla.redhat.com/show_bug.cgi?id=1656351

https://bugzilla.redhat.com/show_bug.cgi?id=1656351

miq-bot · 2019-03-05T21:33:24Z

Checked commits lfu/manageiq@18f6f21~...08ab7f4 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0
3 files checked, 0 offenses detected
Everything looks fine. 🏆

Add OrchestrationTemplateRunner to queue up orchestration stack deployment (cherry picked from commit bb4f8bf) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1686891

simaishi · 2019-03-08T15:55:25Z

Hammer backport details:

$ git log -1
commit 455d2702937ea597b40cba7a791096370eea4e9c
Author: Greg McCullough <gmccullo@redhat.com>
Date:   Tue Mar 5 18:10:25 2019 -0500

    Merge pull request #18374 from lfu/service_orchestration_region_1656351
    
    Add OrchestrationTemplateRunner to queue up orchestration stack deployment
    
    (cherry picked from commit bb4f8bf36b54ebd31823704426ecdaccee2fdbee)
    
    Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1686891

miq-bot assigned gmcculloug Jan 18, 2019

miq-bot added bug gaprindashvili/yes lifecycle/orchestration lifecycle/services labels Jan 18, 2019

This was referenced Jan 18, 2019

[WIP] Expose deploy_orchestration_stack_queue to service model. ManageIQ/manageiq-automation_engine#289

Closed

Use OrchestrationTemplateRunner to queue orchestration stack deployment. ManageIQ/manageiq-content#500

Closed

bzwei reviewed Jan 21, 2019

View reviewed changes

lfu force-pushed the service_orchestration_region_1656351 branch from e48c5a1 to c117a9d Compare January 22, 2019 16:14

lfu changed the title ~~Add method deploy_orchestration_stack_queue.~~ [WIP] Add method deploy_orchestration_stack_queue. Jan 24, 2019

miq-bot added the wip label Jan 24, 2019

lfu force-pushed the service_orchestration_region_1656351 branch from c117a9d to 2178ef8 Compare January 30, 2019 21:59

lfu changed the title ~~[WIP] Add method deploy_orchestration_stack_queue.~~ Add OrchestrationTemplateRunner to queue up orchestration stack deployment Jan 30, 2019

lfu force-pushed the service_orchestration_region_1656351 branch from 2178ef8 to ac9505d Compare January 30, 2019 22:07

miq-bot removed the wip label Jan 30, 2019

miq-bot added the unmergeable label Feb 12, 2019

lfu force-pushed the service_orchestration_region_1656351 branch from ac9505d to 5cd8b7d Compare February 18, 2019 16:57

miq-bot removed the unmergeable label Feb 18, 2019

lfu force-pushed the service_orchestration_region_1656351 branch from 5cd8b7d to 7b2fdd5 Compare February 19, 2019 21:59

lfu force-pushed the service_orchestration_region_1656351 branch from 7b2fdd5 to 136b53e Compare February 27, 2019 23:57

bzwei reviewed Feb 28, 2019

View reviewed changes

lfu force-pushed the service_orchestration_region_1656351 branch 2 times, most recently from af1562c to 3735f09 Compare March 4, 2019 21:43

bzwei reviewed Mar 4, 2019

View reviewed changes

lfu force-pushed the service_orchestration_region_1656351 branch 3 times, most recently from c708c20 to 5bbe071 Compare March 5, 2019 20:41

bzwei reviewed Mar 5, 2019

View reviewed changes

lfu force-pushed the service_orchestration_region_1656351 branch from 5bbe071 to d37428f Compare March 5, 2019 21:07

bzwei reviewed Mar 5, 2019

View reviewed changes

lfu added 2 commits March 5, 2019 16:27

Add OrchestrationTemplateRunner.

18f6f21

All provider calls should be placed in the queue with the correct provider zone. Add OrchestrationTemplateRunner to handle the provider calls via MiqQueue. https://bugzilla.redhat.com/show_bug.cgi?id=1656351

Calls OrchestrationTemplateRunner for provider calls.

08ab7f4

https://bugzilla.redhat.com/show_bug.cgi?id=1656351

lfu force-pushed the service_orchestration_region_1656351 branch from d37428f to 08ab7f4 Compare March 5, 2019 21:28

bzwei approved these changes Mar 5, 2019

View reviewed changes

gmcculloug merged commit bb4f8bf into ManageIQ:master Mar 5, 2019

gmcculloug added this to the Sprint 107 Ending Mar 18, 2019 milestone Mar 5, 2019

simaishi added hammer/backported and removed hammer/yes labels Mar 8, 2019

lfu deleted the service_orchestration_region_1656351 branch November 4, 2019 15:22

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add OrchestrationTemplateRunner to queue up orchestration stack deployment #18374

Add OrchestrationTemplateRunner to queue up orchestration stack deployment #18374

lfu commented Jan 18, 2019 •

edited

Loading

tinaafitz commented Jan 21, 2019

bzwei Jan 21, 2019

bzwei Jan 21, 2019

miq-bot commented Feb 12, 2019

lfu commented Feb 25, 2019

bzwei commented Feb 25, 2019

bzwei Feb 28, 2019

bzwei Feb 28, 2019

bzwei Feb 28, 2019

bzwei Feb 28, 2019

lfu commented Mar 4, 2019

bzwei Mar 4, 2019

lfu Mar 5, 2019

bzwei Mar 5, 2019

bzwei Mar 4, 2019

bzwei Mar 4, 2019

bzwei Mar 4, 2019

bzwei Mar 5, 2019

bzwei Mar 5, 2019

bzwei Mar 5, 2019

bzwei Mar 5, 2019

miq-bot commented Mar 5, 2019

simaishi commented Mar 8, 2019

Add OrchestrationTemplateRunner to queue up orchestration stack deployment #18374

Add OrchestrationTemplateRunner to queue up orchestration stack deployment #18374

Conversation

lfu commented Jan 18, 2019 • edited Loading

tinaafitz commented Jan 21, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

miq-bot commented Feb 12, 2019

lfu commented Feb 25, 2019

bzwei commented Feb 25, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lfu commented Mar 4, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

miq-bot commented Mar 5, 2019

simaishi commented Mar 8, 2019

lfu commented Jan 18, 2019 •

edited

Loading