You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2011/12/08 06:07:05 UTC
svn commit: r1211756 - in /lucene/dev/branches/solrcloud/solr:
core/src/java/org/apache/solr/core/ core/src/java/org/apache/solr/servlet/
core/src/test/org/apache/solr/search/
test-framework/src/java/org/apache/solr/util/
Author: yonik
Date: Thu Dec 8 05:07:05 2011
New Revision: 1211756
URL: http://svn.apache.org/viewvc?rev=1211756&view=rev
Log:
re-enable recovery from tlog if not in zk mode
Modified:
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/CoreContainer.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/search/TestRecovery.java
lucene/dev/branches/solrcloud/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java
Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/CoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/CoreContainer.java?rev=1211756&r1=1211755&r2=1211756&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/CoreContainer.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/CoreContainer.java Thu Dec 8 05:07:05 2011
@@ -215,37 +215,16 @@ public class CoreContainer
// Helper class to initialize the CoreContainer
public static class Initializer {
- protected String solrConfigFilename = null;
+ protected String containerConfigFilename = null; // normally "solr.xml"
protected String dataDir = null; // override datadir for single core mode
- /**
- * @deprecated all cores now abort on configuration error regardless of configuration
- */
- @Deprecated
- public boolean isAbortOnConfigurationError() {
- return true;
- }
-
- /**
- * @exception generates an error if you attempt to set this value to false
- * @deprecated all cores now abort on configuration error regardless of configuration
- */
- @Deprecated
- public void setAbortOnConfigurationError(boolean abortOnConfigurationError) {
- if (false == abortOnConfigurationError)
- throw new SolrException
- (SolrException.ErrorCode.SERVER_ERROR,
- "Setting abortOnConfigurationError==false is no longer supported");
- }
-
// core container instantiation
public CoreContainer initialize() throws IOException,
ParserConfigurationException, SAXException {
CoreContainer cores = null;
String solrHome = SolrResourceLoader.locateSolrHome();
- // TODO : fix broken logic confusing solr.xml with solrconfig.xml
- File fconf = new File(solrHome, solrConfigFilename == null ? "solr.xml"
- : solrConfigFilename);
+ File fconf = new File(solrHome, containerConfigFilename == null ? "solr.xml"
+ : containerConfigFilename);
log.info("looking for solr.xml: " + fconf.getAbsolutePath());
cores = new CoreContainer();
@@ -257,7 +236,7 @@ public class CoreContainer
cores.configFile = fconf;
}
- solrConfigFilename = cores.getConfigFile().getName();
+ containerConfigFilename = cores.getConfigFile().getName();
return cores;
}
@@ -658,6 +637,12 @@ public class CoreContainer
}
SolrCore core = new SolrCore(dcore.getName(), null, config, schema, dcore);
+
+ if (zkController == null) {
+ // always kick off recovery if we are in standalone mode.
+ core.getUpdateHandler().getUpdateLog().recoverFromLog();
+ }
+
return core;
}
Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java?rev=1211756&r1=1211755&r2=1211756&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java Thu Dec 8 05:07:05 2011
@@ -66,7 +66,6 @@ public class SolrDispatchFilter implemen
protected String pathPrefix = null; // strip this from the beginning of a path
protected String abortErrorMessage = null;
- protected String solrConfigFilename = null;
protected final Map<SolrConfig, SolrRequestParsers> parsers = new WeakHashMap<SolrConfig, SolrRequestParsers>();
protected final SolrRequestParsers adminRequestParser;
@@ -92,7 +91,6 @@ public class SolrDispatchFilter implemen
this.pathPrefix = config.getInitParameter( "path-prefix" );
this.cores = init.initialize();
- abortOnConfigurationError = init.isAbortOnConfigurationError();
log.info("user.dir=" + System.getProperty("user.dir"));
}
catch( Throwable t ) {
Modified: lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/search/TestRecovery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/search/TestRecovery.java?rev=1211756&r1=1211755&r2=1211756&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/search/TestRecovery.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/search/TestRecovery.java Thu Dec 8 05:07:05 2011
@@ -82,8 +82,8 @@ public class TestRecovery extends SolrTe
h.close();
createCore();
- // TODO: kick off this from solr if leader (at a minimum)
- h.getCore().getUpdateHandler().getUpdateLog().recoverFromLog();
+ // Solr should kick this off now
+ // h.getCore().getUpdateHandler().getUpdateLog().recoverFromLog();
// verify that previous close didn't do a commit
// recovery should be blocked by our hook
@@ -108,8 +108,8 @@ public class TestRecovery extends SolrTe
h.close();
createCore();
- // TODO: kick off this from solr if leader (at a minimum)
- h.getCore().getUpdateHandler().getUpdateLog().recoverFromLog();
+ // Solr should kick this off now
+ // h.getCore().getUpdateHandler().getUpdateLog().recoverFromLog();
// wait until recovery has finished
assertTrue(logReplayFinish.tryAcquire(60, TimeUnit.SECONDS));
@@ -120,8 +120,8 @@ public class TestRecovery extends SolrTe
h.close();
int permits = logReplay.availablePermits();
createCore();
- // TODO: kick off this from solr if leader (at a minimum)
- h.getCore().getUpdateHandler().getUpdateLog().recoverFromLog();
+ // Solr should kick this off now
+ // h.getCore().getUpdateHandler().getUpdateLog().recoverFromLog();
assertJQ(req("q","*:*") ,"/response/numFound==3");
Thread.sleep(100);
Modified: lucene/dev/branches/solrcloud/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java?rev=1211756&r1=1211755&r2=1211756&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java (original)
+++ lucene/dev/branches/solrcloud/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java Thu Dec 8 05:07:05 2011
@@ -216,6 +216,12 @@ public class TestHarness {
SolrCore core = new SolrCore(coreName, dataDirectory, solrConfig, indexSchema, dcore);
container.register(coreName, core, false);
+ // TODO: we should be exercising the *same* core container initialization code, not equivalent code!
+ if (container.getZkController() == null) {
+ // always kick off recovery if we are in standalone mode.
+ core.getUpdateHandler().getUpdateLog().recoverFromLog();
+ }
+
return container;
}
}