openstack/zun
Code Issues Proposed changes

Merge "Add support for storing capsule addresses and volumes_info"

Browse Source
This commit is contained in:
Zuul 2018-01-31 04:42:28 +00:00 committed by Gerrit Code Review
commit 3520f14cf1
2 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zun/api/controllers/experimental/views/capsules_view.py
View File

@ -23,6 +23,9 @@ _basic_keys = (
'user_id', 'user_id',
'project_id', 'project_id',
'created_at', 'created_at',
'updated_at',
'addresses',
'volumes_info',
'status', 'status',
'restart_policy', 'restart_policy',
'meta_name', 'meta_name',

35
zun/compute/manager.py
View File

@ -942,6 +942,8 @@ class Manager(periodic_task.PeriodicTasks):
sandbox_id = capsule.containers[0].get_sandbox_id() sandbox_id = capsule.containers[0].get_sandbox_id()
capsule.containers[0].container_id = sandbox_id capsule.containers[0].container_id = sandbox_id
capsule.containers[0].save(context) capsule.containers[0].save(context)
capsule.addresses = capsule.containers[0].addresses
capsule.save(context)
count = len(capsule.containers) count = len(capsule.containers)
for k in range(1, count): for k in range(1, count):
@ -967,6 +969,24 @@ class Manager(periodic_task.PeriodicTasks):
if created_container: if created_container:
self._do_container_start(context, created_container) self._do_container_start(context, created_container)
# Save the volumes_info to capsule database
for volumeapp in container_requested_volumes:
volume_id = volumeapp.volume_id
container_uuid = volumeapp.container_uuid
if capsule.volumes_info:
container_attached = capsule.volumes_info.get(volume_id)
else:
capsule.volumes_info = {}
container_attached = None
if container_attached:
if container_uuid not in container_attached:
container_attached.append(container_uuid)
else:
container_list = [container_uuid]
capsule.volumes_info[volume_id] = container_list
capsule.save(context)
def capsule_delete(self, context, capsule): def capsule_delete(self, context, capsule):
# NOTE(kevinz): Delete functional containers first and then delete # NOTE(kevinz): Delete functional containers first and then delete
# sandbox container # sandbox container
@ -976,12 +996,17 @@ class Manager(periodic_task.PeriodicTasks):
objects.Container.get_by_uuid(context, uuid) objects.Container.get_by_uuid(context, uuid)
self.container_delete(context, container, force=True) self.container_delete(context, container, force=True)
except Exception as e: except Exception as e:
LOG.exception(e) LOG.exception("Failed to delete container %(uuid0)s because "
"it doesn't exist in the capsule. Stale data "
"identified by %(uuid1)s is deleted from "
"database: %(error)s",
{'uuid0': uuid, 'uuid1': uuid, 'error': e})
try: try:
container = \ if capsule.containers_uuids:
objects.Container.get_by_uuid(context, container = \
capsule.containers_uuids[0]) objects.Container.get_by_uuid(context,
self.container_delete(context, container, force=True) capsule.containers_uuids[0])
self.container_delete(context, container, force=True)
except Exception as e: except Exception as e:
LOG.exception(e) LOG.exception(e)
capsule.task_state = None capsule.task_state = None