You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/10/13 18:54:03 UTC
svn commit: r1397893 - in /lucene/dev/branches/lucene4446: ./ lucene/
lucene/core/ lucene/core/src/java/org/apache/lucene/util/fst/ lucene/suggest/
lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/
lucene/suggest/src/test/org/apache/l...
Author: rmuir
Date: Sat Oct 13 16:54:02 2012
New Revision: 1397893
URL: http://svn.apache.org/viewvc?rev=1397893&view=rev
Log:
merge trunk
Added:
lucene/dev/branches/lucene4446/solr/contrib/uima/src/test/org/apache/solr/uima/analysis/UIMATokenizersSolrIntegrationTest.java
- copied unchanged from r1397892, lucene/dev/trunk/solr/contrib/uima/src/test/org/apache/solr/uima/analysis/UIMATokenizersSolrIntegrationTest.java
lucene/dev/branches/lucene4446/solr/core/src/test-files/solr/collection1/conf/solrconfig-indexconfig.xml
- copied unchanged from r1397892, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-indexconfig.xml
lucene/dev/branches/lucene4446/solr/core/src/test/org/apache/solr/core/TestSolrIndexConfig.java
- copied unchanged from r1397892, lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrIndexConfig.java
Removed:
lucene/dev/branches/lucene4446/solr/contrib/uima/src/test/org/apache/solr/uima/analysis/UIMAAnnotationsTokenizerFactoryTest.java
lucene/dev/branches/lucene4446/solr/contrib/uima/src/test/org/apache/solr/uima/analysis/UIMATypeAwareAnnotationsTokenizerFactoryTest.java
Modified:
lucene/dev/branches/lucene4446/ (props changed)
lucene/dev/branches/lucene4446/lucene/ (props changed)
lucene/dev/branches/lucene4446/lucene/core/ (props changed)
lucene/dev/branches/lucene4446/lucene/core/src/java/org/apache/lucene/util/fst/Util.java
lucene/dev/branches/lucene4446/lucene/suggest/ (props changed)
lucene/dev/branches/lucene4446/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java
lucene/dev/branches/lucene4446/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java
lucene/dev/branches/lucene4446/solr/ (props changed)
lucene/dev/branches/lucene4446/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene4446/solr/contrib/ (props changed)
lucene/dev/branches/lucene4446/solr/contrib/uima/src/java/org/apache/solr/uima/processor/FieldMappingException.java
lucene/dev/branches/lucene4446/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfiguration.java
lucene/dev/branches/lucene4446/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfigurationReader.java
lucene/dev/branches/lucene4446/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java
lucene/dev/branches/lucene4446/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java
lucene/dev/branches/lucene4446/solr/core/ (props changed)
lucene/dev/branches/lucene4446/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
lucene/dev/branches/lucene4446/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java
lucene/dev/branches/lucene4446/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
lucene/dev/branches/lucene4446/solr/core/src/java/org/apache/solr/cloud/ZkController.java
lucene/dev/branches/lucene4446/solr/core/src/java/org/apache/solr/update/PeerSync.java
lucene/dev/branches/lucene4446/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
lucene/dev/branches/lucene4446/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
lucene/dev/branches/lucene4446/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java
lucene/dev/branches/lucene4446/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
lucene/dev/branches/lucene4446/solr/example/ (props changed)
lucene/dev/branches/lucene4446/solr/example/solr/collection1/conf/solrconfig.xml
Modified: lucene/dev/branches/lucene4446/lucene/core/src/java/org/apache/lucene/util/fst/Util.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4446/lucene/core/src/java/org/apache/lucene/util/fst/Util.java?rev=1397893&r1=1397892&r2=1397893&view=diff
==============================================================================
--- lucene/dev/branches/lucene4446/lucene/core/src/java/org/apache/lucene/util/fst/Util.java (original)
+++ lucene/dev/branches/lucene4446/lucene/core/src/java/org/apache/lucene/util/fst/Util.java Sat Oct 13 16:54:02 2012
@@ -271,9 +271,6 @@ public final class Util {
final Comparator<T> comparator;
- // Set once the queue has filled:
- FSTPath<T> bottom = null;
-
TreeSet<FSTPath<T>> queue = null;
public TopNSearcher(FST<T> fst, int topN, Comparator<T> comparator) {
@@ -291,9 +288,10 @@ public final class Util {
assert queue != null;
T cost = fst.outputs.add(path.cost, path.arc.output);
- //System.out.println(" addIfCompetitive bottom=" + bottom + " queue.size()=" + queue.size());
+ //System.out.println(" addIfCompetitive queue.size()=" + queue.size() + " path=" + path + " + label=" + path.arc.label);
- if (bottom != null) {
+ if (queue.size() == topN) {
+ FSTPath<T> bottom = queue.last();
int comp = comparator.compare(cost, bottom.cost);
if (comp > 0) {
// Doesn't compete
@@ -323,24 +321,11 @@ public final class Util {
newInput.length = path.input.length+1;
final FSTPath<T> newPath = new FSTPath<T>(cost, path.arc, comparator, newInput);
- // this is pointless right? we do it above already:
- //newPath.input.grow(path.input.length+1);
- //System.arraycopy(path.input.ints, 0, newPath.input.ints, 0, path.input.length);
- //newPath.input.ints[path.input.length] = path.arc.label;
- //newPath.input.length = path.input.length+1;
-
- //System.out.println(" add path=" + newPath);
queue.add(newPath);
- if (bottom != null) {
- final FSTPath<T> removed = queue.pollLast();
- assert removed == bottom;
- bottom = queue.last();
- //System.out.println(" now re-set bottom: " + bottom + " queue=" + queue);
- } else if (queue.size() == topN) {
- // Queue just filled up:
- bottom = queue.last();
- //System.out.println(" now set bottom: " + bottom);
- }
+
+ if (queue.size() == topN+1) {
+ queue.pollLast();
+ }
}
/** Adds all leaving arcs, including 'finished' arc, if
@@ -387,7 +372,7 @@ public final class Util {
// For each top N path:
while (results.size() < topN) {
- //System.out.println("\nfind next path");
+ //System.out.println("\nfind next path: queue.size=" + queue.size());
FSTPath<T> path;
Modified: lucene/dev/branches/lucene4446/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4446/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java?rev=1397893&r1=1397892&r2=1397893&view=diff
==============================================================================
--- lucene/dev/branches/lucene4446/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java (original)
+++ lucene/dev/branches/lucene4446/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java Sat Oct 13 16:54:02 2012
@@ -533,9 +533,6 @@ public class AnalyzingSuggester extends
if (exactFirst) {
- Util.TopNSearcher<Pair<Long,BytesRef>> searcher;
- searcher = new Util.TopNSearcher<Pair<Long,BytesRef>>(fst, num, weightComparator);
-
int count = 0;
for (FSTUtil.Path<Pair<Long,BytesRef>> path : prefixPaths) {
if (fst.findTargetArc(END_BYTE, path.fstNode, scratchArc, bytesReader) != null) {
@@ -545,6 +542,9 @@ public class AnalyzingSuggester extends
}
}
+ // Searcher just to find the single exact only
+ // match, if present:
+ Util.TopNSearcher<Pair<Long,BytesRef>> searcher;
searcher = new Util.TopNSearcher<Pair<Long,BytesRef>>(fst, count * maxSurfaceFormsPerAnalyzedForm, weightComparator);
// NOTE: we could almost get away with only using
Modified: lucene/dev/branches/lucene4446/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4446/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java?rev=1397893&r1=1397892&r2=1397893&view=diff
==============================================================================
--- lucene/dev/branches/lucene4446/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java (original)
+++ lucene/dev/branches/lucene4446/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java Sat Oct 13 16:54:02 2012
@@ -789,4 +789,18 @@ public class AnalyzingSuggesterTest exte
assertEquals("a ", results.get(1).key);
assertEquals(50, results.get(1).value);
}
+
+ public void testQueueExhaustion() throws Exception {
+ Analyzer a = new MockAnalyzer(random());
+ AnalyzingSuggester suggester = new AnalyzingSuggester(a, a, AnalyzingSuggester.EXACT_FIRST, 256, -1);
+
+ suggester.build(new TermFreqArrayIterator(new TermFreq[] {
+ new TermFreq("a", 2),
+ new TermFreq("a b c", 3),
+ new TermFreq("a c a", 1),
+ new TermFreq("a c b", 1),
+ }));
+
+ List<LookupResult> results = suggester.lookup("a", false, 4);
+ }
}
Modified: lucene/dev/branches/lucene4446/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4446/solr/CHANGES.txt?rev=1397893&r1=1397892&r2=1397893&view=diff
==============================================================================
--- lucene/dev/branches/lucene4446/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene4446/solr/CHANGES.txt Sat Oct 13 16:54:02 2012
@@ -42,6 +42,8 @@ New Features
values of a multiValued field in their original order when highlighting.
(Joel Bernstein via yonik)
+* SOLR-3929: Support configuring IndexWriter max thread count in solrconfig.
+ (phunt via Mark Miller)
Optimizations
----------------------
@@ -58,6 +60,9 @@ Optimizations
* SOLR-3734: Improve Schema-Browser Handling for CopyField using
dynamicField's (steffkes)
+
+* SOLR-3941: The "commitOnLeader" part of distributed recovery can use
+ openSearcher=false. (Tomas Fernandez Lobbe via Mark Miller)
Bug Fixes
----------------------
@@ -69,6 +74,12 @@ Bug Fixes
* SOLR-3917: Partial State on Schema-Browser UI is not defined for Dynamic
Fields & Types (steffkes)
+
+* SOLR-3939: Consider a sync attempt from leader to replica that fails due
+ to 404 a success. (Mark Miller, Joel Bernstein)
+
+* SOLR-3940: Rejoining the leader election incorrectly triggers the code path
+ for a fresh cluster start rather than fail over. (Mark Miller)
Other Changes
----------------------
Modified: lucene/dev/branches/lucene4446/solr/contrib/uima/src/java/org/apache/solr/uima/processor/FieldMappingException.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4446/solr/contrib/uima/src/java/org/apache/solr/uima/processor/FieldMappingException.java?rev=1397893&r1=1397892&r2=1397893&view=diff
==============================================================================
--- lucene/dev/branches/lucene4446/solr/contrib/uima/src/java/org/apache/solr/uima/processor/FieldMappingException.java (original)
+++ lucene/dev/branches/lucene4446/solr/contrib/uima/src/java/org/apache/solr/uima/processor/FieldMappingException.java Sat Oct 13 16:54:02 2012
@@ -18,9 +18,10 @@ package org.apache.solr.uima.processor;
*/
/**
- * Exception thrown when an error happening while mapping UIMA CAS model to Solt fields
+ * Exception thrown when an error happening while mapping UIMA CAS model to Solr fields
*/
public class FieldMappingException extends Exception {
public FieldMappingException(Exception e) {
+ super(e);
}
}
Modified: lucene/dev/branches/lucene4446/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfiguration.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4446/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfiguration.java?rev=1397893&r1=1397892&r2=1397893&view=diff
==============================================================================
--- lucene/dev/branches/lucene4446/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfiguration.java (original)
+++ lucene/dev/branches/lucene4446/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfiguration.java Sat Oct 13 16:54:02 2012
@@ -26,19 +26,19 @@ import java.util.Map;
*/
public class SolrUIMAConfiguration {
- private String[] fieldsToAnalyze;
+ private final String[] fieldsToAnalyze;
- private boolean fieldsMerging;
+ private final boolean fieldsMerging;
- private Map<String, Map<String, MapField>> typesFeaturesFieldsMapping;
+ private final Map<String, Map<String, MapField>> typesFeaturesFieldsMapping;
- private String aePath;
+ private final String aePath;
- private Map<String, Object> runtimeParameters;
+ private final Map<String, Object> runtimeParameters;
- private boolean ignoreErrors;
+ private final boolean ignoreErrors;
- private String logField;
+ private final String logField;
SolrUIMAConfiguration(String aePath, String[] fieldsToAnalyze, boolean fieldsMerging,
Map<String, Map<String, MapField>> typesFeaturesFieldsMapping,
@@ -82,7 +82,8 @@ public class SolrUIMAConfiguration {
static final class MapField {
- private String fieldName, fieldNameFeature;
+ private String fieldName;
+ private final String fieldNameFeature;
private boolean prefix; // valid if dynamicField == true
// false: *_s, true: s_*
Modified: lucene/dev/branches/lucene4446/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfigurationReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4446/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfigurationReader.java?rev=1397893&r1=1397892&r2=1397893&view=diff
==============================================================================
--- lucene/dev/branches/lucene4446/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfigurationReader.java (original)
+++ lucene/dev/branches/lucene4446/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfigurationReader.java Sat Oct 13 16:54:02 2012
@@ -32,7 +32,7 @@ import org.apache.solr.uima.processor.So
*/
public class SolrUIMAConfigurationReader {
- private NamedList<Object> args;
+ private final NamedList<Object> args;
public SolrUIMAConfigurationReader(NamedList<Object> args) {
this.args = args;
Modified: lucene/dev/branches/lucene4446/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4446/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java?rev=1397893&r1=1397892&r2=1397893&view=diff
==============================================================================
--- lucene/dev/branches/lucene4446/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java (original)
+++ lucene/dev/branches/lucene4446/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java Sat Oct 13 16:54:02 2012
@@ -38,9 +38,9 @@ public class UIMAToSolrMapper {
private final Logger log = LoggerFactory.getLogger(UIMAToSolrMapper.class);
- private SolrInputDocument document;
+ private final SolrInputDocument document;
- private JCas cas;
+ private final JCas cas;
public UIMAToSolrMapper(SolrInputDocument document, JCas cas) {
this.document = document;
@@ -64,15 +64,15 @@ public class UIMAToSolrMapper {
String fieldNameFeatureValue = fieldNameFeature == null ? null :
fs.getFeatureValueAsString(type.getFeatureByBaseName(fieldNameFeature));
String fieldName = mapField.getFieldName(fieldNameFeatureValue);
- log.info(new StringBuffer("mapping ").append(typeName).append("@").append(featureName)
+ log.info(new StringBuilder("mapping ").append(typeName).append("@").append(featureName)
.append(" to ").append(fieldName).toString());
- String featureValue = null;
+ String featureValue;
if (fs instanceof Annotation && "coveredText".equals(featureName)) {
featureValue = ((Annotation) fs).getCoveredText();
} else {
featureValue = fs.getFeatureValueAsString(type.getFeatureByBaseName(featureName));
}
- log.info(new StringBuffer("writing ").append(featureValue).append(" in ").append(
+ log.info(new StringBuilder("writing ").append(featureValue).append(" in ").append(
fieldName).toString());
document.addField(fieldName, featureValue, 1.0f);
}
Modified: lucene/dev/branches/lucene4446/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4446/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java?rev=1397893&r1=1397892&r2=1397893&view=diff
==============================================================================
--- lucene/dev/branches/lucene4446/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java (original)
+++ lucene/dev/branches/lucene4446/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java Sat Oct 13 16:54:02 2012
@@ -73,16 +73,16 @@ public class UIMAUpdateRequestProcessor
/* get the fields to analyze */
String[] texts = getTextsToAnalyze(solrInputDocument);
- for (int i = 0; i < texts.length; i++) {
- text = texts[i];
- if (text != null && text.length()>0) {
+ for (String currentText : texts) {
+ text = currentText;
+ if (text != null && text.length() > 0) {
/* process the text value */
JCas jcas = processText(text);
UIMAToSolrMapper uimaToSolrMapper = new UIMAToSolrMapper(solrInputDocument, jcas);
/* get field mapping from config */
Map<String, Map<String, MapField>> typesAndFeaturesFieldsMap = solrUIMAConfiguration
- .getTypesFeaturesFieldsMapping();
+ .getTypesFeaturesFieldsMapping();
/* map type features on fields */
for (String typeFQN : typesAndFeaturesFieldsMap.keySet()) {
uimaToSolrMapper.map(typeFQN, typesAndFeaturesFieldsMap.get(typeFQN));
@@ -133,8 +133,8 @@ public class UIMAUpdateRequestProcessor
String[] textVals;
if (merge) {
StringBuilder unifiedText = new StringBuilder("");
- for (int i = 0; i < fieldsToAnalyze.length; i++) {
- unifiedText.append(String.valueOf(solrInputDocument.getFieldValue(fieldsToAnalyze[i])));
+ for (String aFieldsToAnalyze : fieldsToAnalyze) {
+ unifiedText.append(String.valueOf(solrInputDocument.getFieldValue(aFieldsToAnalyze)));
}
textVals = new String[1];
textVals[0] = unifiedText.toString();
@@ -150,7 +150,7 @@ public class UIMAUpdateRequestProcessor
/* process a field value executing UIMA the CAS containing it as document text */
private JCas processText(String textFieldValue) throws ResourceInitializationException,
AnalysisEngineProcessException {
- log.info(new StringBuffer("Analyzing text").toString());
+ log.info(new StringBuilder("Analyzing text").toString());
/* get the UIMA analysis engine */
AnalysisEngine ae = aeProvider.getAE();
@@ -160,7 +160,7 @@ public class UIMAUpdateRequestProcessor
/* perform analysis on text field */
ae.process(jcas);
- log.info(new StringBuilder("Text processing completed").toString());
+ log.info("Text processing completed");
return jcas;
}
Modified: lucene/dev/branches/lucene4446/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4446/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java?rev=1397893&r1=1397892&r2=1397893&view=diff
==============================================================================
--- lucene/dev/branches/lucene4446/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java (original)
+++ lucene/dev/branches/lucene4446/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java Sat Oct 13 16:54:02 2012
@@ -324,7 +324,7 @@ final class ShardLeaderElectionContext e
SolrException.log(log, "Error trying to start recovery", t);
}
- leaderElector.joinElection(this);
+ leaderElector.joinElection(this, true);
}
private boolean shouldIBeLeader(ZkNodeProps leaderProps, SolrCore core) {
Modified: lucene/dev/branches/lucene4446/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4446/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java?rev=1397893&r1=1397892&r2=1397893&view=diff
==============================================================================
--- lucene/dev/branches/lucene4446/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java (original)
+++ lucene/dev/branches/lucene4446/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java Sat Oct 13 16:54:02 2012
@@ -18,7 +18,6 @@ package org.apache.solr.cloud;
*/
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -43,7 +42,7 @@ import org.slf4j.LoggerFactory;
* Leader Election process. This class contains the logic by which a
* leader is chosen. First call * {@link #setup(ElectionContext)} to ensure
* the election process is init'd. Next call
- * {@link #joinElection(ElectionContext)} to start the leader election.
+ * {@link #joinElection(ElectionContext, boolean)} to start the leader election.
*
* The implementation follows the classic ZooKeeper recipe of creating an
* ephemeral, sequential node for each candidate and then looking at the set
@@ -203,7 +202,7 @@ public class LeaderElector {
*
* @return sequential node number
*/
- public int joinElection(ElectionContext context) throws KeeperException, InterruptedException, IOException {
+ public int joinElection(ElectionContext context, boolean replacement) throws KeeperException, InterruptedException, IOException {
final String shardsElectZkPath = context.electionPath + LeaderElector.ELECTION_NODE;
long sessionId = zkClient.getSolrZooKeeper().getSessionId();
@@ -259,7 +258,7 @@ public class LeaderElector {
}
}
int seq = getSeq(leaderSeqPath);
- checkIfIamLeader(seq, context, false);
+ checkIfIamLeader(seq, context, replacement);
return seq;
}
Modified: lucene/dev/branches/lucene4446/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4446/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java?rev=1397893&r1=1397892&r2=1397893&view=diff
==============================================================================
--- lucene/dev/branches/lucene4446/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java (original)
+++ lucene/dev/branches/lucene4446/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java Sat Oct 13 16:54:02 2012
@@ -37,6 +37,7 @@ import org.apache.solr.common.cloud.ZkNo
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.cloud.ZooKeeperException;
import org.apache.solr.common.params.ModifiableSolrParams;
+import org.apache.solr.common.params.UpdateParams;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.CoreDescriptor;
import org.apache.solr.core.RequestHandlers.LazyRequestHandlerWrapper;
@@ -177,6 +178,7 @@ public class RecoveryStrategy extends Th
UpdateRequest ureq = new UpdateRequest();
ureq.setParams(new ModifiableSolrParams());
ureq.getParams().set(DistributedUpdateProcessor.COMMIT_END_POINT, true);
+ ureq.getParams().set(UpdateParams.OPEN_SEARCHER, false);
ureq.setAction(AbstractUpdateRequest.ACTION.COMMIT, false, true).process(
server);
server.shutdown();
Modified: lucene/dev/branches/lucene4446/solr/core/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4446/solr/core/src/java/org/apache/solr/cloud/ZkController.java?rev=1397893&r1=1397892&r2=1397893&view=diff
==============================================================================
--- lucene/dev/branches/lucene4446/solr/core/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/dev/branches/lucene4446/solr/core/src/java/org/apache/solr/cloud/ZkController.java Sat Oct 13 16:54:02 2012
@@ -191,7 +191,7 @@ public final class ZkController {
ZkController.this.overseer = new Overseer(shardHandler, adminPath, zkStateReader);
ElectionContext context = new OverseerElectionContext(zkClient, overseer, getNodeName());
- overseerElector.joinElection(context);
+ overseerElector.joinElection(context, true);
zkStateReader.createClusterStateWatchersAndUpdate();
// cc.newCmdDistribExecutor();
@@ -422,7 +422,7 @@ public final class ZkController {
this.overseer = new Overseer(shardHandler, adminPath, zkStateReader);
ElectionContext context = new OverseerElectionContext(zkClient, overseer, getNodeName());
overseerElector.setup(context);
- overseerElector.joinElection(context);
+ overseerElector.joinElection(context, false);
zkStateReader.createClusterStateWatchersAndUpdate();
} catch (IOException e) {
@@ -730,7 +730,7 @@ public final class ZkController {
leaderElector.setup(context);
electionContexts.put(coreZkNodeName, context);
- leaderElector.joinElection(context);
+ leaderElector.joinElection(context, false);
}
Modified: lucene/dev/branches/lucene4446/solr/core/src/java/org/apache/solr/update/PeerSync.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4446/solr/core/src/java/org/apache/solr/update/PeerSync.java?rev=1397893&r1=1397892&r2=1397893&view=diff
==============================================================================
--- lucene/dev/branches/lucene4446/solr/core/src/java/org/apache/solr/update/PeerSync.java (original)
+++ lucene/dev/branches/lucene4446/solr/core/src/java/org/apache/solr/update/PeerSync.java Sat Oct 13 16:54:02 2012
@@ -312,6 +312,11 @@ public class PeerSync {
log.warn(msg() + " got a 503 from " + srsp.getShardAddress() + ", counting as success");
return true;
}
+
+ if (cantReachIsSuccess && sreq.purpose == 1 && srsp.getException() instanceof SolrException && ((SolrException) srsp.getException()).code() == 404) {
+ log.warn(msg() + " got a 404 from " + srsp.getShardAddress() + ", counting as success");
+ return true;
+ }
// TODO: at least log???
// srsp.getException().printStackTrace(System.out);
Modified: lucene/dev/branches/lucene4446/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4446/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java?rev=1397893&r1=1397892&r2=1397893&view=diff
==============================================================================
--- lucene/dev/branches/lucene4446/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java (original)
+++ lucene/dev/branches/lucene4446/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java Sat Oct 13 16:54:02 2012
@@ -44,6 +44,7 @@ public class SolrIndexConfig {
public final boolean useCompoundFile;
public final int maxBufferedDocs;
public final int maxMergeDocs;
+ public final int maxIndexingThreads;
public final int mergeFactor;
public final double ramBufferSizeMB;
@@ -71,6 +72,7 @@ public class SolrIndexConfig {
useCompoundFile = false;
maxBufferedDocs = -1;
maxMergeDocs = -1;
+ maxIndexingThreads = IndexWriterConfig.DEFAULT_MAX_THREAD_STATES;
mergeFactor = -1;
ramBufferSizeMB = 32;
writeLockTimeout = -1;
@@ -116,6 +118,7 @@ public class SolrIndexConfig {
useCompoundFile=solrConfig.getBool(prefix+"/useCompoundFile", def.useCompoundFile);
maxBufferedDocs=solrConfig.getInt(prefix+"/maxBufferedDocs",def.maxBufferedDocs);
maxMergeDocs=solrConfig.getInt(prefix+"/maxMergeDocs",def.maxMergeDocs);
+ maxIndexingThreads=solrConfig.getInt(prefix+"/maxIndexingThreads",def.maxIndexingThreads);
mergeFactor=solrConfig.getInt(prefix+"/mergeFactor",def.mergeFactor);
ramBufferSizeMB = solrConfig.getDouble(prefix+"/ramBufferSizeMB", def.ramBufferSizeMB);
@@ -176,6 +179,10 @@ public class SolrIndexConfig {
iwc.setMergePolicy(buildMergePolicy(schema));
iwc.setMergeScheduler(buildMergeScheduler(schema));
+ if (maxIndexingThreads != -1) {
+ iwc.setMaxThreadStates(maxIndexingThreads);
+ }
+
return iwc;
}
Modified: lucene/dev/branches/lucene4446/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4446/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java?rev=1397893&r1=1397892&r2=1397893&view=diff
==============================================================================
--- lucene/dev/branches/lucene4446/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java (original)
+++ lucene/dev/branches/lucene4446/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java Sat Oct 13 16:54:02 2012
@@ -49,6 +49,7 @@ import org.apache.solr.client.solrj.requ
import org.apache.solr.client.solrj.request.ContentStreamUpdateRequest;
import org.apache.solr.client.solrj.request.CoreAdminRequest;
import org.apache.solr.client.solrj.request.CoreAdminRequest.Create;
+import org.apache.solr.client.solrj.request.CoreAdminRequest.Unload;
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.client.solrj.response.CoreAdminResponse;
import org.apache.solr.client.solrj.response.QueryResponse;
@@ -742,10 +743,10 @@ public class BasicDistributedZkTest exte
0,
((HttpSolrServer) client).getBaseURL().length()
- DEFAULT_COLLECTION.length() - 1);
- createCollection(oneInstanceCollection2, collectionClients, baseUrl, 1, "slice1");
- createCollection(oneInstanceCollection2, collectionClients, baseUrl, 2, "slice2");
- createCollection(oneInstanceCollection2, collectionClients, baseUrl, 3, "slice2");
- createCollection(oneInstanceCollection2, collectionClients, baseUrl, 4, "slice1");
+ createSolrCore(oneInstanceCollection2, collectionClients, baseUrl, 1, "slice1");
+ createSolrCore(oneInstanceCollection2, collectionClients, baseUrl, 2, "slice2");
+ createSolrCore(oneInstanceCollection2, collectionClients, baseUrl, 3, "slice2");
+ createSolrCore(oneInstanceCollection2, collectionClients, baseUrl, 4, "slice1");
while (pending != null && pending.size() > 0) {
@@ -764,7 +765,7 @@ public class BasicDistributedZkTest exte
assertAllActive(oneInstanceCollection2, solrj.getZkStateReader());
- printLayout();
+ //printLayout();
// TODO: enable when we don't falsely get slice1...
// solrj.getZkStateReader().getLeaderUrl(oneInstanceCollection2, "slice1", 30000);
@@ -803,6 +804,27 @@ public class BasicDistributedZkTest exte
assertNotNull(slices);
String roles = slices.get("slice1").getReplicasMap().values().iterator().next().getStr(ZkStateReader.ROLES_PROP);
assertEquals("none", roles);
+
+
+ ZkCoreNodeProps props = new ZkCoreNodeProps(solrj.getZkStateReader().getClusterState().getLeader(oneInstanceCollection2, "slice1"));
+
+ // now test that unloading a core gets us a new leader
+ HttpSolrServer server = new HttpSolrServer(baseUrl);
+ Unload unloadCmd = new Unload(true);
+ unloadCmd.setCoreName(props.getCoreName());
+
+ String leader = props.getCoreUrl();
+
+ server.request(unloadCmd);
+
+ int tries = 50;
+ while (leader.equals(zkStateReader.getLeaderUrl(oneInstanceCollection2, "slice1", 10000))) {
+ Thread.sleep(100);
+ if (tries-- == 0) {
+ fail("Leader never changed");
+ }
+ }
+
}
private void testSearchByCollectionName() throws SolrServerException {
@@ -875,10 +897,10 @@ public class BasicDistributedZkTest exte
private void createCollection(String collection,
List<SolrServer> collectionClients, String baseUrl, int num) {
- createCollection(collection, collectionClients, baseUrl, num, null);
+ createSolrCore(collection, collectionClients, baseUrl, num, null);
}
- private void createCollection(final String collection,
+ private void createSolrCore(final String collection,
List<SolrServer> collectionClients, final String baseUrl, final int num,
final String shardId) {
Callable call = new Callable() {
Modified: lucene/dev/branches/lucene4446/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4446/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java?rev=1397893&r1=1397892&r2=1397893&view=diff
==============================================================================
--- lucene/dev/branches/lucene4446/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java (original)
+++ lucene/dev/branches/lucene4446/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java Sat Oct 13 16:54:02 2012
@@ -40,7 +40,6 @@ import org.apache.zookeeper.KeeperExcept
import org.apache.zookeeper.KeeperException.NoNodeException;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
@Slow
@@ -114,7 +113,7 @@ public class LeaderElectionTest extends
elector, "shard1", "collection1", Integer.toString(nodeNumber),
props, zkStateReader);
elector.setup(context);
- seq = elector.joinElection(context);
+ seq = elector.joinElection(context, false);
electionDone = true;
seqToThread.put(seq, this);
}
@@ -175,7 +174,7 @@ public class LeaderElectionTest extends
ElectionContext context = new ShardLeaderElectionContextBase(elector,
"shard2", "collection1", "dummynode1", props, zkStateReader);
elector.setup(context);
- elector.joinElection(context);
+ elector.joinElection(context, false);
assertEquals("http://127.0.0.1/solr/",
getLeaderUrl("collection1", "shard2"));
}
@@ -188,7 +187,7 @@ public class LeaderElectionTest extends
ElectionContext firstContext = new ShardLeaderElectionContextBase(first,
"slice1", "collection2", "dummynode1", props, zkStateReader);
first.setup(firstContext);
- first.joinElection(firstContext);
+ first.joinElection(firstContext, false);
Thread.sleep(1000);
assertEquals("original leader was not registered", "http://127.0.0.1/solr/1/", getLeaderUrl("collection2", "slice1"));
@@ -199,7 +198,7 @@ public class LeaderElectionTest extends
ElectionContext context = new ShardLeaderElectionContextBase(second,
"slice1", "collection2", "dummynode1", props, zkStateReader);
second.setup(context);
- second.joinElection(context);
+ second.joinElection(context, false);
Thread.sleep(1000);
assertEquals("original leader should have stayed leader", "http://127.0.0.1/solr/1/", getLeaderUrl("collection2", "slice1"));
firstContext.cancelElection();
Modified: lucene/dev/branches/lucene4446/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4446/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java?rev=1397893&r1=1397892&r2=1397893&view=diff
==============================================================================
--- lucene/dev/branches/lucene4446/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java (original)
+++ lucene/dev/branches/lucene4446/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java Sat Oct 13 16:54:02 2012
@@ -139,7 +139,7 @@ public class OverseerTest extends SolrTe
ShardLeaderElectionContextBase ctx = new ShardLeaderElectionContextBase(
elector, shardId, collection, nodeName + "_" + coreName, props,
zkStateReader);
- elector.joinElection(ctx);
+ elector.joinElection(ctx, false);
return shardId;
}
Thread.sleep(500);
@@ -876,7 +876,7 @@ public class OverseerTest extends SolrTe
new HttpShardHandlerFactory().getShardHandler(), "/admin/cores", reader);
ElectionContext ec = new OverseerElectionContext(zkClient, overseer, address.replaceAll("/", "_"));
overseerElector.setup(ec);
- overseerElector.joinElection(ec);
+ overseerElector.joinElection(ec, false);
return zkClient;
}
Modified: lucene/dev/branches/lucene4446/solr/example/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4446/solr/example/solr/collection1/conf/solrconfig.xml?rev=1397893&r1=1397892&r2=1397893&view=diff
==============================================================================
--- lucene/dev/branches/lucene4446/solr/example/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene4446/solr/example/solr/collection1/conf/solrconfig.xml Sat Oct 13 16:54:02 2012
@@ -136,6 +136,12 @@
<!-- Maximum time to wait for a write lock (ms) for an IndexWriter. Default: 1000 -->
<!-- <writeLockTimeout>1000</writeLockTimeout> -->
+ <!-- The maximum number of simultaneous threads that may be
+ indexing documents at once in IndexWriter; if more than this
+ many threads arrive they will wait for others to finish.
+ Default in Solr/Lucene is 8. -->
+ <!-- <maxIndexingThreads>8</maxIndexingThreads> -->
+
<!-- Expert: Enabling compound file will use less files for the index,
using fewer file descriptors on the expense of performance decrease.
Default in Lucene is "true". Default in Solr is "false" (since 3.6) -->