polling: remove deprecated option batch_polled_samples

Change-Id: Id854b788c3dbc34b9fb944b6dc72d7f3b48d5495

ceilometer/opts.py

@@ -70,8 +70,7 @@ def list_opts():
     # This have been removed due to a recursive import issue
     return [
         ('DEFAULT',
-         itertools.chain(ceilometer.polling.manager.OPTS,
-                         ceilometer.compute.virt.inspector.OPTS,
+         itertools.chain(ceilometer.compute.virt.inspector.OPTS,
                          ceilometer.compute.virt.libvirt.utils.OPTS,
                          ceilometer.objectstore.swift.OPTS,
                          ceilometer.pipeline.base.OPTS,

ceilometer/polling/manager.py

@@ -42,18 +42,6 @@ from ceilometer import utils
 
 LOG = log.getLogger(__name__)
 
-OPTS = [
-    cfg.BoolOpt('batch_polled_samples',
-                default=True,
-                deprecated_for_removal=True,
-                help='To reduce polling agent load, samples are sent to the '
-                     'notification agent in a batch. To gain higher '
-                     'throughput at the cost of load set this to False. '
-                     'This option is deprecated, to disable batching set '
-                     'batch_size = 0 in the polling group.'
-                ),
-]
-
 POLLING_OPTS = [
     cfg.StrOpt('cfg_file',
                default="polling.yaml",
@@ -139,13 +127,8 @@ class PollingTask(object):
         resource_factory = lambda: Resources(agent_manager)
         self.resources = collections.defaultdict(resource_factory)
 
-        self._batch = self.manager.conf.batch_polled_samples
         self._batch_size = self.manager.conf.polling.batch_size
 
-        if not self._batch:
-            # Support deprecated way of disabling baching
-            self._batch_size = 0
-
         self._telemetry_secret = self.manager.conf.publisher.telemetry_secret
 
     def add(self, pollster, source):

ceilometer/tests/unit/polling/test_manager.py

@@ -791,10 +791,6 @@ class TestPollingAgent(BaseAgent):
                  res_list="[<NovaLikeServer: unknown-name>]",
                  source=source_name))
 
-    def test_batching_polled_samples_false_deprecated(self):
-        self.CONF.set_override('batch_polled_samples', False)
-        self._batching_samples(4, 4)
-
     def test_batching_polled_samples_disable_batch(self):
         self.CONF.set_override('batch_size', 0, group='polling')
         self._batching_samples(4, 4)

releasenotes/notes/remove-batch_polled_samples-b40241c8aad3667d.yaml

@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    Remove deprecated option `batch_polled_samples`.