Comment 17 for bug 1784705

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

Reviewed: https://review.openstack.org/588077
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=2f6ea7b871f5273f16921125647bdcd2f4e93c4e
Submitter: Zuul
Branch: stable/ocata

commit 2f6ea7b871f5273f16921125647bdcd2f4e93c4e
Author: Matt Riedemann <email address hidden>
Date: Tue Jul 31 17:26:47 2018 -0400

    Make ResourceTracker.stats node-specific

    As of change I6827137f35c0cb4f9fc4c6f753d9a035326ed01b in
    Ocata, the ResourceTracker manages multiple compute nodes
    via its "compute_nodes" variable, but the "stats" variable
    was still being shared across all nodes, which leads to
    leaking stats across nodes in an ironic deployment where
    a single nova-compute service host is managing multiple
    ironic instances (nodes).

    This change makes ResourceTracker.stats node-specific
    which fixes the ironic leak but also allows us to remove
    the stats deepcopy while iterating over instances which
    should improve performance for single-node deployments with
    potentially a large number of instances, i.e. vCenter.

    Conflicts:
          nova/compute/manager.py
          nova/compute/resource_tracker.py

    NOTE(mriedem): The conflicts are due to not having change
    I02b7cd87d399d487dd1d650540f503a70bc27749 in Ocata which
    added the consecutive failed builds stats counting. As a
    result, the Ocata cherry pick does not need to move the
    "if node is None" check in _do_build_and_run_instance like
    in Pike.

    Change-Id: I0b9e5b711878fa47ba90e43c0b41437b57cf8ef6
    Closes-Bug: #1784705
    Closes-Bug: #1777422
    (cherry picked from commit b5b7d86bb04f92d21cf954cd6b3463c9fcc637e6)
    (cherry picked from commit 7d99f5753f992bd4b58b0aaa7f83f71fb044776f)
    (cherry picked from commit e279ac404673784f33610cad55288e2e60649f88)