255e8a839d
This adjusts the batching logic in the Nova notifier to immediately send and then sleep to allow batching of subsequent calls in the batch interval. So rather than always wait for 2 seconds to elapse while batching, batching will only occur in the 2 second period after a call is made. This turns the batch notifier into a standard queuing rate limiter. The upside to this is a single port create results in an immediate notification to Nova without a delay. The downside is now that a sudden burst of 6 port creations to a previously idle server will result in 2 notification calls to Nova (1 for the first call and another for the other 5). Closes-Bug: #1564648 Change-Id: I82f403441564955345f47877151e0c457712dd2f
64 lines
2.4 KiB
Python
64 lines
2.4 KiB
Python
# Copyright (c) 2014 OpenStack Foundation.
|
|
# 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 eventlet
|
|
import mock
|
|
|
|
from neutron.notifiers import batch_notifier
|
|
from neutron.tests import base
|
|
|
|
|
|
class TestBatchNotifier(base.BaseTestCase):
|
|
def setUp(self):
|
|
super(TestBatchNotifier, self).setUp()
|
|
self.notifier = batch_notifier.BatchNotifier(0.1, lambda x: x)
|
|
self.spawn_n_p = mock.patch('eventlet.spawn_n')
|
|
self.spawn_n = self.spawn_n_p.start()
|
|
|
|
def test_queue_event_no_event(self):
|
|
self.notifier.queue_event(None)
|
|
self.assertEqual(0, len(self.notifier.pending_events))
|
|
self.assertEqual(0, self.spawn_n.call_count)
|
|
|
|
def test_queue_event_first_event(self):
|
|
self.notifier.queue_event(mock.Mock())
|
|
self.assertEqual(1, len(self.notifier.pending_events))
|
|
self.assertEqual(1, self.spawn_n.call_count)
|
|
|
|
def test_queue_event_multiple_events(self):
|
|
self.spawn_n_p.stop()
|
|
c_mock = mock.patch.object(self.notifier, 'callback').start()
|
|
events = 6
|
|
for i in range(0, events):
|
|
self.notifier.queue_event(mock.Mock())
|
|
eventlet.sleep(0) # yield to let coro execute
|
|
|
|
while self.notifier.pending_events:
|
|
# wait for coroutines to finish
|
|
eventlet.sleep(0.1)
|
|
self.assertEqual(2, c_mock.call_count)
|
|
self.assertEqual(6, sum(len(c[0][0]) for c in c_mock.call_args_list))
|
|
self.assertEqual(0, len(self.notifier.pending_events))
|
|
|
|
def test_queue_event_call_send_events(self):
|
|
with mock.patch.object(self.notifier,
|
|
'callback') as send_events:
|
|
self.spawn_n.side_effect = lambda func: func()
|
|
self.notifier.queue_event(mock.Mock())
|
|
while self.notifier.pending_events:
|
|
# wait for coroutines to finish
|
|
eventlet.sleep(0.1)
|
|
self.assertTrue(send_events.called)
|