Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Increase Timeouts and Worker Memory for Azure SSA #16016

Merged
merged 1 commit into from
Sep 22, 2017
Merged

Increase Timeouts and Worker Memory for Azure SSA #16016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/models/job.rb
View file
Open in desktop
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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as below.

end
timeout_adjustment
end
Expand Down
3 changes: 3 additions & 0 deletions app/models/miq_server/server_smart_proxy.rb
View file
Open in desktop
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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the future, we should probably have these classes implement a timeout function so we can just ask the target what it's timeout should be.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup I said something to that effect in the description of the PR.

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
View file
Open in desktop
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