Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 23C57200C32 for ; Wed, 1 Feb 2017 18:00:33 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 22383160B46; Wed, 1 Feb 2017 17:00:33 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 11713160B69 for ; Wed, 1 Feb 2017 18:00:31 +0100 (CET) Received: (qmail 85947 invoked by uid 500); 1 Feb 2017 17:00:29 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 85511 invoked by uid 99); 1 Feb 2017 17:00:29 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Feb 2017 17:00:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5B3CFE0B56; Wed, 1 Feb 2017 17:00:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: krisden@apache.org To: commits@lucene.apache.org Date: Wed, 01 Feb 2017 17:00:38 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/35] lucene-solr:jira/solr-8593: SOLR-10050 Fix SolrMetricManagerTest.testClearMetrics() failures. archived-at: Wed, 01 Feb 2017 17:00:33 -0000 SOLR-10050 Fix SolrMetricManagerTest.testClearMetrics() failures. Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/f73d93ac Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/f73d93ac Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/f73d93ac Branch: refs/heads/jira/solr-8593 Commit: f73d93ac1b30d354c0a9633225470fbb7799f480 Parents: bb9b423 Author: Andrzej Bialecki Authored: Mon Jan 30 13:16:44 2017 +0100 Committer: Andrzej Bialecki Committed: Mon Jan 30 13:21:21 2017 +0100 ---------------------------------------------------------------------- .../test/org/apache/solr/metrics/SolrMetricManagerTest.java | 6 +++--- .../src/test/org/apache/solr/update/SolrIndexMetricsTest.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f73d93ac/solr/core/src/test/org/apache/solr/metrics/SolrMetricManagerTest.java ---------------------------------------------------------------------- diff --git a/solr/core/src/test/org/apache/solr/metrics/SolrMetricManagerTest.java b/solr/core/src/test/org/apache/solr/metrics/SolrMetricManagerTest.java index ecddfba..0d94c1a 100644 --- a/solr/core/src/test/org/apache/solr/metrics/SolrMetricManagerTest.java +++ b/solr/core/src/test/org/apache/solr/metrics/SolrMetricManagerTest.java @@ -143,13 +143,13 @@ public class SolrMetricManagerTest extends SolrTestCaseJ4 { assertEquals(metrics.size() * 3, metricManager.registry(registryName).getMetrics().size()); - // clear "foo.bar" - Set removed = metricManager.clearMetrics(registryName, "foo", "bar"); + // clear all metrics with prefix "foo.bar." + Set removed = metricManager.clearMetrics(registryName, "foo", "bar."); assertEquals(metrics.size(), removed.size()); for (String s : removed) { assertTrue(s.startsWith("foo.bar.")); } - removed = metricManager.clearMetrics(registryName, "foo", "baz"); + removed = metricManager.clearMetrics(registryName, "foo", "baz."); assertEquals(metrics.size(), removed.size()); for (String s : removed) { assertTrue(s.startsWith("foo.baz.")); http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f73d93ac/solr/core/src/test/org/apache/solr/update/SolrIndexMetricsTest.java ---------------------------------------------------------------------- diff --git a/solr/core/src/test/org/apache/solr/update/SolrIndexMetricsTest.java b/solr/core/src/test/org/apache/solr/update/SolrIndexMetricsTest.java index 4f5ea69..850ce03 100644 --- a/solr/core/src/test/org/apache/solr/update/SolrIndexMetricsTest.java +++ b/solr/core/src/test/org/apache/solr/update/SolrIndexMetricsTest.java @@ -63,7 +63,7 @@ public class SolrIndexMetricsTest extends SolrTestCaseJ4 { assertTrue(metrics.entrySet().stream().filter(e -> e.getKey().startsWith("INDEX")).count() >= 12); // this is variable, depending on the codec and the number of created files - assertTrue(metrics.entrySet().stream().filter(e -> e.getKey().startsWith("DIRECTORY")).count() > 50); + assertTrue(metrics.entrySet().stream().filter(e -> e.getKey().startsWith("DIRECTORY")).count() > 20); // check basic index meters Timer timer = (Timer)metrics.get("INDEX.merge.minor");