Separate vm store and datastore smartstate scan supports checks #22738
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
agrare
reviewed
Oct 24, 2023
app/models/vm_scan/dispatcher.rb
Outdated
Comment on lines
249
to
262
| if @vm.requires_storage_for_scan? | ||
| if @vm.storage.nil? | ||
| msg = "Vm [#{@vm.path}] is not located on a storage, aborting job [#{job.guid}]." | ||
| queue_signal(job, {:args => [:abort, msg, "error"]}) | ||
| return [] | ||
| else | ||
| unless @vm.storage.supports?(:smartstate_analysis) | ||
| msg = @vm.storage.unsupported_reason(:smartstate_analysis) | ||
| queue_signal(job, {:args => [:abort, msg, "error"]}) | ||
| return [] | ||
| end | ||
| end | ||
| end | ||
|
|
There was a problem hiding this comment.
So https://github.com/ManageIQ/manageiq-providers-ovirt/pull/653/files#diff-24aea1f97754a89593e8311e8ea2bf2d897a159336d1f1c578d17fbb1964506dR10 (I think rightly) moves the storage type check into the VM's supports?(:smartstate_analysis), we still need to check @vm.supports?(:smartstate_analysis) somewhere? Is this done elsewhere?
nasark
force-pushed
the
separate_datastore_and_vm_store_scans
branch
from
0ceeeac
to
79c082f
Compare
|
@miq-bot add_label quinteros/yes? |
nasark
force-pushed
the
separate_datastore_and_vm_store_scans
branch
from
79c082f
to
c4e086c
Compare
agrare
reviewed
Dec 19, 2023
| @@ -246,18 +246,10 @@ def get_eligible_proxies_for_job(job) | |||
| return [] | |||
| end | |||
|
|
|||
| if @vm.requires_storage_for_scan? | |||
There was a problem hiding this comment.
Follow-up, but I think we can get rid of requires_storage_for_scan? now?
agrare
reviewed
Dec 19, 2023
app/models/storage.rb
Outdated
|
|
||
| supports(:delete) { _("Only storage without VMs and Hosts can be removed") if vms_and_templates.any? || hosts.any? } | ||
|
|
||
| supports_not :smartstate_analysis |
There was a problem hiding this comment.
Don't believe we need explicit supports_not anymore as of #22751
Suggested change
| supports_not :smartstate_analysis |
nasark
force-pushed
the
separate_datastore_and_vm_store_scans
branch
3 times, most recently
from
4538922
to
7ec8278
Compare
miq-bot
pushed a commit
to ManageIQ/manageiq-cross_repo-tests
that referenced
this pull request
Dec 21, 2023
From Pull Request: ManageIQ/manageiq#22738
nasark
force-pushed
the
separate_datastore_and_vm_store_scans
branch
from
7ec8278
to
2adb6c3
Compare
|
@miq-bot cross-repo-tests ManageIQ/manageiq-providers-vmware#887 |
miq-bot
pushed a commit
to ManageIQ/manageiq-cross_repo-tests
that referenced
this pull request
Dec 22, 2023
From Pull Request: ManageIQ/manageiq#22738
|
Checked commit nasark@2adb6c3 with ruby 2.7.8, rubocop 1.56.3, haml-lint 0.51.0, and yamllint |
|
Backported to |
Fryguy
pushed a commit
that referenced
this pull request
Jan 5, 2024
…_scans Separate vm store and datastore smartstate scan supports checks (cherry picked from commit 2d545d0)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The supports
:smartstate_analysisblock is attempting to do too many things at once with its conditional checks and this is causing issues when differentiating storage scans vs. vm scans with storages. Therefore attempting to simplify the logic by just usingsupports_notand then adding asupports :smartstate_analysisto vmware since its the only provider that supports storage scans. RHV/oVirt providers that support vm scans with storages will check the storage type when checking if the vm supports smartstate analysis.Depends:
@miq-bot add_label bug, refactoring
@miq-bot assign @agrare