openstack/cinder
Code Issues Proposed changes

Switch Cinder to use oslo.concurrency

Browse Source 
Let's switch to the newly released oslo library for the
processutils and lockutils. We use the config fixture(s) to
specify disable_process_locking and lock_path in the CONF
variable of oslo.concurrency library for correctly setting the
flags.

Change-Id: Ib8f3aac5449eba66ea84bc5cad8aea061adab276
This commit is contained in:
ChangBo Guo(gcb) 2014-11-10 20:45:12 +08:00
parent 7d341e267f
commit 372df8a75b
70 changed files with 97 additions and 661 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/backup/drivers/tsm.py
View File

@ -29,13 +29,13 @@ import json
import os import os
import stat import stat
from oslo.concurrency import processutils
from oslo.config import cfg from oslo.config import cfg
from cinder.backup.driver import BackupDriver from cinder.backup.driver import BackupDriver
from cinder import exception from cinder import exception
from cinder.i18n import _LE, _ from cinder.i18n import _LE, _
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils
from cinder import utils from cinder import utils
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
cinder/brick/executor.py
View File

@ -18,7 +18,7 @@
and root_helper settings, so this provides that hook. and root_helper settings, so this provides that hook.
""" """
from cinder.openstack.common import processutils as putils from oslo.concurrency import processutils as putils
class Executor(object): class Executor(object):

5
cinder/brick/initiator/connector.py
View File

@ -17,6 +17,9 @@ import os
import socket import socket
import time import time
from oslo.concurrency import lockutils
from oslo.concurrency import processutils as putils
from cinder.brick import exception from cinder.brick import exception
from cinder.brick import executor from cinder.brick import executor
from cinder.brick.initiator import host_driver from cinder.brick.initiator import host_driver
@ -24,10 +27,8 @@ from cinder.brick.initiator import linuxfc
from cinder.brick.initiator import linuxscsi from cinder.brick.initiator import linuxscsi
from cinder.brick.remotefs import remotefs from cinder.brick.remotefs import remotefs
from cinder.i18n import _, _LE from cinder.i18n import _, _LE
from cinder.openstack.common import lockutils
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import loopingcall from cinder.openstack.common import loopingcall
from cinder.openstack.common import processutils as putils
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

3
cinder/brick/initiator/linuxfc.py
View File

@ -16,10 +16,11 @@
import errno import errno
from oslo.concurrency import processutils as putils
from cinder.brick.initiator import linuxscsi from cinder.brick.initiator import linuxscsi
from cinder.i18n import _ from cinder.i18n import _
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils as putils
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

3
cinder/brick/initiator/linuxscsi.py
View File

@ -19,10 +19,11 @@
import os import os
import re import re
from oslo.concurrency import processutils as putils
from cinder.brick import executor from cinder.brick import executor
from cinder.i18n import _ from cinder.i18n import _
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils as putils
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
cinder/brick/iscsi/iscsi.py
View File

@ -23,6 +23,7 @@ import re
import stat import stat
import time import time
from oslo.concurrency import processutils as putils
from oslo.config import cfg from oslo.config import cfg
import six import six
@ -31,7 +32,6 @@ from cinder.brick import executor
from cinder.i18n import _, _LE, _LI, _LW from cinder.i18n import _, _LE, _LI, _LW
from cinder.openstack.common import fileutils from cinder.openstack.common import fileutils
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils as putils
from cinder import utils from cinder import utils
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
cinder/brick/local_dev/lvm.py
View File

@ -22,13 +22,13 @@ import math
import re import re
import time import time
from oslo.concurrency import processutils as putils
from oslo.utils import excutils from oslo.utils import excutils
from cinder.brick import exception from cinder.brick import exception
from cinder.brick import executor from cinder.brick import executor
from cinder.i18n import _, _LE, _LW from cinder.i18n import _, _LE, _LW
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils as putils
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
cinder/brick/remotefs/remotefs.py
View File

@ -19,12 +19,12 @@ import hashlib
import os import os
import re import re
from oslo.concurrency import processutils as putils
import six import six
from cinder.brick import exception from cinder.brick import exception
from cinder.i18n import _, _LI from cinder.i18n import _, _LI
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils as putils
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
cinder/image/image_utils.py
View File

@ -28,6 +28,7 @@ import contextlib
import os import os
import tempfile import tempfile
from oslo.concurrency import processutils
from oslo.config import cfg from oslo.config import cfg
from oslo.utils import timeutils from oslo.utils import timeutils
from oslo.utils import units from oslo.utils import units
@ -37,7 +38,6 @@ from cinder.i18n import _
from cinder.openstack.common import fileutils from cinder.openstack.common import fileutils
from cinder.openstack.common import imageutils from cinder.openstack.common import imageutils
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils
from cinder import utils from cinder import utils
from cinder.volume import utils as volume_utils from cinder.volume import utils as volume_utils

279
cinder/openstack/common/lockutils.py
View File

@ -1,279 +0,0 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2011 OpenStack Foundation.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
import errno
import functools
import os
import shutil
import tempfile
import time
import weakref
from eventlet import semaphore
from oslo.config import cfg
from cinder.openstack.common import fileutils
from cinder.openstack.common.gettextutils import _
from cinder.openstack.common import local
from cinder.openstack.common import log as logging
LOG = logging.getLogger(__name__)
util_opts = [
cfg.BoolOpt('disable_process_locking', default=False,
help='Whether to disable inter-process locks'),
cfg.StrOpt('lock_path',
help=('Directory to use for lock files. Default to a '
'temp directory'))
]
CONF = cfg.CONF
CONF.register_opts(util_opts)
def set_defaults(lock_path):
cfg.set_defaults(util_opts, lock_path=lock_path)
class _InterProcessLock(object):
"""Lock implementation which allows multiple locks, working around
issues like bugs.debian.org/cgi-bin/bugreport.cgi?bug=632857 and does
not require any cleanup. Since the lock is always held on a file
descriptor rather than outside of the process, the lock gets dropped
automatically if the process crashes, even if __exit__ is not executed.
There are no guarantees regarding usage by multiple green threads in a
single process here. This lock works only between processes. Exclusive
access between local threads should be achieved using the semaphores
in the @synchronized decorator.
Note these locks are released when the descriptor is closed, so it's not
safe to close the file descriptor while another green thread holds the
lock. Just opening and closing the lock file can break synchronisation,
so lock files must be accessed only using this abstraction.
"""
def __init__(self, name):
self.lockfile = None
self.fname = name
def __enter__(self):
self.lockfile = open(self.fname, 'w')
while True:
try:
# Using non-blocking locks since green threads are not
# patched to deal with blocking locking calls.
# Also upon reading the MSDN docs for locking(), it seems
# to have a laughable 10 attempts "blocking" mechanism.
self.trylock()
return self
except IOError as e:
if e.errno in (errno.EACCES, errno.EAGAIN):
# external locks synchronise things like iptables
# updates - give it some time to prevent busy spinning
time.sleep(0.01)
else:
raise
def __exit__(self, exc_type, exc_val, exc_tb):
try:
self.unlock()
self.lockfile.close()
except IOError:
LOG.exception(_("Could not release the acquired lock `%s`"),
self.fname)
def trylock(self):
raise NotImplementedError()
def unlock(self):
raise NotImplementedError()
class _WindowsLock(_InterProcessLock):
def trylock(self):
msvcrt.locking(self.lockfile.fileno(), msvcrt.LK_NBLCK, 1)
def unlock(self):
msvcrt.locking(self.lockfile.fileno(), msvcrt.LK_UNLCK, 1)
class _PosixLock(_InterProcessLock):
def trylock(self):
fcntl.lockf(self.lockfile, fcntl.LOCK_EX | fcntl.LOCK_NB)
def unlock(self):
fcntl.lockf(self.lockfile, fcntl.LOCK_UN)
if os.name == 'nt':
import msvcrt
InterProcessLock = _WindowsLock
else:
import fcntl
InterProcessLock = _PosixLock
_semaphores = weakref.WeakValueDictionary()
def synchronized(name, lock_file_prefix, external=False, lock_path=None):
"""Synchronization decorator.
Decorating a method like so::
@synchronized('mylock')
def foo(self, *args):
...
ensures that only one thread will execute the foo method at a time.
Different methods can share the same lock::
@synchronized('mylock')
def foo(self, *args):
...
@synchronized('mylock')
def bar(self, *args):
...
This way only one of either foo or bar can be executing at a time.
:param lock_file_prefix: The lock_file_prefix argument is used to provide
lock files on disk with a meaningful prefix. The prefix should end with a
hyphen ('-') if specified.
:param external: The external keyword argument denotes whether this lock
should work across multiple processes. This means that if two different
workers both run a method decorated with @synchronized('mylock',
external=True), only one of them will execute at a time.
:param lock_path: The lock_path keyword argument is used to specify a
special location for external lock files to live. If nothing is set, then
CONF.lock_path is used as a default.
"""
def wrap(f):
@functools.wraps(f)
def inner(*args, **kwargs):
# NOTE(soren): If we ever go natively threaded, this will be racy.
# See http://stackoverflow.com/questions/5390569/dyn
# amically-allocating-and-destroying-mutexes
sem = _semaphores.get(name, semaphore.Semaphore())
if name not in _semaphores:
# this check is not racy - we're already holding ref locally
# so GC won't remove the item and there was no IO switch
# (only valid in greenthreads)
_semaphores[name] = sem
with sem:
LOG.debug(_('Got semaphore "%(lock)s" for method '
'"%(method)s"...'), {'lock': name,
'method': f.__name__})
# NOTE(mikal): I know this looks odd
if not hasattr(local.strong_store, 'locks_held'):
local.strong_store.locks_held = []
local.strong_store.locks_held.append(name)
try:
if external and not CONF.disable_process_locking:
LOG.debug(_('Attempting to grab file lock "%(lock)s" '
'for method "%(method)s"...'),
{'lock': name, 'method': f.__name__})
cleanup_dir = False
# We need a copy of lock_path because it is non-local
local_lock_path = lock_path
if not local_lock_path:
local_lock_path = CONF.lock_path
if not local_lock_path:
cleanup_dir = True
local_lock_path = tempfile.mkdtemp()
if not os.path.exists(local_lock_path):
fileutils.ensure_tree(local_lock_path)
# NOTE(mikal): the lock name cannot contain directory
# separators
safe_name = name.replace(os.sep, '_')
lock_file_name = '%s%s' % (lock_file_prefix, safe_name)
lock_file_path = os.path.join(local_lock_path,
lock_file_name)
try:
lock = InterProcessLock(lock_file_path)
with lock:
LOG.debug(_('Got file lock "%(lock)s" at '
'%(path)s for method '
'"%(method)s"...'),
{'lock': name,
'path': lock_file_path,
'method': f.__name__})
retval = f(*args, **kwargs)
finally:
LOG.debug(_('Released file lock "%(lock)s" at '
'%(path)s for method "%(method)s"...'),
{'lock': name,
'path': lock_file_path,
'method': f.__name__})
# NOTE(vish): This removes the tempdir if we needed
# to create one. This is used to
# cleanup the locks left behind by unit
# tests.
if cleanup_dir:
shutil.rmtree(local_lock_path)
else:
retval = f(*args, **kwargs)
finally:
local.strong_store.locks_held.remove(name)
return retval
return inner
return wrap
def synchronized_with_prefix(lock_file_prefix):
"""Partial object generator for the synchronization decorator.
Redefine @synchronized in each project like so::
(in nova/utils.py)
from nova.openstack.common import lockutils
synchronized = lockutils.synchronized_with_prefix('nova-')
(in nova/foo.py)
from nova import utils
@utils.synchronized('mylock')
def bar(self, *args):
...
The lock_file_prefix argument is used to provide lock files on disk with a
meaningful prefix. The prefix should end with a hyphen ('-') if specified.
"""
return functools.partial(synchronized, lock_file_prefix=lock_file_prefix)

289
cinder/openstack/common/processutils.py
View File

@ -1,289 +0,0 @@
# Copyright 2011 OpenStack Foundation.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
"""
System-level utilities and helper functions.
"""
import errno
import logging
import multiprocessing
import os
import random
import shlex
import signal
from eventlet.green import subprocess
from eventlet import greenthread
import six
from cinder.openstack.common.gettextutils import _
from cinder.openstack.common import strutils
LOG = logging.getLogger(__name__)
class InvalidArgumentError(Exception):
def __init__(self, message=None):
super(InvalidArgumentError, self).__init__(message)
class UnknownArgumentError(Exception):
def __init__(self, message=None):
super(UnknownArgumentError, self).__init__(message)
class ProcessExecutionError(Exception):
def __init__(self, stdout=None, stderr=None, exit_code=None, cmd=None,
description=None):
self.exit_code = exit_code
self.stderr = stderr
self.stdout = stdout
self.cmd = cmd
self.description = description
if description is None:
description = _("Unexpected error while running command.")
if exit_code is None:
exit_code = '-'
message = _('%(description)s\n'
'Command: %(cmd)s\n'
'Exit code: %(exit_code)s\n'
'Stdout: %(stdout)r\n'
'Stderr: %(stderr)r') % {'description': description,
'cmd': cmd,
'exit_code': exit_code,
'stdout': stdout,
'stderr': stderr}
super(ProcessExecutionError, self).__init__(message)
class NoRootWrapSpecified(Exception):
def __init__(self, message=None):
super(NoRootWrapSpecified, self).__init__(message)
def _subprocess_setup():
# Python installs a SIGPIPE handler by default. This is usually not what
# non-Python subprocesses expect.
signal.signal(signal.SIGPIPE, signal.SIG_DFL)
def execute(*cmd, **kwargs):
"""Helper method to shell out and execute a command through subprocess.
Allows optional retry.
:param cmd: Passed to subprocess.Popen.
:type cmd: string
:param process_input: Send to opened process.
:type process_input: string
:param env_variables: Environment variables and their values that
will be set for the process.
:type env_variables: dict
:param check_exit_code: Single bool, int, or list of allowed exit
codes. Defaults to [0]. Raise
:class:`ProcessExecutionError` unless
program exits with one of these code.
:type check_exit_code: boolean, int, or [int]
:param delay_on_retry: True | False. Defaults to True. If set to True,
wait a short amount of time before retrying.
:type delay_on_retry: boolean
:param attempts: How many times to retry cmd.
:type attempts: int
:param run_as_root: True | False. Defaults to False. If set to True,
the command is prefixed by the command specified
in the root_helper kwarg.
:type run_as_root: boolean
:param root_helper: command to prefix to commands called with
run_as_root=True
:type root_helper: string
:param shell: whether or not there should be a shell used to
execute this command. Defaults to false.
:type shell: boolean
:param loglevel: log level for execute commands.
:type loglevel: int. (Should be logging.DEBUG or logging.INFO)
:returns: (stdout, stderr) from process execution
:raises: :class:`UnknownArgumentError` on
receiving unknown arguments
:raises: :class:`ProcessExecutionError`
"""
process_input = kwargs.pop('process_input', None)
env_variables = kwargs.pop('env_variables', None)
check_exit_code = kwargs.pop('check_exit_code', [0])
ignore_exit_code = False
delay_on_retry = kwargs.pop('delay_on_retry', True)
attempts = kwargs.pop('attempts', 1)
run_as_root = kwargs.pop('run_as_root', False)
root_helper = kwargs.pop('root_helper', '')
shell = kwargs.pop('shell', False)
loglevel = kwargs.pop('loglevel', logging.DEBUG)
if isinstance(check_exit_code, bool):
ignore_exit_code = not check_exit_code
check_exit_code = [0]
elif isinstance(check_exit_code, int):
check_exit_code = [check_exit_code]
if kwargs:
raise UnknownArgumentError(_('Got unknown keyword args: %r') % kwargs)
if run_as_root and hasattr(os, 'geteuid') and os.geteuid() != 0:
if not root_helper:
raise NoRootWrapSpecified(
message=_('Command requested root, but did not '
'specify a root helper.'))
cmd = shlex.split(root_helper) + list(cmd)
cmd = map(str, cmd)
sanitized_cmd = strutils.mask_password(' '.join(cmd))
while attempts > 0:
attempts -= 1
try:
LOG.log(loglevel, _('Running cmd (subprocess): %s'), sanitized_cmd)
_PIPE = subprocess.PIPE # pylint: disable=E1101
if os.name == 'nt':
preexec_fn = None
close_fds = False
else:
preexec_fn = _subprocess_setup
close_fds = True
obj = subprocess.Popen(cmd,
stdin=_PIPE,
stdout=_PIPE,
stderr=_PIPE,
close_fds=close_fds,
preexec_fn=preexec_fn,
shell=shell,
env=env_variables)
result = None
for _i in six.moves.range(20):
# NOTE(russellb) 20 is an arbitrary number of retries to
# prevent any chance of looping forever here.
try:
if process_input is not None:
result = obj.communicate(process_input)
else:
result = obj.communicate()
except OSError as e:
if e.errno in (errno.EAGAIN, errno.EINTR):
continue
raise
break
obj.stdin.close() # pylint: disable=E1101
_returncode = obj.returncode # pylint: disable=E1101
LOG.log(loglevel, 'Result was %s' % _returncode)
if not ignore_exit_code and _returncode not in check_exit_code:
(stdout, stderr) = result
sanitized_stdout = strutils.mask_password(stdout)
sanitized_stderr = strutils.mask_password(stderr)
raise ProcessExecutionError(exit_code=_returncode,
stdout=sanitized_stdout,
stderr=sanitized_stderr,
cmd=sanitized_cmd)
return result
except ProcessExecutionError:
if not attempts:
raise
else:
LOG.log(loglevel, _('%r failed. Retrying.'), sanitized_cmd)
if delay_on_retry:
greenthread.sleep(random.randint(20, 200) / 100.0)
finally:
# NOTE(termie): this appears to be necessary to let the subprocess
# call clean something up in between calls, without
# it two execute calls in a row hangs the second one
greenthread.sleep(0)
def trycmd(*args, **kwargs):
"""A wrapper around execute() to more easily handle warnings and errors.
Returns an (out, err) tuple of strings containing the output of
the command's stdout and stderr. If 'err' is not empty then the
command can be considered to have failed.
:discard_warnings True | False. Defaults to False. If set to True,
then for succeeding commands, stderr is cleared
"""
discard_warnings = kwargs.pop('discard_warnings', False)
try:
out, err = execute(*args, **kwargs)
failed = False
except ProcessExecutionError as exn:
out, err = '', six.text_type(exn)
failed = True
if not failed and discard_warnings and err:
# Handle commands that output to stderr but otherwise succeed
err = ''
return out, err
def ssh_execute(ssh, cmd, process_input=None,
addl_env=None, check_exit_code=True):
sanitized_cmd = strutils.mask_password(cmd)
LOG.debug('Running cmd (SSH): %s', sanitized_cmd)
if addl_env:
raise InvalidArgumentError(_('Environment not supported over SSH'))
if process_input:
# This is (probably) fixable if we need it...
raise InvalidArgumentError(_('process_input not supported over SSH'))
stdin_stream, stdout_stream, stderr_stream = ssh.exec_command(cmd)
channel = stdout_stream.channel
# NOTE(justinsb): This seems suspicious...
# ...other SSH clients have buffering issues with this approach
stdout = stdout_stream.read()
sanitized_stdout = strutils.mask_password(stdout)
stderr = stderr_stream.read()
sanitized_stderr = strutils.mask_password(stderr)
stdin_stream.close()
exit_status = channel.recv_exit_status()
# exit_status == -1 if no exit code was returned
if exit_status != -1:
LOG.debug('Result was %s' % exit_status)
if check_exit_code and exit_status != 0:
raise ProcessExecutionError(exit_code=exit_status,
stdout=sanitized_stdout,
stderr=sanitized_stderr,
cmd=sanitized_cmd)
return (sanitized_stdout, sanitized_stderr)
def get_worker_count():
"""Utility to get the default worker count.
@return: The number of CPUs if that can be determined, else a default
worker count of 1 is returned.
"""
try:
return multiprocessing.cpu_count()
except NotImplementedError:
return 1

2
cinder/service.py
View File

@ -22,6 +22,7 @@ import inspect
import os import os
import random import random
from oslo.concurrency import processutils
from oslo.config import cfg from oslo.config import cfg
from oslo.db import exception as db_exc from oslo.db import exception as db_exc
from oslo import messaging from oslo import messaging
@ -36,7 +37,6 @@ from cinder import exception
from cinder.i18n import _ from cinder.i18n import _
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import loopingcall from cinder.openstack.common import loopingcall
from cinder.openstack.common import processutils
from cinder.openstack.common import service from cinder.openstack.common import service
from cinder import rpc from cinder import rpc
from cinder import version from cinder import version

9
cinder/test.py
View File

@ -24,13 +24,14 @@ inline callbacks.
import logging import logging
import os import os
import shutil import shutil
import tempfile
import uuid import uuid
import fixtures import fixtures
import mock import mock
import mox import mox
from oslo.concurrency import lockutils
from oslo.config import cfg from oslo.config import cfg
from oslo.config import fixture as config_fixture
from oslo.messaging import conffixture as messaging_conffixture from oslo.messaging import conffixture as messaging_conffixture
from oslo.utils import strutils from oslo.utils import strutils
from oslo.utils import timeutils from oslo.utils import timeutils
@ -187,7 +188,11 @@ class TestCase(testtools.TestCase):
self.override_config('fatal_exception_format_errors', True) self.override_config('fatal_exception_format_errors', True)
# This will be cleaned up by the NestedTempfile fixture # This will be cleaned up by the NestedTempfile fixture
self.override_config('lock_path', tempfile.mkdtemp()) lock_path = self.useFixture(fixtures.TempDir()).path
self.fixture = self.useFixture(
config_fixture.Config(lockutils.CONF))
self.fixture.config(lock_path=lock_path,
group='oslo_concurrency')
self.override_config('policy_file', self.override_config('policy_file',
os.path.join( os.path.join(
os.path.abspath( os.path.abspath(

13
cinder/tests/api/contrib/test_admin_actions.py
View File

@ -11,9 +11,11 @@
# under the License. # under the License.
import ast import ast
import tempfile
import fixtures
from oslo.concurrency import lockutils
from oslo.config import cfg from oslo.config import cfg
from oslo.config import fixture as config_fixture
from oslo.serialization import jsonutils from oslo.serialization import jsonutils
from oslo.utils import timeutils from oslo.utils import timeutils
import webob import webob
@ -45,10 +47,13 @@ class AdminActionsTest(test.TestCase):
def setUp(self): def setUp(self):
super(AdminActionsTest, self).setUp() super(AdminActionsTest, self).setUp()
self.tempdir = tempfile.mkdtemp() self.tempdir = self.useFixture(fixtures.TempDir()).path
self.fixture = self.useFixture(config_fixture.Config(lockutils.CONF))
self.fixture.config(lock_path=self.tempdir,
group='oslo_concurrency')
self.fixture.config(disable_process_locking=True,
group='oslo_concurrency')
self.flags(rpc_backend='cinder.openstack.common.rpc.impl_fake') self.flags(rpc_backend='cinder.openstack.common.rpc.impl_fake')
self.flags(lock_path=self.tempdir,
disable_process_locking=True)
self.volume_api = volume_api.API() self.volume_api = volume_api.API()
cast_as_call.mock_cast_as_call(self.volume_api.volume_rpcapi.client) cast_as_call.mock_cast_as_call(self.volume_api.volume_rpcapi.client)

3
cinder/tests/brick/test_brick_connector.py
View File

@ -16,13 +16,14 @@ import os.path
import string import string
import time import time
from oslo.concurrency import processutils as putils
from cinder.brick import exception from cinder.brick import exception
from cinder.brick.initiator import connector from cinder.brick.initiator import connector
from cinder.brick.initiator import host_driver from cinder.brick.initiator import host_driver
from cinder.i18n import _ from cinder.i18n import _
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import loopingcall from cinder.openstack.common import loopingcall
from cinder.openstack.common import processutils as putils
from cinder import test from cinder import test
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
cinder/tests/brick/test_brick_lvm.py
View File

@ -14,11 +14,11 @@
# under the License. # under the License.
import mox import mox
from oslo.concurrency import processutils
from cinder.brick import exception from cinder.brick import exception
from cinder.brick.local_dev import lvm as brick from cinder.brick.local_dev import lvm as brick
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils
from cinder import test from cinder import test
from cinder.volume import configuration as conf from cinder.volume import configuration as conf

2
cinder/tests/fake_utils.py
View File

@ -17,9 +17,9 @@
import re import re
from eventlet import greenthread from eventlet import greenthread
from oslo.concurrency import processutils
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils
from cinder import utils from cinder import utils
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
cinder/tests/test_backup_ceph.py
View File

@ -21,6 +21,7 @@ import tempfile
import uuid import uuid
import mock import mock
from oslo.concurrency import processutils
from oslo.serialization import jsonutils from oslo.serialization import jsonutils
import six import six
@ -31,7 +32,6 @@ from cinder import db
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils
from cinder import test from cinder import test
from cinder.volume.drivers import rbd as rbddriver from cinder.volume.drivers import rbd as rbddriver

3
cinder/tests/test_backup_tsm.py
View File

@ -22,12 +22,13 @@ import json
import os import os
import posix import posix
from oslo.concurrency import processutils as putils
from cinder.backup.drivers import tsm from cinder.backup.drivers import tsm
from cinder import context from cinder import context
from cinder import db from cinder import db
from cinder import exception from cinder import exception
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils as putils
from cinder import test from cinder import test
from cinder import utils from cinder import utils

6
cinder/tests/test_emc_vnxdirect.py
View File

@ -17,9 +17,9 @@ import os
import re import re
import mock import mock
from oslo.concurrency import processutils
from cinder import exception from cinder import exception
from cinder.openstack.common import processutils
from cinder import test from cinder import test
from cinder.volume import configuration as conf from cinder.volume import configuration as conf
from cinder.volume.drivers.emc.emc_cli_fc import EMCCLIFCDriver from cinder.volume.drivers.emc.emc_cli_fc import EMCCLIFCDriver
@ -1155,7 +1155,7 @@ Time Remaining: 0 second(s)
fake_cli.assert_has_calls(expect_cmd) fake_cli.assert_has_calls(expect_cmd)
@mock.patch( @mock.patch(
"cinder.openstack.common.processutils.execute", "oslo.concurrency.processutils.execute",
mock.Mock( mock.Mock(
return_value=( return_value=(
"fakeportal iqn.1992-04.fake.com:fake.apm00123907237.a8", 0))) "fakeportal iqn.1992-04.fake.com:fake.apm00123907237.a8", 0)))
@ -2474,7 +2474,7 @@ class EMCVNXCLIDriverFCTestCase(test.TestCase):
return None return None
@mock.patch( @mock.patch(
"cinder.openstack.common.processutils.execute", "oslo.concurrency.processutils.execute",
mock.Mock( mock.Mock(
return_value=( return_value=(
"fakeportal iqn.1992-04.fake.com:fake.apm00123907237.a8", 0))) "fakeportal iqn.1992-04.fake.com:fake.apm00123907237.a8", 0)))

2
cinder/tests/test_eqlx.py
View File

@ -16,12 +16,12 @@
import time import time
import mox import mox
from oslo.concurrency import processutils
import paramiko import paramiko
from cinder import context from cinder import context
from cinder import exception from cinder import exception
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils
from cinder import test from cinder import test
from cinder.volume import configuration as conf from cinder.volume import configuration as conf
from cinder.volume.drivers import eqlx from cinder.volume.drivers import eqlx

2
cinder/tests/test_glusterfs.py
View File

@ -26,6 +26,7 @@ import mox as mox_lib
from mox import IgnoreArg from mox import IgnoreArg
from mox import IsA from mox import IsA
from mox import stubout from mox import stubout
from oslo.concurrency import processutils as putils
from oslo.config import cfg from oslo.config import cfg
from oslo.utils import units from oslo.utils import units
@ -37,7 +38,6 @@ from cinder import exception
from cinder.i18n import _ from cinder.i18n import _
from cinder.image import image_utils from cinder.image import image_utils
from cinder.openstack.common import imageutils from cinder.openstack.common import imageutils
from cinder.openstack.common import processutils as putils
from cinder import test from cinder import test
from cinder import utils from cinder import utils
from cinder.volume import configuration as conf from cinder.volume import configuration as conf

2
cinder/tests/test_gpfs.py
View File

@ -18,6 +18,7 @@ import shutil
import tempfile import tempfile
import mock import mock
from oslo.concurrency import processutils
from oslo.config import cfg from oslo.config import cfg
from oslo.utils import units from oslo.utils import units
@ -25,7 +26,6 @@ from cinder import context
from cinder import exception from cinder import exception
from cinder.image import image_utils from cinder.image import image_utils
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils
from cinder import test from cinder import test
from cinder import utils from cinder import utils
from cinder.volume import configuration as conf from cinder.volume import configuration as conf

10
cinder/tests/test_ibmnas.py
View File

@ -180,7 +180,7 @@ class IBMNASDriverTestCase(test.TestCase):
@mock.patch('cinder.volume.drivers.ibm.ibmnas.IBMNAS_NFSDriver.' @mock.patch('cinder.volume.drivers.ibm.ibmnas.IBMNAS_NFSDriver.'
'_ssh_operation') '_ssh_operation')
@mock.patch('cinder.openstack.common.processutils.execute') @mock.patch('oslo.concurrency.processutils.execute')
def test_create_ibmnas_snap_mount_point_provided(self, mock_ssh, def test_create_ibmnas_snap_mount_point_provided(self, mock_ssh,
mock_execute): mock_execute):
"""Create ibmnas snap if mount point is provided.""" """Create ibmnas snap if mount point is provided."""
@ -195,7 +195,7 @@ class IBMNASDriverTestCase(test.TestCase):
@mock.patch('cinder.volume.drivers.ibm.ibmnas.IBMNAS_NFSDriver.' @mock.patch('cinder.volume.drivers.ibm.ibmnas.IBMNAS_NFSDriver.'
'_ssh_operation') '_ssh_operation')
@mock.patch('cinder.openstack.common.processutils.execute') @mock.patch('oslo.concurrency.processutils.execute')
def test_create_ibmnas_snap_nas_gpfs(self, mock_execute, mock_ssh): def test_create_ibmnas_snap_nas_gpfs(self, mock_execute, mock_ssh):
"""Create ibmnas snap if mount point is provided.""" """Create ibmnas snap if mount point is provided."""
@ -300,7 +300,7 @@ class IBMNASDriverTestCase(test.TestCase):
self.TEST_EXTEND_SIZE_IN_GB) self.TEST_EXTEND_SIZE_IN_GB)
@mock.patch('cinder.volume.drivers.ibm.ibmnas.IBMNAS_NFSDriver._run_ssh') @mock.patch('cinder.volume.drivers.ibm.ibmnas.IBMNAS_NFSDriver._run_ssh')
@mock.patch('cinder.openstack.common.processutils.execute') @mock.patch('oslo.concurrency.processutils.execute')
def test_delete_snapfiles(self, mock_execute, mock_ssh): def test_delete_snapfiles(self, mock_execute, mock_ssh):
"""Delete_snapfiles test case.""" """Delete_snapfiles test case."""
@ -316,7 +316,7 @@ class IBMNASDriverTestCase(test.TestCase):
self.TEST_MNT_POINT) self.TEST_MNT_POINT)
@mock.patch('cinder.volume.drivers.ibm.ibmnas.IBMNAS_NFSDriver._run_ssh') @mock.patch('cinder.volume.drivers.ibm.ibmnas.IBMNAS_NFSDriver._run_ssh')
@mock.patch('cinder.openstack.common.processutils.execute') @mock.patch('oslo.concurrency.processutils.execute')
def test_delete_snapfiles_nas_gpfs(self, mock_execute, mock_ssh): def test_delete_snapfiles_nas_gpfs(self, mock_execute, mock_ssh):
"""Delete_snapfiles for gpfs-nas platform test case.""" """Delete_snapfiles for gpfs-nas platform test case."""
@ -397,7 +397,7 @@ class IBMNASDriverTestCase(test.TestCase):
'_get_provider_location') '_get_provider_location')
@mock.patch('cinder.volume.drivers.ibm.ibmnas.IBMNAS_NFSDriver.' @mock.patch('cinder.volume.drivers.ibm.ibmnas.IBMNAS_NFSDriver.'
'_get_mount_point_for_share') '_get_mount_point_for_share')
@mock.patch('cinder.openstack.common.processutils.execute') @mock.patch('oslo.concurrency.processutils.execute')
def test_delete_snapshot(self, mock_execute, mock_mount, mock_provider): def test_delete_snapshot(self, mock_execute, mock_mount, mock_provider):
"""Delete snapshot simple test case.""" """Delete snapshot simple test case."""

2
cinder/tests/test_image_utils.py
View File

@ -20,6 +20,7 @@ import tempfile
import mock import mock
import mox import mox
from oslo.concurrency import processutils
from oslo.config import cfg from oslo.config import cfg
from oslo.utils import units from oslo.utils import units
@ -27,7 +28,6 @@ from cinder import context
from cinder import exception from cinder import exception
from cinder.image import image_utils from cinder.image import image_utils
from cinder.openstack.common import fileutils from cinder.openstack.common import fileutils
from cinder.openstack.common import processutils
from cinder import test from cinder import test
from cinder import utils from cinder import utils
from cinder.volume import utils as volume_utils from cinder.volume import utils as volume_utils

2
cinder/tests/test_netapp_utils.py
View File

@ -15,8 +15,8 @@
import platform import platform
import mock import mock
from oslo.concurrency import processutils as putils
from cinder.openstack.common import processutils as putils
from cinder import test from cinder import test
from cinder import version from cinder import version
from cinder.volume.drivers.netapp import utils as na_utils from cinder.volume.drivers.netapp import utils as na_utils

2
cinder/tests/test_pure.py
View File

@ -17,10 +17,10 @@ import json
import urllib2 import urllib2
import mock import mock
from oslo.concurrency import processutils
from oslo.utils import units from oslo.utils import units
from cinder import exception from cinder import exception
from cinder.openstack.common import processutils
from cinder import test from cinder import test
from cinder.volume.drivers import pure from cinder.volume.drivers import pure

2
cinder/tests/test_service.py
View File

@ -22,6 +22,7 @@ Unit Tests for remote procedure calls using queue
import mock import mock
import mox import mox
from oslo.concurrency import processutils
from oslo.config import cfg from oslo.config import cfg
from oslo.db import exception as db_exc from oslo.db import exception as db_exc
@ -29,7 +30,6 @@ from cinder import context
from cinder import db from cinder import db
from cinder import exception from cinder import exception
from cinder import manager from cinder import manager
from cinder.openstack.common import processutils
from cinder import service from cinder import service
from cinder import test from cinder import test
from cinder import wsgi from cinder import wsgi

2
cinder/tests/test_sheepdog.py
View File

@ -19,10 +19,10 @@ import contextlib
import os import os
import tempfile import tempfile
from oslo.concurrency import processutils
from oslo.utils import units from oslo.utils import units
from cinder.image import image_utils from cinder.image import image_utils
from cinder.openstack.common import processutils
from cinder import test from cinder import test
from cinder.volume.drivers.sheepdog import SheepdogDriver from cinder.volume.drivers.sheepdog import SheepdogDriver

2
cinder/tests/test_storwize_svc.py
View File

@ -23,6 +23,7 @@ import re
import time import time
import mock import mock
from oslo.concurrency import processutils
from oslo.utils import excutils from oslo.utils import excutils
from oslo.utils import importutils from oslo.utils import importutils
from oslo.utils import units from oslo.utils import units
@ -31,7 +32,6 @@ from cinder import context
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils
from cinder import test from cinder import test
from cinder.tests import utils as testutils from cinder.tests import utils as testutils
from cinder import utils from cinder import utils

2
cinder/tests/test_utils.py
View File

@ -21,6 +21,7 @@ import tempfile
import uuid import uuid
import mock import mock
from oslo.concurrency import processutils as putils
from oslo.config import cfg from oslo.config import cfg
from oslo.utils import timeutils from oslo.utils import timeutils
import paramiko import paramiko
@ -30,7 +31,6 @@ import cinder
from cinder.brick.initiator import connector from cinder.brick.initiator import connector
from cinder.brick.initiator import linuxfc from cinder.brick.initiator import linuxfc
from cinder import exception from cinder import exception
from cinder.openstack.common import processutils as putils
from cinder import ssh_utils from cinder import ssh_utils
from cinder import test from cinder import test
from cinder import utils from cinder import utils

2
cinder/tests/test_volume_utils.py
View File

@ -19,6 +19,7 @@ import os
import re import re
import mock import mock
from oslo.concurrency import processutils
from oslo.config import cfg from oslo.config import cfg
from oslo.utils import importutils from oslo.utils import importutils
@ -26,7 +27,6 @@ from cinder import context
from cinder import db from cinder import db
from cinder import exception from cinder import exception
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils
from cinder import test from cinder import test
from cinder.tests import fake_notifier from cinder.tests import fake_notifier
from cinder import utils from cinder import utils

2
cinder/tests/zonemanager/test_brcd_fc_zone_client_cli.py
View File

@ -21,10 +21,10 @@
import mock import mock
from mock import patch from mock import patch
from oslo.concurrency import processutils
from cinder import exception from cinder import exception
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils
from cinder import test from cinder import test
from cinder.zonemanager.drivers.brocade.brcd_fc_zone_client_cli \ from cinder.zonemanager.drivers.brocade.brcd_fc_zone_client_cli \
import BrcdFCZoneClientCLI import BrcdFCZoneClientCLI

2
cinder/tests/zonemanager/test_cisco_fc_zone_client_cli.py
View File

@ -18,9 +18,9 @@
"""Unit tests for Cisco fc zone client cli.""" """Unit tests for Cisco fc zone client cli."""
from mock import patch from mock import patch
from oslo.concurrency import processutils
from cinder import exception from cinder import exception
from cinder.openstack.common import processutils
from cinder import test from cinder import test
from cinder.zonemanager.drivers.cisco.cisco_fc_zone_client_cli \ from cinder.zonemanager.drivers.cisco.cisco_fc_zone_client_cli \
import CiscoFCZoneClientCLI import CiscoFCZoneClientCLI

2
cinder/tests/zonemanager/test_cisco_fc_zone_driver.py
View File

@ -17,11 +17,11 @@
"""Unit tests for Cisco FC zone driver.""" """Unit tests for Cisco FC zone driver."""
from oslo.concurrency import processutils
from oslo.config import cfg from oslo.config import cfg
from oslo.utils import importutils from oslo.utils import importutils
from cinder import exception from cinder import exception
from cinder.openstack.common import processutils
from cinder import test from cinder import test
from cinder.volume import configuration as conf from cinder.volume import configuration as conf

4
cinder/utils.py
View File

@ -35,6 +35,8 @@ from xml import sax
from xml.sax import expatreader from xml.sax import expatreader
from xml.sax import saxutils from xml.sax import saxutils
from oslo.concurrency import lockutils
from oslo.concurrency import processutils
from oslo.config import cfg from oslo.config import cfg
from oslo.utils import importutils from oslo.utils import importutils
from oslo.utils import timeutils from oslo.utils import timeutils
@ -43,9 +45,7 @@ import six
from cinder.brick.initiator import connector from cinder.brick.initiator import connector
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _
from cinder.openstack.common import lockutils
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils
CONF = cfg.CONF CONF = cfg.CONF

2
cinder/volume/driver.py
View File

@ -19,6 +19,7 @@ Drivers for volumes.
import time import time
from oslo.concurrency import processutils
from oslo.config import cfg from oslo.config import cfg
from oslo.utils import excutils from oslo.utils import excutils
@ -27,7 +28,6 @@ from cinder.i18n import _, _LE
from cinder.image import image_utils from cinder.image import image_utils
from cinder.openstack.common import fileutils from cinder.openstack.common import fileutils
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils
from cinder import utils from cinder import utils
from cinder.volume import iscsi from cinder.volume import iscsi
from cinder.volume import rpcapi as volume_rpcapi from cinder.volume import rpcapi as volume_rpcapi

2
cinder/volume/drivers/coraid.py
View File

@ -26,6 +26,7 @@ import math
import urllib import urllib
import urllib2 import urllib2
from oslo.concurrency import lockutils
from oslo.config import cfg from oslo.config import cfg
from oslo.serialization import jsonutils from oslo.serialization import jsonutils
from oslo.utils import units from oslo.utils import units
@ -33,7 +34,6 @@ import six.moves.urllib.parse as urlparse
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _
from cinder.openstack.common import lockutils
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.volume import driver from cinder.volume import driver
from cinder.volume import volume_types from cinder.volume import volume_types

4
cinder/volume/drivers/emc/emc_vnx_cli.py
View File

@ -21,6 +21,8 @@ import random
import re import re
import time import time
from oslo.concurrency import lockutils
from oslo.concurrency import processutils
from oslo.config import cfg from oslo.config import cfg
from oslo.serialization import jsonutils as json from oslo.serialization import jsonutils as json
from oslo.utils import excutils from oslo.utils import excutils
@ -30,10 +32,8 @@ import six
from cinder import exception from cinder import exception
from cinder.exception import EMCVnxCLICmdError from cinder.exception import EMCVnxCLICmdError
from cinder.i18n import _, _LE, _LI, _LW from cinder.i18n import _, _LE, _LI, _LW
from cinder.openstack.common import lockutils
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import loopingcall from cinder.openstack.common import loopingcall
from cinder.openstack.common import processutils
from cinder import utils from cinder import utils
from cinder.volume.configuration import Configuration from cinder.volume.configuration import Configuration
from cinder.volume.drivers.san import san from cinder.volume.drivers.san import san

2
cinder/volume/drivers/eqlx.py
View File

@ -21,13 +21,13 @@ import random
import eventlet import eventlet
from eventlet import greenthread from eventlet import greenthread
import greenlet import greenlet
from oslo.concurrency import processutils
from oslo.config import cfg from oslo.config import cfg
from oslo.utils import excutils from oslo.utils import excutils
from cinder import exception from cinder import exception
from cinder.i18n import _, _LE, _LW, _LI from cinder.i18n import _, _LE, _LW, _LI
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils
from cinder import ssh_utils from cinder import ssh_utils
from cinder import utils from cinder import utils
from cinder.volume.drivers.san import SanISCSIDriver from cinder.volume.drivers.san import SanISCSIDriver

2
cinder/volume/drivers/fujitsu_eternus_dx_fc.py
View File

@ -17,10 +17,10 @@
FC Drivers for ETERNUS DX arrays based on SMI-S. FC Drivers for ETERNUS DX arrays based on SMI-S.
""" """
from oslo.concurrency import lockutils
import six import six
from cinder import context from cinder import context
from cinder.openstack.common import lockutils
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.volume import driver from cinder.volume import driver
from cinder.volume.drivers import fujitsu_eternus_dx_common from cinder.volume.drivers import fujitsu_eternus_dx_common

2
cinder/volume/drivers/fujitsu_eternus_dx_iscsi.py
View File

@ -17,12 +17,12 @@
ISCSI Drivers for ETERNUS DX arrays based on SMI-S. ISCSI Drivers for ETERNUS DX arrays based on SMI-S.
""" """
from oslo.concurrency import lockutils
import six import six
from cinder import context from cinder import context
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _
from cinder.openstack.common import lockutils
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.volume import driver from cinder.volume import driver
from cinder.volume.drivers import fujitsu_eternus_dx_common from cinder.volume.drivers import fujitsu_eternus_dx_common

2
cinder/volume/drivers/glusterfs.py
View File

@ -18,6 +18,7 @@ import os
import stat import stat
import time import time
from oslo.concurrency import processutils
from oslo.config import cfg from oslo.config import cfg
from oslo.utils import units from oslo.utils import units
@ -29,7 +30,6 @@ from cinder.i18n import _, _LE, _LI, _LW
from cinder.image import image_utils from cinder.image import image_utils
from cinder.openstack.common import fileutils from cinder.openstack.common import fileutils
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils
from cinder import utils from cinder import utils
from cinder.volume.drivers import remotefs as remotefs_drv from cinder.volume.drivers import remotefs as remotefs_drv

2
cinder/volume/drivers/hds/nfs.py
View File

@ -21,6 +21,7 @@ import os
import time import time
from xml.etree import ElementTree as ETree from xml.etree import ElementTree as ETree
from oslo.concurrency import processutils
from oslo.config import cfg from oslo.config import cfg
from oslo.utils import excutils from oslo.utils import excutils
from oslo.utils import units from oslo.utils import units
@ -29,7 +30,6 @@ from cinder import exception
from cinder.i18n import _, _LE, _LI from cinder.i18n import _, _LE, _LI
from cinder.image import image_utils from cinder.image import image_utils
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils
from cinder.volume.drivers.hds.hnas_backend import HnasBackend from cinder.volume.drivers.hds.hnas_backend import HnasBackend
from cinder.volume.drivers import nfs from cinder.volume.drivers import nfs

4
cinder/volume/drivers/hitachi/hbsd_basiclib.py
View File

@ -16,14 +16,14 @@ import inspect
import os import os
import shlex import shlex
from oslo.concurrency import lockutils
from oslo.concurrency import processutils as putils
from oslo.utils import excutils from oslo.utils import excutils
import six import six
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _
from cinder.openstack.common import lockutils
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils as putils
from cinder import utils from cinder import utils
SMPL = 1 SMPL = 1

2
cinder/volume/drivers/hitachi/hbsd_horcm.py
View File

@ -20,6 +20,7 @@ import shlex
import threading import threading
import time import time
from oslo.concurrency import processutils as putils
from oslo.config import cfg from oslo.config import cfg
from oslo.utils import excutils from oslo.utils import excutils
import six import six
@ -28,7 +29,6 @@ from cinder import exception
from cinder.i18n import _ from cinder.i18n import _
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import loopingcall from cinder.openstack.common import loopingcall
from cinder.openstack.common import processutils as putils
from cinder import utils from cinder import utils
from cinder.volume.drivers.hitachi import hbsd_basiclib as basic_lib from cinder.volume.drivers.hitachi import hbsd_basiclib as basic_lib

2
cinder/volume/drivers/ibm/gpfs.py
View File

@ -21,6 +21,7 @@ import os
import re import re
import shutil import shutil
from oslo.concurrency import processutils
from oslo.config import cfg from oslo.config import cfg
from oslo.utils import units from oslo.utils import units
@ -29,7 +30,6 @@ from cinder.i18n import _
from cinder.image import image_utils from cinder.image import image_utils
from cinder.openstack.common import fileutils from cinder.openstack.common import fileutils
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils
from cinder import utils from cinder import utils
from cinder.volume import driver from cinder.volume import driver

2
cinder/volume/drivers/ibm/ibmnas.py
View File

@ -32,6 +32,7 @@ Notes:
import os import os
import re import re
from oslo.concurrency import processutils
from oslo.config import cfg from oslo.config import cfg
from oslo.utils import units from oslo.utils import units
@ -39,7 +40,6 @@ from cinder import exception
from cinder.i18n import _, _LI, _LW from cinder.i18n import _, _LI, _LW
from cinder.image import image_utils from cinder.image import image_utils
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils
from cinder import utils from cinder import utils
from cinder.volume.drivers import nfs from cinder.volume.drivers import nfs
from cinder.volume.drivers.remotefs import nas_opts from cinder.volume.drivers.remotefs import nas_opts

3
cinder/volume/drivers/ibm/storwize_svc/ssh.py
View File

@ -16,10 +16,11 @@
import re import re
from oslo.concurrency import processutils
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
cinder/volume/drivers/lvm.py
View File

@ -22,6 +22,7 @@ import math
import os import os
import socket import socket
from oslo.concurrency import processutils
from oslo.config import cfg from oslo.config import cfg
from oslo.utils import units from oslo.utils import units
@ -32,7 +33,6 @@ from cinder.i18n import _, _LE, _LI, _LW
from cinder.image import image_utils from cinder.image import image_utils
from cinder.openstack.common import fileutils from cinder.openstack.common import fileutils
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils
from cinder import utils from cinder import utils
from cinder.volume import driver from cinder.volume import driver
from cinder.volume import utils as volutils from cinder.volume import utils as volutils

2
cinder/volume/drivers/netapp/nfs.py
View File

@ -23,6 +23,7 @@ from threading import Timer
import time import time
import uuid import uuid
from oslo.concurrency import processutils
from oslo.utils import excutils from oslo.utils import excutils
from oslo.utils import units from oslo.utils import units
import six import six
@ -32,7 +33,6 @@ from cinder import exception
from cinder.i18n import _, _LE, _LI, _LW from cinder.i18n import _, _LE, _LI, _LW
from cinder.image import image_utils from cinder.image import image_utils
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils
from cinder import utils from cinder import utils
from cinder.volume.drivers.netapp.api import NaApiError from cinder.volume.drivers.netapp.api import NaApiError
from cinder.volume.drivers.netapp.api import NaElement from cinder.volume.drivers.netapp.api import NaElement

2
cinder/volume/drivers/netapp/utils.py
View File

@ -28,6 +28,7 @@ import platform
import socket import socket
import uuid import uuid
from oslo.concurrency import processutils as putils
from oslo.utils import timeutils from oslo.utils import timeutils
import six import six
@ -35,7 +36,6 @@ from cinder import context
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils as putils
from cinder import utils from cinder import utils
from cinder import version from cinder import version
from cinder.volume.drivers.netapp.api import NaApiError from cinder.volume.drivers.netapp.api import NaApiError

2
cinder/volume/drivers/nfs.py
View File

@ -16,6 +16,7 @@
import errno import errno
import os import os
from oslo.concurrency import processutils as putils
from oslo.config import cfg from oslo.config import cfg
from oslo.utils import units from oslo.utils import units
@ -24,7 +25,6 @@ from cinder import exception
from cinder.i18n import _ from cinder.i18n import _
from cinder.image import image_utils from cinder.image import image_utils
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils as putils
from cinder import utils from cinder import utils
from cinder.volume.drivers import remotefs from cinder.volume.drivers import remotefs

2
cinder/volume/drivers/pure.py
View File

@ -24,6 +24,7 @@ import re
import urllib2 import urllib2
import uuid import uuid
from oslo.concurrency import processutils
from oslo.config import cfg from oslo.config import cfg
from oslo.utils import excutils from oslo.utils import excutils
from oslo.utils import units from oslo.utils import units
@ -31,7 +32,6 @@ from oslo.utils import units
from cinder import exception from cinder import exception
from cinder.i18n import _LE, _LI, _LW from cinder.i18n import _LE, _LI, _LW
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils
from cinder import utils from cinder import utils
from cinder.volume.drivers.san import san from cinder.volume.drivers.san import san

2
cinder/volume/drivers/remotefs.py
View File

@ -20,6 +20,7 @@ import os
import re import re
import tempfile import tempfile
from oslo.concurrency import processutils as putils
from oslo.config import cfg from oslo.config import cfg
from oslo.utils import units from oslo.utils import units
@ -27,7 +28,6 @@ from cinder import exception
from cinder.i18n import _, _LE, _LI, _LW from cinder.i18n import _, _LE, _LI, _LW
from cinder.image import image_utils from cinder.image import image_utils
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils as putils
from cinder.volume import driver from cinder.volume import driver
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py
View File

@ -21,12 +21,12 @@ operations on the SAN.
""" """
from lxml import etree from lxml import etree
from oslo.concurrency import processutils
from oslo.utils import units from oslo.utils import units
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils
from cinder.volume.drivers.san.san import SanISCSIDriver from cinder.volume.drivers.san.san import SanISCSIDriver

2
cinder/volume/drivers/san/san.py
View File

@ -22,13 +22,13 @@ controller on the SAN hardware. We expect to access it over SSH or some API.
import random import random
from eventlet import greenthread from eventlet import greenthread
from oslo.concurrency import processutils
from oslo.config import cfg from oslo.config import cfg
from oslo.utils import excutils from oslo.utils import excutils
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils
from cinder import ssh_utils from cinder import ssh_utils
from cinder import utils from cinder import utils
from cinder.volume import driver from cinder.volume import driver

2
cinder/volume/drivers/sheepdog.py
View File

@ -22,6 +22,7 @@ import os
import re import re
import tempfile import tempfile
from oslo.concurrency import processutils
from oslo.config import cfg from oslo.config import cfg
from oslo.utils import units from oslo.utils import units
@ -29,7 +30,6 @@ from cinder import exception
from cinder.i18n import _, _LE from cinder.i18n import _, _LE
from cinder.image import image_utils from cinder.image import image_utils
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils
from cinder.volume import driver from cinder.volume import driver

2
cinder/volume/drivers/smbfs.py
View File

@ -16,6 +16,7 @@
import os import os
import re import re
from oslo.concurrency import processutils as putils
from oslo.config import cfg from oslo.config import cfg
from oslo.utils import units from oslo.utils import units
@ -24,7 +25,6 @@ from cinder import exception
from cinder.i18n import _ from cinder.i18n import _
from cinder.image import image_utils from cinder.image import image_utils
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils as putils
from cinder import utils from cinder import utils
from cinder.volume.drivers import remotefs as remotefs_drv from cinder.volume.drivers import remotefs as remotefs_drv

2
cinder/volume/flows/manager/create_volume.py
View File

@ -12,6 +12,7 @@
import traceback import traceback
from oslo.concurrency import processutils
from oslo.config import cfg from oslo.config import cfg
from oslo.utils import timeutils from oslo.utils import timeutils
import taskflow.engines import taskflow.engines
@ -23,7 +24,6 @@ from cinder import flow_utils
from cinder.i18n import _, _LE, _LI from cinder.i18n import _, _LE, _LI
from cinder.image import glance from cinder.image import glance
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils
from cinder import utils from cinder import utils
from cinder.volume.flows import common from cinder.volume.flows import common
from cinder.volume import utils as volume_utils from cinder.volume import utils as volume_utils

3
cinder/volume/iscsi.py
View File

@ -16,11 +16,12 @@
import os import os
import re import re
from oslo.concurrency import processutils as putils
from cinder.brick.iscsi import iscsi from cinder.brick.iscsi import iscsi
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils as putils
from cinder.volume import utils from cinder.volume import utils
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
cinder/volume/utils.py
View File

@ -18,6 +18,7 @@
import math import math
from Crypto.Random import random from Crypto.Random import random
from oslo.concurrency import processutils
from oslo.config import cfg from oslo.config import cfg
from oslo.utils import strutils from oslo.utils import strutils
from oslo.utils import timeutils from oslo.utils import timeutils
@ -27,7 +28,6 @@ from cinder.brick.local_dev import lvm as brick_lvm
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils
from cinder import rpc from cinder import rpc
from cinder import utils from cinder import utils

2
cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py
View File

@ -25,12 +25,12 @@ import random
import re import re
from eventlet import greenthread from eventlet import greenthread
from oslo.concurrency import processutils
from oslo.utils import excutils from oslo.utils import excutils
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils
from cinder import ssh_utils from cinder import ssh_utils
from cinder import utils from cinder import utils
import cinder.zonemanager.drivers.brocade.fc_zone_constants as ZoneConstant import cinder.zonemanager.drivers.brocade.fc_zone_constants as ZoneConstant

2
cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py
View File

@ -30,13 +30,13 @@ add_connection and delete_connection interfaces.
""" """
from oslo.concurrency import lockutils
from oslo.config import cfg from oslo.config import cfg
from oslo.utils import excutils from oslo.utils import excutils
from oslo.utils import importutils from oslo.utils import importutils
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _
from cinder.openstack.common import lockutils
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.zonemanager.drivers.brocade import brcd_fabric_opts as fabric_opts from cinder.zonemanager.drivers.brocade import brcd_fabric_opts as fabric_opts
from cinder.zonemanager.drivers.fc_zone_driver import FCZoneDriver from cinder.zonemanager.drivers.fc_zone_driver import FCZoneDriver

2
cinder/zonemanager/drivers/cisco/cisco_fc_san_lookup_service.py
View File

@ -18,13 +18,13 @@
import random import random
from eventlet import greenthread from eventlet import greenthread
from oslo.concurrency import processutils
from oslo.utils import excutils from oslo.utils import excutils
import six import six
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils
from cinder import ssh_utils from cinder import ssh_utils
from cinder import utils from cinder import utils
from cinder.zonemanager.drivers.cisco import cisco_fabric_opts as fabric_opts from cinder.zonemanager.drivers.cisco import cisco_fabric_opts as fabric_opts

2
cinder/zonemanager/drivers/cisco/cisco_fc_zone_client_cli.py
View File

@ -22,13 +22,13 @@ import random
import re import re
from eventlet import greenthread from eventlet import greenthread
from oslo.concurrency import processutils
from oslo.utils import excutils from oslo.utils import excutils
import six import six
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils
from cinder import ssh_utils from cinder import ssh_utils
from cinder import utils from cinder import utils
import cinder.zonemanager.drivers.cisco.fc_zone_constants as ZoneConstant import cinder.zonemanager.drivers.cisco.fc_zone_constants as ZoneConstant

2
cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py
View File

@ -27,6 +27,7 @@ add_connection and delete_connection interfaces.
:zone_name_prefix: Used by: class: 'FCZoneDriver'. Defaults to 'openstack' :zone_name_prefix: Used by: class: 'FCZoneDriver'. Defaults to 'openstack'
""" """
from oslo.concurrency import lockutils
from oslo.config import cfg from oslo.config import cfg
from oslo.utils import excutils from oslo.utils import excutils
from oslo.utils import importutils from oslo.utils import importutils
@ -34,7 +35,6 @@ import six
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _
from cinder.openstack.common import lockutils
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.zonemanager.drivers.cisco import cisco_fabric_opts as fabric_opts from cinder.zonemanager.drivers.cisco import cisco_fabric_opts as fabric_opts
from cinder.zonemanager.drivers.fc_zone_driver import FCZoneDriver from cinder.zonemanager.drivers.fc_zone_driver import FCZoneDriver

12
etc/cinder/cinder.conf.sample
View File

@ -760,18 +760,6 @@
#backdoor_port=<None> #backdoor_port=<None>
#
# Options defined in cinder.openstack.common.lockutils
#
# Whether to disable inter-process locks (boolean value)
#disable_process_locking=false
# Directory to use for lock files. Default to a temp directory
# (string value)
#lock_path=<None>
# #
# Options defined in cinder.openstack.common.log # Options defined in cinder.openstack.common.log
# #

2
openstack-common.conf
View File

@ -10,14 +10,12 @@ module=imageutils
module=install_venv_common module=install_venv_common
module=jsonutils module=jsonutils
module=local module=local
module=lockutils
module=log module=log
module=log_handler module=log_handler
module=loopingcall module=loopingcall
module=middleware module=middleware
module=periodic_task module=periodic_task
module=policy module=policy
module=processutils
module=request_utils module=request_utils
module=scheduler module=scheduler
module=scheduler.filters module=scheduler.filters

1
requirements.txt
View File

@ -14,6 +14,7 @@ kombu>=2.5.0
lxml>=2.3 lxml>=2.3
netaddr>=0.7.12 netaddr>=0.7.12
oslo.config>=1.4.0 # Apache-2.0 oslo.config>=1.4.0 # Apache-2.0
oslo.concurrency>=0.1.0 # Apache-2.0
oslo.db>=1.0.0 # Apache-2.0 oslo.db>=1.0.0 # Apache-2.0
oslo.messaging>=1.4.0 oslo.messaging>=1.4.0
oslo.rootwrap>=1.3.0 oslo.rootwrap>=1.3.0