
Gnocchi performs better if measurements are write in batch When Ceilometer is used with Gnocchi, this is not possible. This change introduce a new notification listener that allows that. On the driver side, a default batch implementation is provided. It's just call the legacy poll method many times. Driver can override it to provide a better implementation. For example, kafka handles batch natively and take benefit of this. Change-Id: I16184da24b8661aff7f4fba6196ecf33165f1a77
278 lines
8.5 KiB
Python
278 lines
8.5 KiB
Python
# Copyright 2015 Mirantis, Inc.
|
|
#
|
|
# 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 logging
|
|
import threading
|
|
|
|
import fixtures
|
|
import testtools
|
|
|
|
import oslo_messaging
|
|
from oslo_messaging._drivers import impl_zmq
|
|
from oslo_messaging._drivers.zmq_driver import zmq_async
|
|
from oslo_messaging._drivers.zmq_driver import zmq_socket
|
|
from oslo_messaging._i18n import _
|
|
from oslo_messaging.tests import utils as test_utils
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
zmq = zmq_async.import_zmq()
|
|
|
|
|
|
class TestServerListener(object):
|
|
|
|
def __init__(self, driver):
|
|
self.driver = driver
|
|
self.listener = None
|
|
self.executor = zmq_async.get_executor(self._run)
|
|
self._stop = threading.Event()
|
|
self._received = threading.Event()
|
|
self.message = None
|
|
|
|
def listen(self, target):
|
|
self.listener = self.driver.listen(target)
|
|
self.executor.execute()
|
|
|
|
def listen_notifications(self, targets_and_priorities):
|
|
self.listener = self.driver.listen_for_notifications(
|
|
targets_and_priorities, {})
|
|
self.executor.execute()
|
|
|
|
def _run(self):
|
|
try:
|
|
message = self.listener.poll()
|
|
if message:
|
|
message = message[0]
|
|
message.acknowledge()
|
|
self._received.set()
|
|
self.message = message
|
|
message.reply(reply=True)
|
|
except Exception:
|
|
LOG.exception(_("Unexpected exception occurred."))
|
|
|
|
def stop(self):
|
|
self.executor.stop()
|
|
|
|
|
|
class ZmqBaseTestCase(test_utils.BaseTestCase):
|
|
"""Base test case for all ZMQ tests """
|
|
|
|
@testtools.skipIf(zmq is None, "zmq not available")
|
|
def setUp(self):
|
|
super(ZmqBaseTestCase, self).setUp()
|
|
self.messaging_conf.transport_driver = 'zmq'
|
|
|
|
# Set config values
|
|
self.internal_ipc_dir = self.useFixture(fixtures.TempDir()).path
|
|
kwargs = {'rpc_zmq_bind_address': '127.0.0.1',
|
|
'rpc_zmq_host': '127.0.0.1',
|
|
'rpc_response_timeout': 5,
|
|
'rpc_zmq_ipc_dir': self.internal_ipc_dir,
|
|
'zmq_use_broker': False,
|
|
'rpc_zmq_matchmaker': 'dummy'}
|
|
self.config(**kwargs)
|
|
|
|
# Get driver
|
|
transport = oslo_messaging.get_transport(self.conf)
|
|
self.driver = transport._driver
|
|
|
|
self.listener = TestServerListener(self.driver)
|
|
|
|
self.addCleanup(stopRpc(self.__dict__))
|
|
|
|
|
|
class ZmqTestPortsRange(ZmqBaseTestCase):
|
|
|
|
@testtools.skipIf(zmq is None, "zmq not available")
|
|
def setUp(self):
|
|
super(ZmqTestPortsRange, self).setUp()
|
|
|
|
# Set config values
|
|
kwargs = {'rpc_zmq_min_port': 5555,
|
|
'rpc_zmq_max_port': 5560}
|
|
self.config(**kwargs)
|
|
|
|
def test_ports_range(self):
|
|
listeners = []
|
|
|
|
for i in range(10):
|
|
try:
|
|
target = oslo_messaging.Target(topic='testtopic_'+str(i))
|
|
new_listener = self.driver.listen(target)
|
|
listeners.append(new_listener)
|
|
except zmq_socket.ZmqPortRangeExceededException:
|
|
pass
|
|
|
|
self.assertLessEqual(len(listeners), 5)
|
|
|
|
for l in listeners:
|
|
l.cleanup()
|
|
|
|
class TestConfZmqDriverLoad(test_utils.BaseTestCase):
|
|
|
|
@testtools.skipIf(zmq is None, "zmq not available")
|
|
def setUp(self):
|
|
super(TestConfZmqDriverLoad, self).setUp()
|
|
self.messaging_conf.transport_driver = 'zmq'
|
|
|
|
def test_driver_load(self):
|
|
transport = oslo_messaging.get_transport(self.conf)
|
|
self.assertIsInstance(transport._driver, impl_zmq.ZmqDriver)
|
|
|
|
|
|
class stopRpc(object):
|
|
def __init__(self, attrs):
|
|
self.attrs = attrs
|
|
|
|
def __call__(self):
|
|
if self.attrs['driver']:
|
|
self.attrs['driver'].cleanup()
|
|
if self.attrs['listener']:
|
|
self.attrs['listener'].stop()
|
|
|
|
|
|
class TestZmqBasics(ZmqBaseTestCase):
|
|
|
|
def test_send_receive_raises(self):
|
|
"""Call() without method."""
|
|
target = oslo_messaging.Target(topic='testtopic')
|
|
self.listener.listen(target)
|
|
self.assertRaises(
|
|
KeyError,
|
|
self.driver.send,
|
|
target, {}, {'tx_id': 1}, wait_for_reply=True)
|
|
|
|
def test_send_receive_topic(self):
|
|
"""Call() with topic."""
|
|
|
|
target = oslo_messaging.Target(topic='testtopic')
|
|
self.listener.listen(target)
|
|
result = self.driver.send(
|
|
target, {},
|
|
{'method': 'hello-world', 'tx_id': 1},
|
|
wait_for_reply=True)
|
|
self.assertTrue(result)
|
|
|
|
def test_send_noreply(self):
|
|
"""Cast() with topic."""
|
|
|
|
target = oslo_messaging.Target(topic='testtopic', server="my@server")
|
|
self.listener.listen(target)
|
|
result = self.driver.send(
|
|
target, {},
|
|
{'method': 'hello-world', 'tx_id': 1},
|
|
wait_for_reply=False)
|
|
|
|
self.listener._received.wait()
|
|
|
|
self.assertIsNone(result)
|
|
self.assertEqual(True, self.listener._received.isSet())
|
|
method = self.listener.message.message[u'method']
|
|
self.assertEqual(u'hello-world', method)
|
|
|
|
def test_send_fanout(self):
|
|
target = oslo_messaging.Target(topic='testtopic', fanout=True)
|
|
self.listener.listen(target)
|
|
|
|
result = self.driver.send(
|
|
target, {},
|
|
{'method': 'hello-world', 'tx_id': 1},
|
|
wait_for_reply=False)
|
|
|
|
self.listener._received.wait()
|
|
|
|
self.assertIsNone(result)
|
|
self.assertEqual(True, self.listener._received.isSet())
|
|
method = self.listener.message.message[u'method']
|
|
self.assertEqual(u'hello-world', method)
|
|
|
|
def test_send_receive_direct(self):
|
|
"""Call() without topic."""
|
|
|
|
target = oslo_messaging.Target(server='127.0.0.1')
|
|
self.listener.listen(target)
|
|
message = {'method': 'hello-world', 'tx_id': 1}
|
|
context = {}
|
|
result = self.driver.send(target, context, message,
|
|
wait_for_reply=True)
|
|
self.assertTrue(result)
|
|
|
|
def test_send_receive_notification(self):
|
|
"""Notify() test"""
|
|
|
|
target = oslo_messaging.Target(topic='t1',
|
|
server='notification@server')
|
|
self.listener.listen_notifications([(target, 'info')])
|
|
|
|
message = {'method': 'hello-world', 'tx_id': 1}
|
|
context = {}
|
|
target.topic = target.topic + '.info'
|
|
self.driver.send_notification(target, context, message, '3.0')
|
|
self.listener._received.wait(5)
|
|
self.assertTrue(self.listener._received.isSet())
|
|
|
|
|
|
class TestPoller(test_utils.BaseTestCase):
|
|
|
|
@testtools.skipIf(zmq is None, "zmq not available")
|
|
def setUp(self):
|
|
super(TestPoller, self).setUp()
|
|
self.poller = zmq_async.get_poller()
|
|
self.ctx = zmq.Context()
|
|
self.internal_ipc_dir = self.useFixture(fixtures.TempDir()).path
|
|
self.ADDR_REQ = "ipc://%s/request1" % self.internal_ipc_dir
|
|
|
|
def test_poll_blocking(self):
|
|
|
|
rep = self.ctx.socket(zmq.REP)
|
|
rep.bind(self.ADDR_REQ)
|
|
|
|
reply_poller = zmq_async.get_reply_poller()
|
|
reply_poller.register(rep)
|
|
|
|
def listener():
|
|
incoming, socket = reply_poller.poll()
|
|
self.assertEqual(b'Hello', incoming[0])
|
|
socket.send_string('Reply')
|
|
reply_poller.resume_polling(socket)
|
|
|
|
executor = zmq_async.get_executor(listener)
|
|
executor.execute()
|
|
|
|
req1 = self.ctx.socket(zmq.REQ)
|
|
req1.connect(self.ADDR_REQ)
|
|
|
|
req2 = self.ctx.socket(zmq.REQ)
|
|
req2.connect(self.ADDR_REQ)
|
|
|
|
req1.send_string('Hello')
|
|
req2.send_string('Hello')
|
|
|
|
reply = req1.recv_string()
|
|
self.assertEqual('Reply', reply)
|
|
|
|
reply = req2.recv_string()
|
|
self.assertEqual('Reply', reply)
|
|
|
|
def test_poll_timeout(self):
|
|
rep = self.ctx.socket(zmq.REP)
|
|
rep.bind(self.ADDR_REQ)
|
|
|
|
reply_poller = zmq_async.get_reply_poller()
|
|
reply_poller.register(rep)
|
|
|
|
incoming, socket = reply_poller.poll(1)
|
|
self.assertIsNone(incoming)
|
|
self.assertIsNone(socket)
|