You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2018/02/13 03:35:32 UTC
lucene-solr:master: SOLR-11898: ConcurrentModificationException when
calling org.apache.solr.core.SolrInfoBean.getMetricsSnapshot
Repository: lucene-solr
Updated Branches:
refs/heads/master 034677d5c -> b5bf3b9c3
SOLR-11898: ConcurrentModificationException when calling org.apache.solr.core.SolrInfoBean.getMetricsSnapshot
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b5bf3b9c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b5bf3b9c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b5bf3b9c
Branch: refs/heads/master
Commit: b5bf3b9c3844a739ef5b2f6317480b37dd0fe47b
Parents: 034677d
Author: Erick Erickson <er...@apache.org>
Authored: Mon Feb 12 19:25:13 2018 -0800
Committer: Erick Erickson <er...@apache.org>
Committed: Mon Feb 12 19:35:11 2018 -0800
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
solr/core/src/java/org/apache/solr/search/FastLRUCache.java | 4 ++--
solr/core/src/java/org/apache/solr/search/LFUCache.java | 4 ++--
solr/core/src/java/org/apache/solr/search/LRUCache.java | 4 ++--
4 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b5bf3b9c/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 2f6005f..3a6f905 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -200,6 +200,9 @@ Bug Fixes
* SOLR-10261: In case of in-place updates, failure in leader to follower replica update request now throws the
follower replica in leader-initiated-recovery (Ishan Chattopadhyaya, Steve Rowe)
+* SOLR-11898: ConcurrentModificationException when calling org.apache.solr.core.SolrInfoBean.getMetricsSnapshot
+ (Jeff Miller via Erick Erickson)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b5bf3b9c/solr/core/src/java/org/apache/solr/search/FastLRUCache.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/FastLRUCache.java b/solr/core/src/java/org/apache/solr/search/FastLRUCache.java
index 1cf4443..b2e56a8 100644
--- a/solr/core/src/java/org/apache/solr/search/FastLRUCache.java
+++ b/solr/core/src/java/org/apache/solr/search/FastLRUCache.java
@@ -25,7 +25,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;
-import java.util.HashSet;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -60,7 +60,7 @@ public class FastLRUCache<K, V> extends SolrCacheBase implements SolrCache<K,V>
private long maxRamBytes;
private MetricsMap cacheMap;
- private Set<String> metricNames = new HashSet<>();
+ private Set<String> metricNames = ConcurrentHashMap.newKeySet();
private MetricRegistry registry;
@Override
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b5bf3b9c/solr/core/src/java/org/apache/solr/search/LFUCache.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/LFUCache.java b/solr/core/src/java/org/apache/solr/search/LFUCache.java
index f502b03..7d41ae3 100644
--- a/solr/core/src/java/org/apache/solr/search/LFUCache.java
+++ b/solr/core/src/java/org/apache/solr/search/LFUCache.java
@@ -17,7 +17,7 @@
package org.apache.solr.search;
import java.lang.invoke.MethodHandles;
-import java.util.HashSet;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -65,7 +65,7 @@ public class LFUCache<K, V> implements SolrCache<K, V> {
private int showItems = 0;
private Boolean timeDecay = true;
private MetricsMap cacheMap;
- private Set<String> metricNames = new HashSet<>();
+ private Set<String> metricNames = ConcurrentHashMap.newKeySet();
private MetricRegistry registry;
@Override
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b5bf3b9c/solr/core/src/java/org/apache/solr/search/LRUCache.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/LRUCache.java b/solr/core/src/java/org/apache/solr/search/LRUCache.java
index cbd3979..af05dad 100644
--- a/solr/core/src/java/org/apache/solr/search/LRUCache.java
+++ b/solr/core/src/java/org/apache/solr/search/LRUCache.java
@@ -19,7 +19,7 @@ package org.apache.solr.search;
import java.lang.invoke.MethodHandles;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashSet;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -87,7 +87,7 @@ public class LRUCache<K,V> extends SolrCacheBase implements SolrCache<K,V>, Acco
private Map<K,V> map;
private String description="LRU Cache";
private MetricsMap cacheMap;
- private Set<String> metricNames = new HashSet<>();
+ private Set<String> metricNames = ConcurrentHashMap.newKeySet();
private MetricRegistry registry;
private long maxRamBytes = Long.MAX_VALUE;