From 16505f9a391bd0f52aaf839b6da3627e6caafeb4 Mon Sep 17 00:00:00 2001 From: sfzeng Date: Mon, 13 Apr 2020 19:54:15 +0800 Subject: [PATCH 1/2] add coordination --- dolphin/common/config.py | 2 + dolphin/coordination.py | 203 ++++++++++++++++++++++++++++++++ dolphin/service.py | 10 ++ dolphin/task_manager/manager.py | 4 + 4 files changed, 219 insertions(+) create mode 100644 dolphin/coordination.py diff --git a/dolphin/common/config.py b/dolphin/common/config.py index d53d88c7d..8e8187f43 100644 --- a/dolphin/common/config.py +++ b/dolphin/common/config.py @@ -42,6 +42,8 @@ help="Top-level directory for maintaining dolphin's state."), ] +CONF.register_cli_opts(core_opts) + global_opts = [ cfg.HostAddressOpt('my_ip', default=netutils.get_my_ipv4(), diff --git a/dolphin/coordination.py b/dolphin/coordination.py new file mode 100644 index 000000000..8b4844b44 --- /dev/null +++ b/dolphin/coordination.py @@ -0,0 +1,203 @@ +# 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. + +"""Tooz Coordination and locking utilities.""" + +import inspect + +import decorator +from oslo_config import cfg +from oslo_log import log +from oslo_utils import uuidutils +import six +from tooz import coordination +from tooz import locking + +from dolphin import exception +from dolphin.i18n import _ + + +LOG = log.getLogger(__name__) + + +coordination_opts = [ + cfg.StrOpt('backend_url', + default='redis://127.0.0.1:6379', + help='The back end URL to use for distributed coordination.') +] + +CONF = cfg.CONF +CONF.register_opts(coordination_opts, group='coordination') + + +class Coordinator(object): + """Tooz coordination wrapper. + + Coordination member id is created from concatenated `prefix` and + `agent_id` parameters. + + :param str agent_id: Agent identifier + :param str prefix: Used to provide member identifier with a + meaningful prefix. + """ + + def __init__(self, agent_id=None, prefix=''): + self.coordinator = None + self.agent_id = agent_id or uuidutils.generate_uuid() + self.started = False + self.prefix = prefix + + def start(self): + """Connect to coordination back end.""" + if self.started: + return + + # NOTE(gouthamr): Tooz expects member_id as a byte string. + member_id = (self.prefix + self.agent_id).encode('ascii') + LOG.info("cfg.CONF.coordination.backend_url=%s, membrid=%s" % (cfg.CONF.coordination.backend_url, member_id)) + self.coordinator = coordination.get_coordinator( + cfg.CONF.coordination.backend_url, member_id) + self.coordinator.start(start_heart=True) + self.started = True + + def stop(self): + """Disconnect from coordination back end.""" + msg = 'Stopped Coordinator (Agent ID: %(agent)s, prefix: %(prefix)s)' + msg_args = {'agent': self.agent_id, 'prefix': self.prefix} + if self.started: + self.coordinator.stop() + self.coordinator = None + self.started = False + + LOG.info(msg, msg_args) + + def get_lock(self, name): + """Return a Tooz back end lock. + + :param str name: The lock name that is used to identify it + across all nodes. + """ + # NOTE(gouthamr): Tooz expects lock name as a byte string + lock_name = (self.prefix + name).encode('ascii') + if self.started: + return self.coordinator.get_lock(lock_name) + else: + raise exception.LockCreationFailed(_('Coordinator uninitialized.')) + + +LOCK_COORDINATOR = Coordinator(prefix='dolphin-') + + +class Lock(locking.Lock): + """Lock with dynamic name. + + :param str lock_name: Lock name. + :param dict lock_data: Data for lock name formatting. + :param coordinator: Coordinator object to use when creating lock. + Defaults to the global coordinator. + + Using it like so:: + + with Lock('mylock'): + ... + + ensures that only one process at a time will execute code in context. + Lock name can be formatted using Python format string syntax:: + + Lock('foo-{share.id}, {'share': ...,}') + + Available field names are keys of lock_data. + """ + def __init__(self, lock_name, lock_data=None, coordinator=None): + super(Lock, self).__init__(six.text_type(id(self))) + lock_data = lock_data or {} + self.coordinator = coordinator or LOCK_COORDINATOR + self.blocking = True + self.lock = self._prepare_lock(lock_name, lock_data) + + def _prepare_lock(self, lock_name, lock_data): + if not isinstance(lock_name, six.string_types): + raise ValueError(_('Not a valid string: %s') % lock_name) + return self.coordinator.get_lock(lock_name.format(**lock_data)) + + def acquire(self, blocking=None): + """Attempts to acquire lock. + + :param blocking: If True, blocks until the lock is acquired. If False, + returns right away. Otherwise, the value is used as a timeout + value and the call returns maximum after this number of seconds. + :return: returns true if acquired (false if not) + :rtype: bool + """ + blocking = self.blocking if blocking is None else blocking + return self.lock.acquire(blocking=blocking) + + def release(self): + """Attempts to release lock. + + The behavior of releasing a lock which was not acquired in the first + place is undefined. + """ + self.lock.release() + + +def synchronized(lock_name, blocking=True, coordinator=None): + """Synchronization decorator. + + :param str lock_name: Lock name. + :param blocking: If True, blocks until the lock is acquired. + If False, raises exception when not acquired. Otherwise, + the value is used as a timeout value and if lock is not acquired + after this number of seconds exception is raised. + :param coordinator: Coordinator object to use when creating lock. + Defaults to the global coordinator. + :raises tooz.coordination.LockAcquireFailed: if lock is not acquired + + Decorating a method like so:: + + @synchronized('mylock') + def foo(self, *args): + ... + + ensures that only one process 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. + + Lock name can be formatted using Python format string syntax:: + + @synchronized('{f_name}-{shr.id}-{snap[name]}') + def foo(self, shr, snap): + ... + + Available field names are: decorated function parameters and + `f_name` as a decorated function name. + """ + @decorator.decorator + def _synchronized(f, *a, **k): + call_args = inspect.getcallargs(f, *a, **k) + call_args['f_name'] = f.__name__ + lock = Lock(lock_name, call_args, coordinator) + with lock(blocking): + LOG.info('Lock "%(name)s" acquired by "%(function)s".', + {'name': lock_name, 'function': f.__name__}) + return f(*a, **k) + return _synchronized diff --git a/dolphin/service.py b/dolphin/service.py index 8c3b06f05..51c8481a6 100644 --- a/dolphin/service.py +++ b/dolphin/service.py @@ -33,6 +33,7 @@ from dolphin import context from dolphin import exception from dolphin import rpc +from dolphin import coordination LOG = log.getLogger(__name__) @@ -98,6 +99,9 @@ def __init__(self, host, binary, topic, manager, periodic_enable=None, self.coordinator = coordination def start(self): + if self.coordinator: + coordination.LOCK_COORDINATOR.start() + LOG.info('Starting %(topic)s node.', {'topic': self.topic}) LOG.debug("Creating RPC server for service %s.", self.topic) @@ -181,6 +185,12 @@ def stop(self): x.stop() except Exception: pass + if self.coordinator: + try: + coordination.LOCK_COORDINATOR.stop() + except Exception: + LOG.exception("Unable to stop the Tooz Locking " + "Coordinator.") self.timers = [] diff --git a/dolphin/task_manager/manager.py b/dolphin/task_manager/manager.py index 4556f2c8d..12ab02f80 100644 --- a/dolphin/task_manager/manager.py +++ b/dolphin/task_manager/manager.py @@ -24,6 +24,8 @@ from dolphin import manager from dolphin.task_manager import rpcapi as task_rpcapi +from dolphin import coordination +from dolphin import context LOG = log.getLogger(__name__) CONF = cfg.CONF @@ -39,7 +41,9 @@ def __init__(self, service_name=None, *args, **kwargs): super(TaskManager, self).__init__(*args, **kwargs) self.task_rpcapi = task_rpcapi.TaskAPI() + """Periodical task, this task will use coordination for distribute synchronization.""" @periodic_task.periodic_task(spacing=2, run_immediately=True) + @coordination.synchronized('lock-task-example') def _task_example(self, context): LOG.info("Produce task, say hello ...") self.task_rpcapi.say_hello(context) From 32df09b1888ab6a12679bd8a133db446230434cd Mon Sep 17 00:00:00 2001 From: sfzeng Date: Mon, 13 Apr 2020 20:25:03 +0800 Subject: [PATCH 2/2] add templates for issue and PR --- .github/ISSUE_TEMPLATE.md | 25 +++++++++++++++++++++++++ .github/PULL_REQUEST_TEMPLATE.md | 15 +++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE.md create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 000000000..f34d7fe60 --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,25 @@ + + +**Is this a BUG REPORT or FEATURE REQUEST?**: + +> Uncomment only one, leave it on its own line: +> +> /kind bug +> /kind feature + + +**What happened**: + +**What you expected to happen**: + +**How to reproduce it (as minimally and precisely as possible)**: + + +**Anything else we need to know?**: + +**Environment**: +- Hotpot(release/branch) version: +- OS (e.g. from /etc/os-release): +- Kernel (e.g. `uname -a`): +- Install tools: +- Others: diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 000000000..fb9f65379 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,15 @@ + + +**What this PR does / why we need it**: + +**Which issue this PR fixes** *(optional, in `fixes #(, fixes #, ...)` format, will close that issue when PR gets merged)*: fixes # + +**Special notes for your reviewer**: + +**Release note**: + +```release-note +```