openstack
/
freezer
Code Issues Proposed changes

Fix LVM mountpoint issues. 

Closes-Bug: #1596533

Change-Id: Ied04f10e5b63c6f3742918b004185a66d3ccc4e3
This commit is contained in:
Pierre-Arthur MATHIEU 2016-06-27 14:10:40 +01:00 committed by Domhnall Walsh
parent 5c9acf916d
commit bf1754281a
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
freezer/snapshot/lvm.py
View File

@ -1,5 +1,5 @@
"""
(c) Copyright 2014,2015 Hewlett-Packard Development Company, L.P.
(c) Copyright 2014-2016 Hewlett-Packard Development Company, L.P.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@ -90,10 +90,12 @@ def lvm_snap(backup_opt_dict):
:param backup_opt_dict: the configuration dict
:return: True if the snapshot has been taken, False otherwise
"""
lvm_uuid = uuid.uuid4().hex
if not backup_opt_dict.lvm_snapname:
backup_opt_dict.lvm_snapname = \
"{0}_{1}".format(freezer_config.DEFAULT_LVM_SNAP_BASENAME,
uuid.uuid4().hex)
lvm_uuid)
# adjust/check lvm parameters according to provided path_to_backup
lvm_info = get_lvm_info(backup_opt_dict.path_to_backup)
@ -107,7 +109,7 @@ def lvm_snap(backup_opt_dict):
if not backup_opt_dict.lvm_dirmount:
backup_opt_dict.lvm_dirmount = \
"{0}_{1}".format(freezer_config.DEFAULT_LVM_MOUNT_BASENAME,
uuid.uuid4().hex)
lvm_uuid)
backup_opt_dict.path_to_backup = os.path.join(backup_opt_dict.lvm_dirmount,
lvm_info['snap_path'])
@ -297,8 +299,8 @@ def validate_lvm_params(backup_opt_dict):
def _umount(path):
# TODO(ANONYMOUS): check if cwd==path
# and change working directory to unmount ?
if os.getcwd().startswith(path):
os.chdir('/')
umount_proc = subprocess.Popen('{0} -l -f {1}'.format(
utils.find_executable('umount'), path),
stdin=subprocess.PIPE,
@ -307,9 +309,9 @@ def _umount(path):
(umount_out, mount_err) = umount_proc.communicate()
if umount_proc.returncode:
raise Exception('impossible to umount {0}. {1}'
raise Exception('Impossible to umount {0}. {1}'
.format(path, mount_err))
os.rmdir(path)
logging.info('[*] Volume {0} unmounted'.format(path))

9
tests/unit/snapshot/test_lvm.py
View File

@ -325,23 +325,26 @@ class Test_validate_lvm_params(unittest.TestCase):
self.assertRaises(Exception, lvm.validate_lvm_params, self.backup_opt)
class Test_umount(unittest.TestCase):
@patch('freezer.snapshot.lvm.subprocess.Popen')
def test_return_none_on_success(self, mock_popen):
@patch('freezer.snapshot.lvm.os')
def test_return_none_on_success(self, mock_os, mock_popen):
mock_process = Mock()
mock_process.communicate.return_value = '', ''
mock_process.returncode = 0
mock_popen.return_value = mock_process
mock_os.rmdir.return_value = None
self.assertIsNone(lvm._umount('path'))
@patch('freezer.snapshot.lvm.subprocess.Popen')
def test_raises_on_popen_returncode_not_0(self, mock_popen):
@patch('freezer.snapshot.lvm.os')
def test_raises_on_popen_returncode_not_0(self, mock_os, mock_popen):
mock_process = Mock()
mock_process.communicate.return_value = '', ''
mock_process.returncode = 1
mock_popen.return_value = mock_process
mock_os.rmdir.return_value = None
self.assertRaises(Exception, lvm._umount, 'path')