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
Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/brick/executor.py
View File

@@ -18,7 +18,7 @@
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):

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

@@ -17,6 +17,9 @@ import os
import socket
import time
from oslo.concurrency import lockutils
from oslo.concurrency import processutils as putils
from cinder.brick import exception
from cinder.brick import executor
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.remotefs import remotefs
from cinder.i18n import _, _LE
from cinder.openstack.common import lockutils
from cinder.openstack.common import log as logging
from cinder.openstack.common import loopingcall
from cinder.openstack.common import processutils as putils
LOG = logging.getLogger(__name__)

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

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

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

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

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

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

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

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

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

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