summaryrefslogtreecommitdiff
path: root/nova/network
diff options
context:
space:
mode:
authorKevin_Zheng <zhengzhenyu@huawei.com>2016-11-28 16:12:51 +0800
committerKevin_Zheng <zhengzhenyu@huawei.com>2017-07-03 15:40:12 +0800
commit115cf068a6d48cdf8b0d20a3c5a779bb8120aa9b (patch)
tree0c3cadf59d89b39feee139c547c5a4fabaed18f4 /nova/network
parent768d7cc0a632e1a880f00c5840c1ec8051e161be (diff)
downloadnova-115cf068a6d48cdf8b0d20a3c5a779bb8120aa9b.tar.gz
Don't delete neutron port when attach failed
Currently, when attaching neutron pre-existing port to an instance, if the attach failed, it will also be deleted in Neutron side due to bad judgement of the who created the port by reading not up-to-date info_cache. The workflow starts at: https://github.com/openstack/nova/blob/9ed0d6114/nova/network/neutronv2/api.py#L881 ordered_ports and preexisting_port_ids are the same when attaching a preexisting port to an instance and it calls https://github.com/openstack/nova/blob/9ed0d6114/nova/network/base_api.py#L246 which calls back into the neutronv2 api code https://github.com/openstack/nova/blob/9ed0d6114/nova/network/neutronv2/api.py#L1274 and at this point, compute_utils.refresh_info_cache_for_instance(context, instance) won't have the newly attached port in it(see debug log: http://paste.openstack.org/show/613232/) because _build_network_info_model() is going to process it. The instance obj in memoryt with old info_cache will be used at rollback process and causing the miss-judging. This patch fixed it by updating instance.info_cache to the new ic after it is created. Co-Authored-By: huangtianhua@huawei.com Change-Id: Ib323b74d4ea1e874b476ab5addfc6bc79cb7c751 closes-bug: #1645175
Diffstat (limited to 'nova/network')
-rw-r--r--nova/network/base_api.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/network/base_api.py b/nova/network/base_api.py
index ccfa153094..12bef29949 100644
--- a/nova/network/base_api.py
+++ b/nova/network/base_api.py
@@ -48,6 +48,7 @@ def update_instance_cache_with_nw_info(impl, context, instance,
ic = objects.InstanceInfoCache.new(context, instance.uuid)
ic.network_info = nw_info
ic.save(update_cells=update_cells)
+ instance.info_cache = ic
except Exception:
with excutils.save_and_reraise_exception():
LOG.exception(_LE('Failed storing info cache'), instance=instance)