You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2018/04/13 10:46:02 UTC
lucene-solr:master: SOLR-12181: Fix NPE. Disable the test until it's
fixed.
Repository: lucene-solr
Updated Branches:
refs/heads/master e851b89cb -> dfc05faa3
SOLR-12181: Fix NPE. Disable the test until it's fixed.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/dfc05faa
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/dfc05faa
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/dfc05faa
Branch: refs/heads/master
Commit: dfc05faa352c7037c4924aafb2f5746872e36448
Parents: e851b89
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Fri Apr 13 12:44:59 2018 +0200
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Fri Apr 13 12:45:54 2018 +0200
----------------------------------------------------------------------
.../apache/solr/cloud/autoscaling/IndexSizeTriggerTest.java | 2 ++
.../solr/cloud/autoscaling/sim/SimClusterStateProvider.java | 9 +++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/dfc05faa/solr/core/src/test/org/apache/solr/cloud/autoscaling/IndexSizeTriggerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/IndexSizeTriggerTest.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/IndexSizeTriggerTest.java
index 79dd019..3bf7021 100644
--- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/IndexSizeTriggerTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/IndexSizeTriggerTest.java
@@ -29,6 +29,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrRequest;
@@ -64,6 +65,7 @@ import static org.apache.solr.common.cloud.ZkStateReader.SOLR_AUTOSCALING_CONF_P
*
*/
@LogLevel("org.apache.solr.cloud.autoscaling=DEBUG")
+@LuceneTestCase.AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-12181")
public class IndexSizeTriggerTest extends SolrCloudTestCase {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/dfc05faa/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/SimClusterStateProvider.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/SimClusterStateProvider.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/SimClusterStateProvider.java
index 9b3782a..12aa9c1 100644
--- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/SimClusterStateProvider.java
+++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/SimClusterStateProvider.java
@@ -1049,9 +1049,14 @@ public class SimClusterStateProvider implements ClusterStateProvider {
for (String id : deletes) {
Slice s = router.getTargetSlice(id, null, null, req.getParams(), coll);
// NOTE: we don't use getProperty because it uses PROPERTY_PROP_PREFIX
- String numDocsStr = s.getLeader().getStr("SEARCHER.searcher.numDocs");
+ Replica leader = s.getLeader();
+ if (leader == null) {
+ LOG.debug("-- no leader in " + s);
+ continue;
+ }
+ String numDocsStr = leader.getStr("SEARCHER.searcher.numDocs");
if (numDocsStr == null) {
- LOG.debug("-- no docs in " + s.getLeader());
+ LOG.debug("-- no docs in " + leader);
continue;
}
long numDocs = Long.parseLong(numDocsStr);