Remove duplicative implementation of temporary directories.
remotefs has grown its own context sensitive temporary directory
handling sometime in the past, which is non-optimal given there
is a simpler implementation in nova.utils. Move remotefs to that
implementation, thus removing an exec('rm').
Change-Id: I1b908b169a41027a9a73cb02317725a81e44a4cb
blueprint: execs-ive-had-a-few
This commit is contained in:
Michael Still
parent
3f08521d33
commit
9ee10957f9
|
|
@ -58,20 +58,16 @@ class RemoteFSTestCase(test.NoDBTestCase):
|
|||
mock_umount.assert_has_calls(
|
||||
[mock.call(mock.sentinel.mount_path)])
|
||||
|
||||
@mock.patch('tempfile.mkdtemp', return_value='/tmp/Mercury')
|
||||
@mock.patch('nova.utils.execute')
|
||||
def test_remove_remote_file_rsync(self, mock_execute, mock_mkdtemp):
|
||||
def test_remove_remote_file_rsync(self, mock_execute):
|
||||
remotefs.RsyncDriver().remove_file('host', 'dest', None, None)
|
||||
rsync_call_args = mock.call('rsync', '--archive',
|
||||
'--delete', '--include',
|
||||
'dest', '--exclude', '*',
|
||||
'/tmp/Mercury/', 'host:',
|
||||
mock.ANY, 'host:',
|
||||
on_completion=None, on_execute=None)
|
||||
self.assertEqual(mock_execute.mock_calls[0], rsync_call_args)
|
||||
rm_call_args = mock.call('rm', '-rf', '/tmp/Mercury')
|
||||
self.assertEqual(mock_execute.mock_calls[1], rm_call_args)
|
||||
self.assertEqual(2, mock_execute.call_count)
|
||||
self.assertEqual(1, mock_mkdtemp.call_count)
|
||||
self.assertEqual(1, mock_execute.call_count)
|
||||
|
||||
@mock.patch('nova.utils.ssh_execute')
|
||||
def test_remove_remote_file_ssh(self, mock_ssh_execute):
|
||||
|
|
@ -80,25 +76,21 @@ class RemoteFSTestCase(test.NoDBTestCase):
|
|||
'host', 'rm', 'dest',
|
||||
on_completion=None, on_execute=None)
|
||||
|
||||
@mock.patch('tempfile.mkdtemp', return_value='/tmp/Venus')
|
||||
@mock.patch('nova.utils.execute')
|
||||
def test_remove_remote_dir_rsync(self, mock_execute, mock_mkdtemp):
|
||||
def test_remove_remote_dir_rsync(self, mock_execute):
|
||||
remotefs.RsyncDriver().remove_dir('host', 'dest', None, None)
|
||||
rsync_call_args = mock.call('rsync', '--archive',
|
||||
'--delete-excluded', '/tmp/Venus/',
|
||||
'--delete-excluded', mock.ANY,
|
||||
'host:dest',
|
||||
on_completion=None, on_execute=None)
|
||||
self.assertEqual(mock_execute.mock_calls[0], rsync_call_args)
|
||||
rsync_call_args = mock.call('rsync', '--archive',
|
||||
'--delete', '--include',
|
||||
'dest', '--exclude', '*',
|
||||
'/tmp/Venus/', 'host:',
|
||||
mock.ANY, 'host:',
|
||||
on_completion=None, on_execute=None)
|
||||
self.assertEqual(mock_execute.mock_calls[1], rsync_call_args)
|
||||
rm_call_args = mock.call('rm', '-rf', '/tmp/Venus')
|
||||
self.assertEqual(mock_execute.mock_calls[2], rm_call_args)
|
||||
self.assertEqual(3, mock_execute.call_count)
|
||||
self.assertEqual(1, mock_mkdtemp.call_count)
|
||||
self.assertEqual(2, mock_execute.call_count)
|
||||
|
||||
@mock.patch('nova.utils.ssh_execute')
|
||||
def test_remove_remote_dir_ssh(self, mock_ssh_execute):
|
||||
|
|
@ -107,25 +99,21 @@ class RemoteFSTestCase(test.NoDBTestCase):
|
|||
'host', 'rm', '-rf', 'dest', on_completion=None,
|
||||
on_execute=None)
|
||||
|
||||
@mock.patch('tempfile.mkdtemp', return_value='/tmp/Mars')
|
||||
@mock.patch('nova.utils.execute')
|
||||
def test_create_remote_file_rsync(self, mock_execute, mock_mkdtemp):
|
||||
def test_create_remote_file_rsync(self, mock_execute):
|
||||
remotefs.RsyncDriver().create_file('host', 'dest_dir', None, None)
|
||||
mkdir_call_args = mock.call('mkdir', '-p', '/tmp/Mars/',
|
||||
mkdir_call_args = mock.call('mkdir', '-p', mock.ANY,
|
||||
on_completion=None, on_execute=None)
|
||||
self.assertEqual(mock_execute.mock_calls[0], mkdir_call_args)
|
||||
touch_call_args = mock.call('touch', '/tmp/Mars/dest_dir',
|
||||
touch_call_args = mock.call('touch', mock.ANY,
|
||||
on_completion=None, on_execute=None)
|
||||
self.assertEqual(mock_execute.mock_calls[1], touch_call_args)
|
||||
rsync_call_args = mock.call('rsync', '--archive', '--relative',
|
||||
'--no-implied-dirs',
|
||||
'/tmp/Mars/./dest_dir', 'host:/',
|
||||
mock.ANY, 'host:/',
|
||||
on_completion=None, on_execute=None)
|
||||
self.assertEqual(mock_execute.mock_calls[2], rsync_call_args)
|
||||
rm_call_args = mock.call('rm', '-rf', '/tmp/Mars')
|
||||
self.assertEqual(mock_execute.mock_calls[3], rm_call_args)
|
||||
self.assertEqual(4, mock_execute.call_count)
|
||||
self.assertEqual(1, mock_mkdtemp.call_count)
|
||||
self.assertEqual(3, mock_execute.call_count)
|
||||
|
||||
@mock.patch('nova.utils.ssh_execute')
|
||||
def test_create_remote_file_ssh(self, mock_ssh_execute):
|
||||
|
|
@ -135,22 +123,18 @@ class RemoteFSTestCase(test.NoDBTestCase):
|
|||
on_completion=None,
|
||||
on_execute=None)
|
||||
|
||||
@mock.patch('tempfile.mkdtemp', return_value='/tmp/Jupiter')
|
||||
@mock.patch('nova.utils.execute')
|
||||
def test_create_remote_dir_rsync(self, mock_execute, mock_mkdtemp):
|
||||
def test_create_remote_dir_rsync(self, mock_execute):
|
||||
remotefs.RsyncDriver().create_dir('host', 'dest_dir', None, None)
|
||||
mkdir_call_args = mock.call('mkdir', '-p', '/tmp/Jupiter/dest_dir',
|
||||
mkdir_call_args = mock.call('mkdir', '-p', mock.ANY,
|
||||
on_completion=None, on_execute=None)
|
||||
self.assertEqual(mock_execute.mock_calls[0], mkdir_call_args)
|
||||
rsync_call_args = mock.call('rsync', '--archive', '--relative',
|
||||
'--no-implied-dirs',
|
||||
'/tmp/Jupiter/./dest_dir', 'host:/',
|
||||
mock.ANY, 'host:/',
|
||||
on_completion=None, on_execute=None)
|
||||
self.assertEqual(mock_execute.mock_calls[1], rsync_call_args)
|
||||
rm_call_args = mock.call('rm', '-rf', '/tmp/Jupiter')
|
||||
self.assertEqual(mock_execute.mock_calls[2], rm_call_args)
|
||||
self.assertEqual(3, mock_execute.call_count)
|
||||
self.assertEqual(1, mock_mkdtemp.call_count)
|
||||
self.assertEqual(2, mock_execute.call_count)
|
||||
|
||||
@mock.patch('nova.utils.ssh_execute')
|
||||
def test_create_remote_dir_ssh(self, mock_ssh_execute):
|
||||
|
|
@ -193,14 +177,13 @@ class RemoteFSTestCase(test.NoDBTestCase):
|
|||
on_completion=None,
|
||||
on_execute=None)
|
||||
|
||||
@mock.patch('tempfile.mkdtemp', return_value='/tmp/Saturn')
|
||||
def test_rsync_driver_ipv6(self, mock_mkdtemp):
|
||||
def test_rsync_driver_ipv6(self):
|
||||
with mock.patch('nova.utils.execute') as mock_execute:
|
||||
remotefs.RsyncDriver().create_file('2600::', 'dest_dir', None,
|
||||
None)
|
||||
rsync_call_args = mock.call('rsync', '--archive', '--relative',
|
||||
'--no-implied-dirs',
|
||||
'/tmp/Saturn/./dest_dir', '[2600::]:/',
|
||||
mock.ANY, '[2600::]:/',
|
||||
on_completion=None, on_execute=None)
|
||||
self.assertEqual(mock_execute.mock_calls[2], rsync_call_args)
|
||||
|
||||
|
|
@ -208,7 +191,7 @@ class RemoteFSTestCase(test.NoDBTestCase):
|
|||
remotefs.RsyncDriver().create_dir('2600::', 'dest_dir', None, None)
|
||||
rsync_call_args = mock.call('rsync', '--archive', '--relative',
|
||||
'--no-implied-dirs',
|
||||
'/tmp/Saturn/./dest_dir', '[2600::]:/',
|
||||
mock.ANY, '[2600::]:/',
|
||||
on_completion=None, on_execute=None)
|
||||
self.assertEqual(mock_execute.mock_calls[1], rsync_call_args)
|
||||
|
||||
|
|
@ -217,20 +200,20 @@ class RemoteFSTestCase(test.NoDBTestCase):
|
|||
rsync_call_args = mock.call('rsync', '--archive',
|
||||
'--delete', '--include',
|
||||
'dest', '--exclude', '*',
|
||||
'/tmp/Saturn/', '[2600::]:',
|
||||
mock.ANY, '[2600::]:',
|
||||
on_completion=None, on_execute=None)
|
||||
self.assertEqual(mock_execute.mock_calls[0], rsync_call_args)
|
||||
|
||||
with mock.patch('nova.utils.execute') as mock_execute:
|
||||
remotefs.RsyncDriver().remove_dir('2600::', 'dest', None, None)
|
||||
rsync_call_args = mock.call('rsync', '--archive',
|
||||
'--delete-excluded', '/tmp/Saturn/',
|
||||
'--delete-excluded', mock.ANY,
|
||||
'[2600::]:dest',
|
||||
on_completion=None, on_execute=None)
|
||||
self.assertEqual(mock_execute.mock_calls[0], rsync_call_args)
|
||||
rsync_call_args = mock.call('rsync', '--archive',
|
||||
'--delete', '--include',
|
||||
'dest', '--exclude', '*',
|
||||
'/tmp/Saturn/', '[2600::]:',
|
||||
mock.ANY, '[2600::]:',
|
||||
on_completion=None, on_execute=None)
|
||||
self.assertEqual(mock_execute.mock_calls[1], rsync_call_args)
|
||||
|
|
|
|||
|
|
@ -14,9 +14,7 @@
|
|||
# under the License.
|
||||
|
||||
import abc
|
||||
import functools
|
||||
import os
|
||||
import tempfile
|
||||
|
||||
from oslo_concurrency import processutils
|
||||
from oslo_log import log as logging
|
||||
|
|
@ -196,81 +194,60 @@ class SshDriver(RemoteFilesystemDriver):
|
|||
on_execute=on_execute, on_completion=on_completion)
|
||||
|
||||
|
||||
def create_tmp_dir(function):
|
||||
"""Creates temporary directory for rsync purposes.
|
||||
Removes created directory in the end.
|
||||
"""
|
||||
|
||||
@functools.wraps(function)
|
||||
def decorated_function(*args, **kwargs):
|
||||
# Create directory
|
||||
tmp_dir_path = tempfile.mkdtemp()
|
||||
kwargs['tmp_dir_path'] = tmp_dir_path
|
||||
|
||||
try:
|
||||
return function(*args, **kwargs)
|
||||
finally:
|
||||
# Remove directory
|
||||
utils.execute('rm', '-rf', tmp_dir_path)
|
||||
|
||||
return decorated_function
|
||||
|
||||
|
||||
class RsyncDriver(RemoteFilesystemDriver):
|
||||
|
||||
@create_tmp_dir
|
||||
def create_file(self, host, dst_path, on_execute, on_completion, **kwargs):
|
||||
dir_path = os.path.dirname(os.path.normpath(dst_path))
|
||||
def create_file(self, host, dst_path, on_execute, on_completion):
|
||||
with utils.tempdir() as tempdir:
|
||||
dir_path = os.path.dirname(os.path.normpath(dst_path))
|
||||
|
||||
# Create target dir inside temporary directory
|
||||
local_tmp_dir = os.path.join(kwargs['tmp_dir_path'],
|
||||
dir_path.strip(os.path.sep))
|
||||
utils.execute('mkdir', '-p', local_tmp_dir,
|
||||
on_execute=on_execute, on_completion=on_completion)
|
||||
# Create target dir inside temporary directory
|
||||
local_tmp_dir = os.path.join(tempdir,
|
||||
dir_path.strip(os.path.sep))
|
||||
utils.execute('mkdir', '-p', local_tmp_dir,
|
||||
on_execute=on_execute, on_completion=on_completion)
|
||||
|
||||
# Create file in directory
|
||||
file_name = os.path.basename(os.path.normpath(dst_path))
|
||||
local_tmp_file = os.path.join(local_tmp_dir, file_name)
|
||||
utils.execute('touch', local_tmp_file,
|
||||
on_execute=on_execute, on_completion=on_completion)
|
||||
RsyncDriver._synchronize_object(kwargs['tmp_dir_path'],
|
||||
host, dst_path,
|
||||
on_execute=on_execute,
|
||||
on_completion=on_completion)
|
||||
# Create file in directory
|
||||
file_name = os.path.basename(os.path.normpath(dst_path))
|
||||
local_tmp_file = os.path.join(local_tmp_dir, file_name)
|
||||
utils.execute('touch', local_tmp_file,
|
||||
on_execute=on_execute, on_completion=on_completion)
|
||||
RsyncDriver._synchronize_object(tempdir,
|
||||
host, dst_path,
|
||||
on_execute=on_execute,
|
||||
on_completion=on_completion)
|
||||
|
||||
@create_tmp_dir
|
||||
def remove_file(self, host, dst, on_execute, on_completion, **kwargs):
|
||||
# Delete file
|
||||
RsyncDriver._remove_object(kwargs['tmp_dir_path'], host, dst,
|
||||
on_execute=on_execute,
|
||||
on_completion=on_completion)
|
||||
def remove_file(self, host, dst, on_execute, on_completion):
|
||||
with utils.tempdir() as tempdir:
|
||||
RsyncDriver._remove_object(tempdir, host, dst,
|
||||
on_execute=on_execute,
|
||||
on_completion=on_completion)
|
||||
|
||||
@create_tmp_dir
|
||||
def create_dir(self, host, dst_path, on_execute, on_completion, **kwargs):
|
||||
dir_path = os.path.normpath(dst_path)
|
||||
def create_dir(self, host, dst_path, on_execute, on_completion):
|
||||
with utils.tempdir() as tempdir:
|
||||
dir_path = os.path.normpath(dst_path)
|
||||
|
||||
# Create target dir inside temporary directory
|
||||
local_tmp_dir = os.path.join(kwargs['tmp_dir_path'],
|
||||
dir_path.strip(os.path.sep))
|
||||
utils.execute('mkdir', '-p', local_tmp_dir,
|
||||
on_execute=on_execute, on_completion=on_completion)
|
||||
RsyncDriver._synchronize_object(kwargs['tmp_dir_path'],
|
||||
host, dst_path,
|
||||
on_execute=on_execute,
|
||||
on_completion=on_completion)
|
||||
# Create target dir inside temporary directory
|
||||
local_tmp_dir = os.path.join(tempdir,
|
||||
dir_path.strip(os.path.sep))
|
||||
utils.execute('mkdir', '-p', local_tmp_dir,
|
||||
on_execute=on_execute, on_completion=on_completion)
|
||||
RsyncDriver._synchronize_object(tempdir,
|
||||
host, dst_path,
|
||||
on_execute=on_execute,
|
||||
on_completion=on_completion)
|
||||
|
||||
@create_tmp_dir
|
||||
def remove_dir(self, host, dst, on_execute, on_completion, **kwargs):
|
||||
def remove_dir(self, host, dst, on_execute, on_completion):
|
||||
# Remove remote directory's content
|
||||
utils.execute('rsync', '--archive', '--delete-excluded',
|
||||
kwargs['tmp_dir_path'] + os.path.sep,
|
||||
utils.format_remote_path(host, dst),
|
||||
on_execute=on_execute, on_completion=on_completion)
|
||||
with utils.tempdir() as tempdir:
|
||||
utils.execute('rsync', '--archive', '--delete-excluded',
|
||||
tempdir + os.path.sep,
|
||||
utils.format_remote_path(host, dst),
|
||||
on_execute=on_execute, on_completion=on_completion)
|
||||
|
||||
# Delete empty directory
|
||||
RsyncDriver._remove_object(kwargs['tmp_dir_path'], host, dst,
|
||||
on_execute=on_execute,
|
||||
on_completion=on_completion)
|
||||
# Delete empty directory
|
||||
RsyncDriver._remove_object(tempdir, host, dst,
|
||||
on_execute=on_execute,
|
||||
on_completion=on_completion)
|
||||
|
||||
@staticmethod
|
||||
def _remove_object(src, host, dst, on_execute, on_completion):
|
||||
|
|
|
|||
Loading…
Reference in New Issue