Skip to content

Commit

Permalink
Increase Timeouts and Worker Memory for Azure SSA
Browse files Browse the repository at this point in the history
In support of high priority BZ https://bugzilla.redhat.com/show_bug.cgi?id=1488967
we need to increase various timeouts to allow the Azure SSA job to succeed.
1) Increase the Job timeout specific to Azure SSA similar to how it has been
   done for SCVMM previously.
2) Increase the SmartProxyWorker MiqQueue msg_timeout value similar to how it has
   been done for both SCVMM and OpenStack previously.
3) Increase the memory_threshold and restart_interval for all SmartProxyWorker jobs.
   The memory_threshold issue has been seen running SSA on other providers as well as
   Azure so the overall default change here is appropriate.
  • Loading branch information
jerryk55 committed Sep 22, 2017
1 parent 4273cac commit 3b5b283
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
3 changes: 3 additions & 0 deletions app/models/job.rb
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,9 @@ def timeout_adjustment
if target.kind_of?(ManageIQ::Providers::Microsoft::InfraManager::Vm) ||
target.kind_of?(ManageIQ::Providers::Microsoft::InfraManager::Template)
timeout_adjustment = 4
elsif target.kind_of?(ManageIQ::Providers::Azure::CloudManager::Vm) ||
target.kind_of?(ManageIQ::Providers::Azure::CloudManager::Template)
timeout_adjustment = 4
end
timeout_adjustment
end
Expand Down
3 changes: 3 additions & 0 deletions app/models/miq_server/server_smart_proxy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ def queue_call(ost)
if target.kind_of?(ManageIQ::Providers::Openstack::CloudManager::Vm) ||
target.kind_of?(ManageIQ::Providers::Openstack::CloudManager::Template)
timeout_adj = 4
elsif target.kind_of?(ManageIQ::Providers::Azure::CloudManager::Vm) ||
target.kind_of?(ManageIQ::Providers::Azure::CloudManager::Template)
timeout_adj = 4
elsif target.kind_of?(ManageIQ::Providers::Microsoft::InfraManager::Vm) ||
target.kind_of?(ManageIQ::Providers::Microsoft::InfraManager::Template)
timeout_adj = 8
Expand Down
4 changes: 2 additions & 2 deletions config/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1137,9 +1137,9 @@
:nice_delta: 7
:smart_proxy_worker:
:count: 2
:memory_threshold: 600.megabytes
:memory_threshold: 2.gigabytes
:queue_timeout: 20.minutes
:restart_interval: 2.hours
:restart_interval: 6.hours
:schedule_worker:
:container_entities_purge_interval: 1.day
:authentication_check_interval: 1.hour
Expand Down

0 comments on commit 3b5b283

Please sign in to comment.