codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-28 21:39:52 +00:00
Code Issues Releases Wiki Activity

Reverted code to retry solr core open

Browse Source
This commit is contained in:
Eugene Livis
2017-08-24 15:55:29 -04:00
parent 160a241780
commit 12f0ca2695
1 changed files with 21 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
+21 -60
View File
@@ -189,8 +189,6 @@ public class Server {
private static final boolean DEBUG = false;//(Version.getBuildType() == Version.Type.DEVELOPMENT);
private static final String SOLR = "solr";
private static final String CORE_PROPERTIES = "core.properties";
private static final int MAX_NUM_CORE_OPEN_ATTEMPTS = 3; // number of times to attempt loading a Solr core
private static final int TIME_TO_SLEEP_BETWEEN_RETRIES_MILLISECONDS = 10000; // wait 10 seconds before re-trying
public enum CORE_EVT_STATES {
@@ -646,36 +644,7 @@ public class Server {
void openCoreForCase(Case theCase, Index index) throws KeywordSearchModuleException {
currentCoreLock.writeLock().lock();
try {
// establish connection to Solr server
connectToServer(theCase.getCaseType());
int tryNum = 0;
while (tryNum < MAX_NUM_CORE_OPEN_ATTEMPTS) {
tryNum++;
try {
// open Solr core
currentCore = openCore(theCase.getCaseType(), index);
break;
} catch (KeywordSearchModuleException ex) {
if (tryNum == MAX_NUM_CORE_OPEN_ATTEMPTS) {
throw new KeywordSearchModuleException(NbBundle.getMessage(this.getClass(), "Server.openCore.exception.cantOpen.msg"), ex);
} else {
try {
/*
NOTE: It has been noticed that in rare cases Solr throws an exception
when trying to open a core that is stored on a network drive because
it thinks that some files are missing in the index folder. Same core is observed to
be successfully opened just seconds later by other Autopsy instances.
Therefore a re-try is being added to hopefully mitigate this (see JIRA-2941)
*/
logger.log(Level.WARNING, "Unable to open Solr core in " + index.getIndexPath() + ", re-trying", ex);
Thread.sleep(TIME_TO_SLEEP_BETWEEN_RETRIES_MILLISECONDS);
} catch (InterruptedException ex2) {
logger.log(Level.SEVERE, "Unexpected interrupt while waiting betwen Solr core re-tries", ex2);
}
}
}
}
currentCore = openCore(theCase, index);
try {
// execute a test query. if it fails, an exception will be thrown
@@ -784,7 +753,7 @@ public class Server {
/**
* Creates/opens a Solr core (index) for a case.
*
* @param theCase Type of the current case
* @param theCase The case for which the core is to be created/opened.
* @param index The text index that the Solr core should be using.
*
* @return An object representing the created/opened core.
@@ -792,7 +761,21 @@ public class Server {
* @throws KeywordSearchModuleException If an error occurs while
* creating/opening the core.
*/
private Core openCore(CaseType caseType, Index index) throws KeywordSearchModuleException {
private Core openCore(Case theCase, Index index) throws KeywordSearchModuleException {
try {
if (theCase.getCaseType() == CaseType.SINGLE_USER_CASE) {
currentSolrServer = this.localSolrServer;
} else {
String host = UserPreferences.getIndexingServerHost();
String port = UserPreferences.getIndexingServerPort();
currentSolrServer = new HttpSolrServer("http://" + host + ":" + port + "/solr"); //NON-NLS
}
connectToSolrServer(currentSolrServer);
} catch (SolrServerException | IOException ex) {
throw new KeywordSearchModuleException(NbBundle.getMessage(Server.class, "Server.connect.exception.msg", ex.getLocalizedMessage()), ex);
}
try {
File dataDir = new File(new File(index.getIndexPath()).getParent()); // "data dir" is the parent of the index directory
@@ -815,7 +798,7 @@ public class Server {
// In single user mode, if there is a core.properties file already,
// we've hit a solr bug. Compensate by deleting it.
if (caseType == CaseType.SINGLE_USER_CASE) {
if (theCase.getCaseType() == CaseType.SINGLE_USER_CASE) {
Path corePropertiesFile = Paths.get(solrFolder.toString(), SOLR, coreName, CORE_PROPERTIES);
if (corePropertiesFile.toFile().exists()) {
try {
@@ -839,34 +822,12 @@ public class Server {
throw new KeywordSearchModuleException(NbBundle.getMessage(this.getClass(), "Server.openCore.exception.noIndexDir.msg"));
}
return new Core(coreName, caseType, index);
return new Core(coreName, theCase.getCaseType(), index);
} catch (Exception ex) {
} catch (SolrServerException | SolrException | IOException ex) {
throw new KeywordSearchModuleException(NbBundle.getMessage(this.getClass(), "Server.openCore.exception.cantOpen.msg"), ex);
}
}
/**
* Connect to Solr server.
*
* @param caseType Type of the current case
* @throws KeywordSearchModuleException If unable to connect to Solr server
*/
void connectToServer(CaseType caseType) throws KeywordSearchModuleException {
try {
if (caseType == CaseType.SINGLE_USER_CASE) {
currentSolrServer = this.localSolrServer;
} else {
String host = UserPreferences.getIndexingServerHost();
String port = UserPreferences.getIndexingServerPort();
currentSolrServer = new HttpSolrServer("http://" + host + ":" + port + "/solr"); //NON-NLS
}
connectToSolrServer(currentSolrServer);
} catch (SolrServerException | IOException ex) {
throw new KeywordSearchModuleException(NbBundle.getMessage(Server.class, "Server.connect.exception.msg", ex.getLocalizedMessage()), ex);
}
}
/**
* Commits current core if it exists
@@ -1530,4 +1491,4 @@ public class Server {
return port;
}
}
}
}