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.

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

Fix container scanning timeout handling. #10396

Merged
merged 1 commit into from
Aug 18, 2016

Conversation

moolitayer
Copy link

@moolitayer moolitayer commented Aug 11, 2016

Eliminates failing container scanning jobs that remain in active states.
Removes multiple occurrences of[1] seen in logs.

In other cases the timeout code would work because
a vm with an id that matches that of the target container
happen to exist.

Using find_by should also handle cases where the
target entity no longer exist. This is very common
for container entities and should also benefit vms.

Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1366598

[1] ERROR -- : MIQ(Job.check_jobs_for_timeout) Couldn't find VmOrTemplate
with 'id'=3

@moolitayer moolitayer force-pushed the fix_scan_timeout branch 3 times, most recently from 5b57000 to 7ba597c Compare August 11, 2016 11:02
@moolitayer
Copy link
Author

@miq-bot add_label providers/containers, bug, smart_state
@roliveri @jerryk55 @enoodle @simon3z PTAL

@miq-bot
Copy link
Member

miq-bot commented Aug 11, 2016

@moolitayer Cannot apply the following label because they are not recognized: smart_state

@enoodle
Copy link

enoodle commented Aug 11, 2016

👍

@chessbyte
Copy link
Member

@simon3z Please re-assign to @roliveri when you are 👍 on this PR

@roliveri
Copy link
Member

Looks good to me.

@moolitayer
Copy link
Author

@simon3z PTAL

@moolitayer
Copy link
Author

@miq-bot add_label darga/yes
Added bz to commit & pr message.

@moolitayer
Copy link
Author

Fixes: #9037, #9031

@simon3z
Copy link
Contributor

simon3z commented Aug 16, 2016

@miq-bot assign roliveri

LGMT 👍 ready for merge cc @chessbyte

@miq-bot miq-bot assigned roliveri and unassigned simon3z Aug 16, 2016
@chessbyte
Copy link
Member

@moolitayer @simon3z Where are the spec/test changes to accompany the code?

Eliminates failing container scanning jobs that
remain in active states.
Removes multiple occurrences of[1] seen in logs.

In other cases the timeout code would work because
a vm with an id that matches that of the target container
happen to exist.

Using find_by should also handle cases where the
target entity no longer exist. This is very common
for container entities and should also benefit vms.

Bug-url: https://bugzilla.redhat.com/show_bug.cgi?id=1366598

[1] ERROR -- : MIQ(Job.check_jobs_for_timeout) Couldn't find VmOrTemplate
with 'id'=3
@miq-bot
Copy link
Member

miq-bot commented Aug 17, 2016

Checked commit moolitayer@f558c50 with ruby 2.2.5, rubocop 0.37.2, and haml-lint 0.16.1
3 files checked, 0 offenses detected
Everything looks good. ⭐

@moolitayer
Copy link
Author

@chessbyte PTAL I've added unit tests and a test for the case of a scan job for a deleted vm.

@roliveri roliveri merged commit 1a367ea into ManageIQ:master Aug 18, 2016
@roliveri roliveri added this to the Sprint 45 Ending Aug 22, 2016 milestone Aug 18, 2016
chessbyte pushed a commit that referenced this pull request Aug 23, 2016
Fix container scanning timeout handling.
(cherry picked from commit 1a367ea)
@chessbyte
Copy link
Member

Darga backport details:

commit 6235a83e57c99c57d4d74402b2a977e1ee7458f0
Author: Richard Oliveri <oliveri.richard.github@gmail.com>
Date:   Thu Aug 18 18:51:15 2016 -0400

    Merge pull request #10396 from moolitayer/fix_scan_timeout

    Fix container scanning timeout handling.
    (cherry picked from commit 1a367eac5ae24e3da78bd011a34217371769bf00)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants