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

[FINE] Backport of: fixed cases causing waiting on timeout in vm_import #15784

Merged

Conversation

jelkosz
Copy link
Contributor

@jelkosz jelkosz commented Aug 10, 2017

This is a backport of ManageIQ/manageiq-providers-ovirt/pull/73/ solving the merge conflicts.

Please note this has to be backported together with ManageIQ/manageiq-content/pull/168 to avoid failing tests on the manageiq-content repo.

It tries to be a minimal backport needed but still includes all the relevant
tests.

2 problems fixed:

  • allow to import only using 4.1.5+ provider.
    The reason is that the required fix (https://bugzilla.redhat.com/1477375) is
    present in 4.1.5+ and without this fix manageiq will wait until timeout
    reached.
  • check if submit to the provider succeeded.
    The reason is that if the result is not checked, this state will always
    succeed and the import will again wait until timeout.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1473169

This is a backport of ManageIQ/manageiq-providers-ovirt/pull/73/
It tries to be a minimal backport needed but still includes all the relevant
tests.

2 problems fixed:
- allow to import only using 4.1.5+ provider.
  The reason is that the required fix (https://bugzilla.redhat.com/1477375) is
  present in 4.1.5+ and without this fix manageiq will wait until timeout
  reached.
- check if submit to the provider succeeded.
  The reason is that if the result is not checked, this state will always
  succeed and the import will again wait until timeout.
@jelkosz jelkosz force-pushed the vm_import_fix_issues_causing_timeouts branch from 86836c8 to 2881ec2 Compare August 10, 2017 09:49
@miq-bot
Copy link
Member

miq-bot commented Aug 10, 2017

Checked commit jelkosz@2881ec2 with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0
4 files checked, 0 offenses detected
Everything looks fine. 🍪

@jelkosz
Copy link
Contributor Author

jelkosz commented Aug 10, 2017

the test failure is unrelated - it is fixed by #15782

@jelkosz
Copy link
Contributor Author

jelkosz commented Aug 10, 2017

@miq-bot assign @simaishi

@simaishi simaishi merged commit 872064a into ManageIQ:fine Aug 10, 2017
@simaishi simaishi added this to the Sprint 67 Ending Aug 21, 2017 milestone Aug 10, 2017
@chessbyte chessbyte changed the title [Fine] Backport of: fixed cases causing waiting on timeout in vm_import [FINE] Backport of: fixed cases causing waiting on timeout in vm_import Aug 10, 2017
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.

5 participants