Fix active_provision quota check for infra VM request with invalid vm_template. #17158
Conversation
|
@miq-bot add_label bug |
| end | ||
|
|
||
| def infra_storage(request) | ||
| if request.respond_to?(:vm_template) && request.vm_template.present? |
There was a problem hiding this comment.
You can use request.try(:vm_template).present?
tinaafitz
force-pushed
the
fix_quota_invalid_template
branch
from
5f558bd to
786acfa
Compare
| end | ||
|
|
||
| def infra_storage(request) | ||
| if request.try(:vm_template).present? |
There was a problem hiding this comment.
Looking into this more vm_template is just an alias for source app/models/miq_provision_request.rb#L2 which is the same problem we have seen on Service Requests when the Service Template has been removed.
It would be better if we could remove all requests that do not have a valid source anymore instead of dealing with it at this lower level.
| end | ||
| end | ||
|
|
||
| def infra_storage(request) |
There was a problem hiding this comment.
also, could you use verb names for methods that do stuff rather than nouns.
(sorry a nit but makes a difference for future developers)
tinaafitz
force-pushed
the
fix_quota_invalid_template
branch
from
786acfa to
36f688d
Compare
tinaafitz
force-pushed
the
fix_quota_invalid_template
branch
from
36f688d to
0fa6f8b
Compare
|
Checked commit tinaafitz@0fa6f8b with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0 |
|
@kbrock Thanks for you help on this one. 👍 |
Fix active_provision quota check for infra VM request with invalid vm_template. (cherry picked from commit 9002fc7) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1559550
|
Gaprindashvili backport details: |
Fix active_provision quota check for infra VM request with invalid vm_template. (cherry picked from commit 9002fc7) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1559551
|
Fine backport details: |
…mplate Fix active_provision quota check for infra VM request with invalid vm_template. (cherry picked from commit 9002fc7) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1559551
|
|
||
| it "invalid vm_template does not raise error" do | ||
| create_requests | ||
| MiqRequest.first.update_attributes(:vm_template => nil) |
There was a problem hiding this comment.
The first request will now have no source (aliased to the template), which we have a presence validation on.
Quota uses 'active' MiqRequests in its calculations for active provisions. Previously, quota used the MiqQueue entries to calculate active provisions. The MiqRequest approach is much more accurate, but is susceptible to old and/or invalid MiqRequests that appear to be 'active'.
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1554989
Check for valid request.vm_template for VM infra provisioned storage calculations to avoid the following error caused by an invalid MIqRequest.
task_id([miq_provision_6000000002384]) MiqAeServiceModelBase.ar_method raised: : <undefined method
provisioned_storage' for nil:NilClass [----] E, [2018-03-13T05:06:49.201944 #19065:d0efbc] ERROR -- : Q-task_id([miq_provision_6000000002384]) <AutomationEngine> /var/www/miq/vmdb/app/models/mixins/miq_provision_quota_mixin.rb:378:instorage'[----] E, [2018-03-13T05:06:49.204481 #19065:6749c70] ERROR -- : Q-task_id([miq_provision_6000000002384]) The following error occurred during method evaluation:
[----] E, [2018-03-13T05:06:49.205527 #19065:6749c70] ERROR -- : Q-task_id([miq_provision_6000000002384]) NoMethodError: undefined method `provisioned_storage' for nil:NilClass
[----] E, [2018-03-13T05:06:49.206780 #19065:6749c70] ERROR -- : Q-task_id([miq_provision_6000000002384]) (druby://127.0.0.1:34153) /var/www/miq/vmdb/app/models/mixins/miq_provis