28c14f567e
As bug 1568706 uncovered, we were using zuul-cloner in our gate jobs; this was preventing our translation from syncing. After digging into this issue a number of changes in this associated logic were found to not be in sync with neutron. This patch updates out tox/tools logic to follow that of neutron. In addition this patch fixes any pylint checks that were failing to make pep8 pass. IMPORTANT: Please review closely, not only to the tools/tox updates but also to the ignored pylint checks in the code. We only want to disable checks where appropriate. Change-Id: I6c5fee3ca3073ad079eac1636cc3b9ec45926a68 Closes-Bug: #1568706
63 lines
2.2 KiB
Python
63 lines
2.2 KiB
Python
# Copyright 2015 VMware, Inc.
|
|
# 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 os
|
|
|
|
from oslo_concurrency import lockutils
|
|
from oslo_config import cfg
|
|
from oslo_log import log
|
|
from tooz import coordination
|
|
|
|
LOG = log.getLogger(__name__)
|
|
|
|
|
|
class LockManager(object):
|
|
_coordinator = None
|
|
_coordinator_pid = None
|
|
_connect_string = cfg.CONF.locking_coordinator_url
|
|
|
|
def __init__(self):
|
|
LOG.debug('LockManager initialized!')
|
|
|
|
@staticmethod
|
|
def get_lock(name, **kwargs):
|
|
if cfg.CONF.locking_coordinator_url:
|
|
return LockManager._get_lock_distributed(name)
|
|
else:
|
|
# Ensure that external=True
|
|
kwargs['external'] = True
|
|
return LockManager._get_lock_local(name, **kwargs)
|
|
|
|
@staticmethod
|
|
def _get_lock_local(name, **kwargs):
|
|
return lockutils.lock(name, **kwargs)
|
|
|
|
@staticmethod
|
|
def _get_lock_distributed(name):
|
|
if LockManager._coordinator_pid != os.getpid():
|
|
# We should use a per-process coordinator. If PID is different
|
|
# start a new coordinator.
|
|
# While the API workers are spawned, we have to re-initialize
|
|
# a coordinator, so we validate that the PID is still the same.
|
|
LockManager._coordinator_pid = os.getpid()
|
|
LOG.debug('Initialized coordinator with connect string %s',
|
|
LockManager._connect_string)
|
|
LockManager._coordinator = coordination.get_coordinator(
|
|
LockManager._connect_string, 'vmware-neutron-plugin')
|
|
LockManager._coordinator.start()
|
|
|
|
LOG.debug('Retrieved lock for %s', name)
|
|
return LockManager._coordinator.get_lock(name)
|