Comment 10 for bug 1887946

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to nova (stable/rocky)

Reviewed: https://review.opendev.org/742417
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=74b053f47a659a0250d051020d6c8b4e3c256e7d
Submitter: Zuul
Branch: stable/rocky

commit 74b053f47a659a0250d051020d6c8b4e3c256e7d
Author: Lee Yarwood <email address hidden>
Date: Fri Jul 17 00:45:10 2020 +0100

    libvirt: Handle VIR_ERR_DEVICE_MISSING when detaching devices

    Introduced in libvirt v4.1.0 [1] this error code replaces the previously
    raised VIR_ERR_INVALID_ARG, VIR_ERR_OPERATION_FAILED and
    VIR_ERR_INVALID_ARG codes [2][3].

    VIR_ERR_OPERATION_FAILED was introduced and tested as an
    active/live/hot unplug config device detach error code in
    I131aaf28d2f5d5d964d4045e3d7d62207079cfb0.

    VIR_ERR_INTERNAL_ERROR was introduced and tested as an
    active/live/hot unplug config device detach error code in
    I3055cd7641de92ab188de73733ca9288a9ca730a.

    VIR_ERR_INVALID_ARG was introduced and tested as an
    inactive/persistent/cold unplug config device detach error code in
    I09230fc47b0950aa5a3db839a070613c9c817576.

    This change introduces support for the new VIR_ERR_DEVICE_MISSING error
    code while also retaining coverage for these codes until
    MIN_LIBVIRT_VERSION is bumped past v4.1.0.

    The majority of this change is test code motion with the existing tests
    being modified to run against either the active or inactive versions of
    the above error codes for the time being.

    test_detach_device_with_retry_operation_internal and
    test_detach_device_with_retry_invalid_argument_no_live have been removed
    as they duplicate the logic within the now refactored
    _test_detach_device_with_retry_second_detach_failure.

    [1] https://libvirt.org/git/?p=libvirt.git;a=commit;h=bb189c8e8c93f115c13fa3bfffdf64498f3f0ce1
    [2] https://libvirt.org/git/?p=libvirt.git;a=commit;h=126db34a81bc9f9f9710408f88cceaa1e34bbbd7
    [3] https://libvirt.org/git/?p=libvirt.git;a=commit;h=2f54eab7c7c618811de23c60a51e910274cf30de

    Closes-Bug: #1887946
    Change-Id: I7eb86edc130d186a66c04b229d46347ec5c0b625
    (cherry picked from commit 902f09af251d2b2e56fb2f2900a3510baf38a508)
    (cherry picked from commit 93058ae1b8bc1b1728f08b9e606b68318751fc3b)
    (cherry picked from commit 863d6ef7601302901fa3368ea8457b3564eeb501)
    (cherry picked from commit 76428c1a6a7796391957a3e83207f85cfe924505)