diff options
| -rw-r--r-- | designate/central/service.py | 10 | ||||
| -rw-r--r-- | designate/coordination.py | 9 | ||||
| -rw-r--r-- | designate/tests/test_central/test_decorator.py | 16 | ||||
| -rwxr-xr-x | devstack/plugin.sh | 5 |
4 files changed, 35 insertions, 5 deletions
diff --git a/designate/central/service.py b/designate/central/service.py index 2652ec89..2c0a8403 100644 --- a/designate/central/service.py +++ b/designate/central/service.py @@ -33,9 +33,9 @@ from dns import exception as dnsexception from oslo_config import cfg import oslo_messaging as messaging from oslo_log import log as logging -from oslo_concurrency import lockutils from designate import context as dcontext +from designate import coordination from designate import exceptions from designate import dnsutils from designate import network_api @@ -117,7 +117,7 @@ def synchronized_zone(zone_arg=1, new_zone=False): if zone_id in ZONE_LOCKS.held: return f(self, *args, **kwargs) - with lockutils.lock(lock_name): + with self.coordination.get_lock(lock_name): try: ZONE_LOCKS.held.add(zone_id) return f(self, *args, **kwargs) @@ -198,6 +198,10 @@ class Service(service.RPCService): threads=cfg.CONF['service:central'].threads, ) + self.coordination = coordination.Coordination( + self.service_name, self.tg + ) + self.network_api = network_api.get_network_api(cfg.CONF.network_api) @property @@ -233,8 +237,10 @@ class Service(service.RPCService): "configured") super(Service, self).start() + self.coordination.start() def stop(self, graceful=True): + self.coordination.stop() super(Service, self).stop(graceful) @property diff --git a/designate/coordination.py b/designate/coordination.py index b813f455..e2e34f28 100644 --- a/designate/coordination.py +++ b/designate/coordination.py @@ -19,6 +19,7 @@ import math import time +from oslo_concurrency import lockutils from oslo_log import log import tenacity import tooz.coordination @@ -51,6 +52,14 @@ class Coordination(object): def started(self): return self._started + def get_lock(self, name): + if self._coordinator: + # NOTE(eandersson): Workaround until tooz handles the conversion. + if not isinstance(name, bytes): + name = name.encode('ascii') + return self._coordinator.get_lock(name) + return lockutils.lock(name) + def start(self): self.coordination_id = ":".join([CONF.host, generate_uuid()]) diff --git a/designate/tests/test_central/test_decorator.py b/designate/tests/test_central/test_decorator.py index fd78861d..ff189caf 100644 --- a/designate/tests/test_central/test_decorator.py +++ b/designate/tests/test_central/test_decorator.py @@ -9,6 +9,8 @@ # 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 mock +from oslo_concurrency import lockutils from oslo_log import log as logging from designate import exceptions @@ -21,6 +23,11 @@ from designate.tests.test_central import CentralTestCase LOG = logging.getLogger(__name__) +class FakeCoordination(object): + def get_lock(self, name): + return lockutils.lock(name) + + class CentralDecoratorTests(CentralTestCase): def test_synchronized_zone_exception_raised(self): @service.synchronized_zone() @@ -31,7 +38,8 @@ class CentralDecoratorTests(CentralTestCase): for index in range(9): try: - mock_get_zone(object, index, + mock_get_zone(mock.Mock(coordination=FakeCoordination()), + index, zone.Zone(id=utils.generate_uuid())) except exceptions.ZoneNotFound: pass @@ -46,9 +54,11 @@ class CentralDecoratorTests(CentralTestCase): def mock_get_zone(cls, context, zone): self.assertEqual(service.ZONE_LOCKS.held, {zone.id}) - mock_create_record(object, self.get_context(), + mock_create_record(mock.Mock(coordination=FakeCoordination()), + self.get_context(), record=record.Record(zone_id=utils.generate_uuid())) - mock_get_zone(object, self.get_context(), + mock_get_zone(mock.Mock(coordination=FakeCoordination()), + self.get_context(), zone=zone.Zone(id=utils.generate_uuid())) def test_synchronized_zone_raises_exception_when_no_zone_provided(self): diff --git a/devstack/plugin.sh b/devstack/plugin.sh index e8a635c3..52879cbf 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -256,6 +256,11 @@ function install_designate { git_clone $DESIGNATE_REPO $DESIGNATE_DIR $DESIGNATE_BRANCH setup_develop $DESIGNATE_DIR + # Install reqs for tooz driver + if [[ "$DESIGNATE_COORDINATION_URL" =~ "memcached" ]]; then + pip_install_gr "pymemcache" + fi + install_designate_backend } |