openstack
/
cinder
Code Issues Proposed changes

Merge "Use ensure_tree instead of mkdir when creating paths"

This commit is contained in:
Zuul 2018-07-17 10:51:35 +00:00 committed by Gerrit Code Review
parent b52d26a361 8f1cd6983d
commit d7908be9ac
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cinder/tests/unit/volume/drivers/test_quobyte.py
View File

@ -24,6 +24,7 @@ import traceback
import mock
from oslo_concurrency import processutils as putils
from oslo_utils import fileutils
from oslo_utils import imageutils
from oslo_utils import units
@ -150,7 +151,7 @@ class QuobyteDriverTestCase(test.TestCase):
tmp_path, self._driver.QUOBYTE_VOLUME_SNAP_CACHE_DIR_NAME)
self.assertFalse(os_makedirs_mock.called)
@mock.patch.object(os, "makedirs")
@mock.patch.object(fileutils, "ensure_tree")
@mock.patch.object(os.path, "join", return_value="dummy_path")
@mock.patch.object(os, "access", return_value=True)
def test__ensure_volume_cache_create(self, os_access_mock, os_join_mock,
@ -202,6 +203,7 @@ class QuobyteDriverTestCase(test.TestCase):
with mock.patch.object(self._driver, '_execute') as mock_execute, \
mock.patch('cinder.volume.drivers.quobyte.QuobyteDriver'
'.read_proc_mount') as mock_open, \
mock.patch('oslo_utils.fileutils.ensure_tree') as mock_mkdir, \
mock.patch('cinder.volume.drivers.quobyte.QuobyteDriver'
'._validate_volume') as mock_validate:
# Content of /proc/mount (not mounted yet).
@ -211,14 +213,13 @@ class QuobyteDriverTestCase(test.TestCase):
self._driver._mount_quobyte(self.TEST_QUOBYTE_VOLUME,
self.TEST_MNT_POINT)
mkdir_call = mock.call('mkdir', '-p', self.TEST_MNT_POINT)
mock_mkdir.assert_called_once_with(self.TEST_MNT_POINT)
mount_call = mock.call(
'mount.quobyte', '--disable-xattrs', self.TEST_QUOBYTE_VOLUME,
self.TEST_MNT_POINT, run_as_root=False)
mock_execute.assert_has_calls(
[mkdir_call, mount_call], any_order=False)
[mount_call], any_order=False)
mock_validate.called_once_with(self.TEST_MNT_POINT)
def test_mount_quobyte_already_mounted_detected_seen_in_proc_mount(self):
@ -250,6 +251,7 @@ class QuobyteDriverTestCase(test.TestCase):
with mock.patch.object(self._driver, '_execute') as mock_execute, \
mock.patch('cinder.volume.drivers.quobyte.QuobyteDriver'
'.read_proc_mount') as mock_open, \
mock.patch('oslo_utils.fileutils.ensure_tree') as mock_mkdir, \
mock.patch('cinder.volume.drivers.quobyte.QuobyteDriver'
'._validate_volume') as mock_validate:
# Content of /proc/mount (empty).
@ -261,11 +263,11 @@ class QuobyteDriverTestCase(test.TestCase):
self.TEST_MNT_POINT,
ensure=True)
mkdir_call = mock.call('mkdir', '-p', self.TEST_MNT_POINT)
mock_mkdir.assert_called_once_with(self.TEST_MNT_POINT)
mount_call = mock.call(
'mount.quobyte', '--disable-xattrs', self.TEST_QUOBYTE_VOLUME,
self.TEST_MNT_POINT, run_as_root=False)
mock_execute.assert_has_calls([mkdir_call, mount_call],
mock_execute.assert_has_calls([mount_call],
any_order=False)
mock_validate.assert_called_once_with(self.TEST_MNT_POINT)
@ -276,6 +278,7 @@ class QuobyteDriverTestCase(test.TestCase):
but with ensure=False.
"""
with mock.patch.object(self._driver, '_execute') as mock_execute, \
mock.patch('oslo_utils.fileutils.ensure_tree') as mock_mkdir, \
mock.patch('cinder.volume.drivers.quobyte.QuobyteDriver'
'.read_proc_mount') as mock_open:
mock_open.return_value = six.StringIO()
@ -284,17 +287,17 @@ class QuobyteDriverTestCase(test.TestCase):
putils.ProcessExecutionError( # mount
stderr='is busy or already mounted')]
self.assertRaises(putils.ProcessExecutionError,
self.assertRaises(exception.VolumeDriverException,
self._driver._mount_quobyte,
self.TEST_QUOBYTE_VOLUME,
self.TEST_MNT_POINT,
ensure=False)
mkdir_call = mock.call('mkdir', '-p', self.TEST_MNT_POINT)
mock_mkdir.assert_called_once_with(self.TEST_MNT_POINT)
mount_call = mock.call(
'mount.quobyte', '--disable-xattrs', self.TEST_QUOBYTE_VOLUME,
self.TEST_MNT_POINT, run_as_root=False)
mock_execute.assert_has_calls([mkdir_call, mount_call],
mock_execute.assert_has_calls([mount_call],
any_order=False)
@mock.patch.object(image_utils, "qemu_img_info")

4
cinder/volume/drivers/nexenta/nfs.py
View File

@ -20,6 +20,7 @@ import six
from eventlet import greenthread
from oslo_log import log as logging
from oslo_utils import fileutils
from oslo_utils import units
from cinder import context
@ -693,8 +694,7 @@ class NexentaNfsDriver(nfs.NfsDriver): # pylint: disable=R0921
LOG.info('Already mounted: %s', mount_path)
return
self._execute('mkdir', '-p', mount_path,
check_exit_code=False)
fileutils.ensure_tree(mount_path)
self._remotefsclient._mount_nfs(nfs_share, mount_path,
mnt_flags)
return

4
cinder/volume/drivers/quobyte.py
View File

@ -131,7 +131,7 @@ class QuobyteDriver(remotefs_drv.RemoteFSSnapDriverDistributed):
LOG.info("Volume from snapshot cache directory does not exist, "
"creating the directory %(volcache)s",
{'volcache': cache_path})
os.makedirs(cache_path)
fileutils.ensure_tree(cache_path)
if not (os.access(cache_path, os.R_OK)
and os.access(cache_path, os.W_OK)
and os.access(cache_path, os.X_OK)):
@ -566,7 +566,7 @@ class QuobyteDriver(remotefs_drv.RemoteFSSnapDriverDistributed):
if not mounted:
if not os.path.isdir(mount_path):
self._execute('mkdir', '-p', mount_path)
fileutils.ensure_tree(mount_path)
command = ['mount.quobyte', '--disable-xattrs',
quobyte_volume, mount_path]