[DataBroker] Clean up task queue when a MetricsConfig is removed
Upon removing a MetricsConfig, delete all associated tasks from the
queue. This operation is thread safe and the task queue should not be
updated while iterating because all the adding and polling should happen
on the same worker thread.
Bug: 193563449
Test: atest CarServiceUnitTest:DataBrokerUnitTest
Change-Id: I1a1fe31b4591323680527b35016c1ec4958c36f2
diff --git a/tests/carservice_unit_test/src/com/android/car/telemetry/databroker/DataBrokerUnitTest.java b/tests/carservice_unit_test/src/com/android/car/telemetry/databroker/DataBrokerUnitTest.java
index 71dace2..f4cde37 100644
--- a/tests/carservice_unit_test/src/com/android/car/telemetry/databroker/DataBrokerUnitTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/telemetry/databroker/DataBrokerUnitTest.java
@@ -158,22 +158,54 @@
@Test
public void testAddMetricsConfiguration_newMetricsConfig() {
+ mDataBroker.addMetricsConfiguration(METRICS_CONFIG_BAR);
+
+ waitForHandlerThreadToFinish();
+ assertThat(mDataBroker.getSubscriptionMap()).hasSize(1);
+ assertThat(mDataBroker.getSubscriptionMap()).containsKey(METRICS_CONFIG_BAR.getName());
+ // there should be one data subscriber in the subscription list of METRICS_CONFIG_BAR
+ assertThat(mDataBroker.getSubscriptionMap().get(METRICS_CONFIG_BAR.getName())).hasSize(1);
+ }
+
+
+ @Test
+ public void testAddMetricsConfiguration_duplicateMetricsConfig_shouldDoNothing() {
+ // this metrics config has already been added in setUp()
mDataBroker.addMetricsConfiguration(METRICS_CONFIG_FOO);
waitForHandlerThreadToFinish();
+ assertThat(mDataBroker.getSubscriptionMap()).hasSize(1);
assertThat(mDataBroker.getSubscriptionMap()).containsKey(METRICS_CONFIG_FOO.getName());
- // there should be one data subscriber in the subscription list of METRICS_CONFIG_FOO
assertThat(mDataBroker.getSubscriptionMap().get(METRICS_CONFIG_FOO.getName())).hasSize(1);
}
@Test
- public void testAddMetricsConfiguration_multipleMetricsConfigsSamePublisher() {
+ public void testRemoveMetricsConfiguration_shouldRemoveAllAssociatedTasks() {
mDataBroker.addMetricsConfiguration(METRICS_CONFIG_FOO);
mDataBroker.addMetricsConfiguration(METRICS_CONFIG_BAR);
+ ScriptExecutionTask taskWithMetricsConfigBar = new ScriptExecutionTask(
+ new DataSubscriber(mDataBroker, METRICS_CONFIG_BAR, SUBSCRIBER_BAR, PRIORITY_HIGH),
+ new Bundle(),
+ SystemClock.elapsedRealtime());
+ PriorityBlockingQueue<ScriptExecutionTask> taskQueue = mDataBroker.getTaskQueue();
+ taskQueue.add(mHighPriorityTask); // associated with METRICS_CONFIG_FOO
+ taskQueue.add(mLowPriorityTask); // associated with METRICS_CONFIG_FOO
+ taskQueue.add(taskWithMetricsConfigBar); // associated with METRICS_CONFIG_BAR
+ assertThat(taskQueue).hasSize(3);
+
+ mDataBroker.removeMetricsConfiguration(METRICS_CONFIG_FOO);
waitForHandlerThreadToFinish();
- assertThat(mDataBroker.getSubscriptionMap()).containsKey(METRICS_CONFIG_FOO.getName());
- assertThat(mDataBroker.getSubscriptionMap()).containsKey(METRICS_CONFIG_BAR.getName());
+ assertThat(taskQueue).hasSize(1);
+ assertThat(taskQueue.poll()).isEqualTo(taskWithMetricsConfigBar);
+ }
+
+ @Test
+ public void testRemoveMetricsConfiguration_whenMetricsConfigNonExistent_shouldDoNothing() {
+ mDataBroker.removeMetricsConfiguration(METRICS_CONFIG_BAR);
+
+ waitForHandlerThreadToFinish();
+ assertThat(mDataBroker.getSubscriptionMap()).hasSize(0);
}
private void waitForHandlerThreadToFinish() {