You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2019/08/23 18:08:10 UTC
[lucene-solr] branch branch_8x updated (f3c7bbf -> 035d823)
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a change to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from f3c7bbf LUCENE-8952: Use a sort key instead of true distance in NearestNeighbor. (#832)
new 4c9691e SOLR-13702: Some components register twice their metric names (#834)
new 035d823 SOLR-13702: Fix precommit
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
solr/CHANGES.txt | 2 ++
solr/core/src/java/org/apache/solr/security/AuditLoggerPlugin.java | 1 -
solr/core/src/java/org/apache/solr/security/AuthenticationPlugin.java | 3 ---
3 files changed, 2 insertions(+), 4 deletions(-)
[lucene-solr] 01/02: SOLR-13702: Some components register twice
their metric names (#834)
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 4c9691ef191441add8c1f91e54d9d52775f395a7
Author: Jan Høydahl <ja...@apache.org>
AuthorDate: Fri Aug 23 15:23:58 2019 +0200
SOLR-13702: Some components register twice their metric names (#834)
(cherry picked from commit 0aa3654802fa8fd7da27c80619248b92b3ac6af5)
---
solr/CHANGES.txt | 2 ++
solr/core/src/java/org/apache/solr/security/AuditLoggerPlugin.java | 1 -
solr/core/src/java/org/apache/solr/security/AuthenticationPlugin.java | 2 --
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index a1a2685..8767f00 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -79,6 +79,8 @@ Improvements
* SOLR-13677: All Metrics Gauges should be unregistered by the objects that registered them (noble)
+* SOLR-13702: Some components register twice their metric names (janhoy)
+
Bug Fixes
----------------------
diff --git a/solr/core/src/java/org/apache/solr/security/AuditLoggerPlugin.java b/solr/core/src/java/org/apache/solr/security/AuditLoggerPlugin.java
index 544f822..a6c364a 100644
--- a/solr/core/src/java/org/apache/solr/security/AuditLoggerPlugin.java
+++ b/solr/core/src/java/org/apache/solr/security/AuditLoggerPlugin.java
@@ -257,7 +257,6 @@ public abstract class AuditLoggerPlugin implements Closeable, Runnable, SolrInfo
queuedTime = manager.timer(this, registryName, "queuedTime", getCategory().toString(), scope, className);
}
manager.registerGauge(this, registryName, () -> async, "async", true, "async", getCategory().toString(), scope, className);
- metricNames.addAll(Arrays.asList("errors", "logged", "requestTimes", "totalTime", "queueCapacity", "queueSize", "async"));
}
@Override
diff --git a/solr/core/src/java/org/apache/solr/security/AuthenticationPlugin.java b/solr/core/src/java/org/apache/solr/security/AuthenticationPlugin.java
index 8044af9..ca342b0 100644
--- a/solr/core/src/java/org/apache/solr/security/AuthenticationPlugin.java
+++ b/solr/core/src/java/org/apache/solr/security/AuthenticationPlugin.java
@@ -157,8 +157,6 @@ public abstract class AuthenticationPlugin implements SolrInfoBean, SolrMetricPr
numMissingCredentials = this.metrics.counter(this, "failMissingCredentials",getCategory().toString());
requestTimes = this.metrics.timer(this,"requestTimes", getCategory().toString());
totalTime = this.metrics.counter(this,"totalTime", getCategory().toString());
- metricNames.addAll(Arrays.asList("errors", "requests", "authenticated", "passThrough",
- "failWrongCredentials", "failMissingCredentials", "requestTimes", "totalTime"));
}
@Override
[lucene-solr] 02/02: SOLR-13702: Fix precommit
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 035d823acf752d5794cfd07e133a918f0fb6b8c6
Author: Jan Høydahl <ja...@apache.org>
AuthorDate: Fri Aug 23 18:19:35 2019 +0200
SOLR-13702: Fix precommit
---
solr/core/src/java/org/apache/solr/security/AuthenticationPlugin.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/solr/core/src/java/org/apache/solr/security/AuthenticationPlugin.java b/solr/core/src/java/org/apache/solr/security/AuthenticationPlugin.java
index ca342b0..a0ec89a 100644
--- a/solr/core/src/java/org/apache/solr/security/AuthenticationPlugin.java
+++ b/solr/core/src/java/org/apache/solr/security/AuthenticationPlugin.java
@@ -19,7 +19,6 @@ package org.apache.solr.security;
import javax.servlet.FilterChain;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import java.util.Arrays;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;