Brute-force attempt to start solr in case of a memory problem.

I don't actually know if this is correct. It is a desperate try to get
YaCy running on production servers which must get alive even with
strange hacks like this. This is also related to a forum posting in
http://forum.yacy-websuche.de/viewtopic.php?t=4528&p=27135#p27135
pull/1/head
Michael Peter Christen 12 years ago
parent 8aa08261a7
commit d4bfe9339e

@ -28,6 +28,7 @@ import javax.xml.parsers.ParserConfigurationException;
import net.yacy.cora.federate.solr.SolrServlet; import net.yacy.cora.federate.solr.SolrServlet;
import net.yacy.cora.federate.solr.YaCySchema; import net.yacy.cora.federate.solr.YaCySchema;
import net.yacy.kelondro.util.MemoryControl;
import org.apache.solr.client.solrj.SolrServerException; import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer; import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
@ -58,9 +59,9 @@ public class EmbeddedSolrConnector extends SolrServerConnector implements SolrCo
public static final String CONTEXT = "/solr"; public static final String CONTEXT = "/solr";
private final static String[] confFiles = {"solrconfig.xml", "schema.xml", "stopwords.txt", "synonyms.txt", "protwords.txt", "currency.xml", "elevate.xml", "xslt/example.xsl", "xslt/json.xsl", "lang/"}; private final static String[] confFiles = {"solrconfig.xml", "schema.xml", "stopwords.txt", "synonyms.txt", "protwords.txt", "currency.xml", "elevate.xml", "xslt/example.xsl", "xslt/json.xsl", "lang/"};
private final CoreContainer cores; private CoreContainer cores;
private final String defaultCoreName; private final String defaultCoreName;
private final SolrCore defaultCore; private SolrCore defaultCore;
private final SearchHandler requestHandler; private final SearchHandler requestHandler;
private final File storagePath; private final File storagePath;
@ -97,6 +98,11 @@ public class EmbeddedSolrConnector extends SolrServerConnector implements SolrCo
try { try {
this.cores = new CoreContainer(storagePath.getAbsolutePath(), new File(solr_config, "solr.xml")); this.cores = new CoreContainer(storagePath.getAbsolutePath(), new File(solr_config, "solr.xml"));
if (this.cores == null) {
// try again
System.gc();
this.cores = new CoreContainer(storagePath.getAbsolutePath(), new File(solr_config, "solr.xml"));
}
} catch (ParserConfigurationException e) { } catch (ParserConfigurationException e) {
throw new IOException(e.getMessage(), e); throw new IOException(e.getMessage(), e);
} catch (SAXException e) { } catch (SAXException e) {
@ -104,6 +110,14 @@ public class EmbeddedSolrConnector extends SolrServerConnector implements SolrCo
} }
this.defaultCoreName = this.cores.getDefaultCoreName(); this.defaultCoreName = this.cores.getDefaultCoreName();
this.defaultCore = this.cores.getCore(this.defaultCoreName); // should be "collection1" this.defaultCore = this.cores.getCore(this.defaultCoreName); // should be "collection1"
if (this.defaultCore == null) {
// try again
System.gc();
this.defaultCore = this.cores.getCore(this.defaultCoreName); // should be "collection1"
}
if (this.defaultCore == null) {
throw new IOException("cannot get the default core; available = " + MemoryControl.available() + ", free = " + MemoryControl.free());
}
final NamedList<Object> config = new NamedList<Object>(); final NamedList<Object> config = new NamedList<Object>();
this.requestHandler = new SearchHandler(); this.requestHandler = new SearchHandler();
this.requestHandler.init(config); this.requestHandler.init(config);

@ -170,7 +170,7 @@ public class RemoteSolrConnector extends SolrServerConnector implements SolrConn
if (q != null) Thread.currentThread().setName(threadname); if (q != null) Thread.currentThread().setName(threadname);
return response; return response;
} catch (SolrServerException e) { } catch (SolrServerException e) {
throw new IOException(e); throw new IOException(e.getMessage());
} catch (Throwable e) { } catch (Throwable e) {
throw new IOException("Error executing query", e); throw new IOException("Error executing query", e);
} }

Loading…
Cancel
Save