Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

logging: improve for RecoveryStrategy 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1296839 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2012-03-04 17:23:38 +00:00
parent ce099776fd
commit 8c7c6890ad
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
View File

@ -202,6 +202,8 @@ public class RecoveryStrategy extends Thread implements SafeStopThread {
SolrQueryResponse rsp = new SolrQueryResponse();
SolrRequestInfo.setRequestInfo(new SolrRequestInfo(req, rsp));
log.info("Starting recovery process. recoveringAfterStartup=" + recoveringAfterStartup);
try {
doRecovery(core);
} finally {
@ -247,11 +249,10 @@ public class RecoveryStrategy extends Thread implements SafeStopThread {
if (oldIdx > 0) {
log.info("####### Found new versions added after startup: num=" + oldIdx);
log.info("###### currentVersions=" + startingRecentVersions);
}
// TODO: only log at debug level in the future (or move to oldIdx > 0 block)
log.info("###### startupVersions=" + reallyStartingVersions);
log.info("###### currentVersions=" + startingRecentVersions);
}
if (recoveringAfterStartup) {
@ -355,7 +356,7 @@ public class RecoveryStrategy extends Thread implements SafeStopThread {
log.warn("Recovery was interrupted", e);
retries = INTERRUPTED;
} catch (Throwable t) {
SolrException.log(log, "Error while trying to recover", t);
log.error("Error while trying to recover", t);
} finally {
if (!replayed) {
try {
@ -368,12 +369,10 @@ public class RecoveryStrategy extends Thread implements SafeStopThread {
}
} catch (Throwable t) {
SolrException.log(log, "Error while trying to recover", t);
log.error("Error while trying to recover... closing core.", t);
} finally {
if (core != null) {
core.close();
}
}
if (!successfulRecovery) {
// lets pause for a moment and we need to try again...
@ -381,23 +380,22 @@ public class RecoveryStrategy extends Thread implements SafeStopThread {
// Or do a fall off retry...
try {
SolrException.log(log, "Recovery failed - trying again...");
log.error("Recovery failed - trying again...");
retries++;
if (retries >= MAX_RETRIES) {
if (retries == INTERRUPTED) {
} else {
log.error("Recovery failed - max retries exceeded.");
// TODO: for now, give up after X tries - should we do more?
core = cc.getCore(coreName);
try {
recoveryFailed(core, zkController, baseUrl, coreZkNodeName,
core.getCoreDescriptor());
} finally {
if (core != null) {
core.close();
}
}
}
break;
}
@ -414,11 +412,10 @@ public class RecoveryStrategy extends Thread implements SafeStopThread {
}
}
}
log.info("Finished recovery process");
}
}
private Future<RecoveryInfo> replay(UpdateLog ulog)
throws InterruptedException, ExecutionException, TimeoutException {