[HWKMETRICS-721] Attempt to fix MixedMetricsITest failures due to cha…

…nges to delete metric implementation.
hawkular · Sep 12, 2017 · 2f2b66e · 2f2b66e
1 parent 8d6390c
commit 2f2b66e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/...rics-core-service/src/main/java/org/hawkular/metrics/core/service/MetricsServiceImpl.java b/...rics-core-service/src/main/java/org/hawkular/metrics/core/service/MetricsServiceImpl.java
@@ -1097,8 +1097,12 @@ public <T> Observable<Void> deleteMetric(MetricId<T> id) {
         Observable<Void> result = dataAccess.getMetricTags(id)
                 .map(row -> row.getMap(0, String.class, String.class))
                 .defaultIfEmpty(new HashMap<>())
-                .flatMap(map -> dataAccess.deleteFromMetricsTagsIndex(id, map))
-                .map(r -> null);
+                .flatMap(map -> {
+                    if (map.isEmpty()) {
+                        return Observable.empty();
+                    }
+                    return dataAccess.deleteFromMetricsTagsIndex(id, map).map(r -> null);
+                });
         result = result.mergeWith(dataAccess.deleteMetricFromMetricsIndex(id).map(r -> null))
                 .mergeWith(dataAccess.deleteMetricData(id).map(r -> null))
                 .mergeWith(dataAccess.deleteMetricFromRetentionIndex(id).map(r -> null))

diff --git a/...re-service/src/test/java/org/hawkular/metrics/core/service/metrics/MixedMetricsITest.java b/...re-service/src/test/java/org/hawkular/metrics/core/service/metrics/MixedMetricsITest.java
@@ -322,7 +322,7 @@ private <T, V> void createAndDeleteMetrics(MetricType<T> mType, T[] dataPointVal
             Map<String, String> actualTags = metricsService.getMetricTags(mId).toBlocking().lastOrDefault(null);
             assertEquals(actualTags, m.getTags());
 
-            doAction(() -> metricsService.deleteMetric(mId));
+            metricsService.deleteMetric(mId).toBlocking().lastOrDefault(null);
             deletedMetrics.add(m);
 
             for (Metric<T> checkMetric : mList) {