openstack
/
murano
Code Issues Proposed changes

Cleanup .lock files after package deletion from cache 

After the package has been removed from the cache there is no need for
lock files anyway, so clean them up to save up inodes and cleanup
better.
This commit also fixes an incorrect file lock path used for optimistic
locking.
This commit makes try_cleanup_cache function more readable, by removing
unnecessary nesting of the code.

Related bp: murano-engine-package-cache

Change-Id: I727f020af44594bc12483a39480227ed9a0357bf
This commit is contained in:
Kirill Zaitsev 2016-02-01 13:57:29 +03:00
parent f0f758ee93
commit 8da1d6f993
1 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
murano/engine/package_loader.py
View File

@ -28,7 +28,7 @@ from oslo_config import cfg
from oslo_log import log as logging
import six
from murano.common.i18n import _LE, _LI
from murano.common.i18n import _LE, _LI, _LW
from murano.dsl import constants
from murano.dsl import exceptions
from murano.dsl import helpers
@ -236,6 +236,12 @@ class ApiPackageLoader(package_loader.MuranoPackageLoader):
pass
def try_cleanup_cache(self, package_directory=None, current_id=None):
"""Attempts to cleanup cache in a given directory.
:param package_directory: directory containing cached packages
:param current_id: optional id of the package to exclude from the list
of deleted packages
"""
if not package_directory:
return
@ -254,22 +260,41 @@ class ApiPackageLoader(package_loader.MuranoPackageLoader):
stale_directory = os.path.join(
package_directory,
pkg_id)
if os.path.isdir(package_directory):
usage_lock_path = os.path.join(
self._cache_directory,
'{}_usage.lock'.format(current_id))
ipc_lock = m_utils.ExclusiveInterProcessLock(
path=usage_lock_path, sleep_func=eventlet.sleep)
if not os.path.isdir(package_directory):
continue
with usage_mem_locks[pkg_id].write_lock(False) as acquired:
if not acquired:
continue
acquired_ipc_lock = ipc_lock.acquire(blocking=False)
if acquired_ipc_lock:
shutil.rmtree(stale_directory,
ignore_errors=True)
ipc_lock.release()
usage_lock_path = os.path.join(
self._cache_directory,
'{}_usage.lock'.format(pkg_id))
ipc_lock = m_utils.ExclusiveInterProcessLock(
path=usage_lock_path, sleep_func=eventlet.sleep)
with usage_mem_locks[pkg_id].write_lock(False) as acquired:
if not acquired:
# the package is in use by other deployment in this process
# will do nothing, someone else would delete it
continue
acquired_ipc_lock = ipc_lock.acquire(blocking=False)
if not acquired_ipc_lock:
# the package is in use by other deployment in another
# process, will do nothing, someone else would delete it
continue
shutil.rmtree(stale_directory,
ignore_errors=True)
ipc_lock.release()
for lock_type in ('usage', 'download'):
lock_path = os.path.join(
self._cache_directory,
'{}_{}.lock'.format(pkg_id, lock_type))
try:
os.remove(lock_path)
except OSError:
LOG.warning(
_LW("Couldn't delete lock file: "
"{}").format(lock_path))
def _get_best_package_match(self, packages):
public = None