openstack
/
zun
Code Issues Proposed changes

Merge "Revert "remove repeated _set_container_host when container_claim""

This commit is contained in:
Zuul 2018-03-08 06:59:44 +00:00 committed by Gerrit Code Review
parent 8949583efc 84ca4d826c
commit 22ead31e77
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zun/compute/compute_node_tracker.py
View File

@ -92,11 +92,10 @@ class ComputeNodeTracker(object):
be used to revert the resource usage if an error occurs
during the container build.
"""
self._set_container_host(context, container)
# No memory, cpu, or pci_request specified, no need to claim resource
# now.
if not (container.memory or container.cpu or pci_requests):
self._set_container_host(context, container)
return claims.NopClaim()
# We should have the compute node created here, just get it.
@ -109,6 +108,7 @@ class ComputeNodeTracker(object):
self.pci_tracker.claim_container(context, container.uuid,
pci_requests)
self._set_container_host(context, container)
self._update_usage_from_container(context, container)
# persist changes to the compute node:
self._update(self.compute_node)