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 2012/01/12 18:14:01 UTC
svn commit: r1230647 - in
/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update:
TransactionLog.java UpdateLog.java
Author: yonik
Date: Thu Jan 12 17:14:01 2012
New Revision: 1230647
URL: http://svn.apache.org/viewvc?rev=1230647&view=rev
Log:
corrupt tlog shouldn't stop core from coming up
Modified:
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/TransactionLog.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/UpdateLog.java
Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/TransactionLog.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/TransactionLog.java?rev=1230647&r1=1230646&r2=1230647&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/TransactionLog.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/TransactionLog.java Thu Jan 12 17:14:01 2012
@@ -124,11 +124,11 @@ public class TransactionLog {
}
- TransactionLog(File tlogFile, Collection<String> globalStrings) {
+ TransactionLog(File tlogFile, Collection<String> globalStrings) throws IOException {
this(tlogFile, globalStrings, false);
}
- TransactionLog(File tlogFile, Collection<String> globalStrings, boolean openExisting) {
+ TransactionLog(File tlogFile, Collection<String> globalStrings, boolean openExisting) throws IOException {
try {
if (debug) {
log.debug("New TransactionLog file=" + tlogFile + ", exists=" + tlogFile.exists() + ", size=" + tlogFile.length() + ", openExisting=" + openExisting);
Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/UpdateLog.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/UpdateLog.java?rev=1230647&r1=1230646&r2=1230647&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/UpdateLog.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/UpdateLog.java Thu Jan 12 17:14:01 2012
@@ -148,8 +148,13 @@ public class UpdateLog implements Plugin
TransactionLog oldLog = null;
for (String oldLogName : tlogFiles) {
- // TODO: what about an uncompleted tlog file?
- oldLog = new TransactionLog( new File(tlogDir, oldLogName), null, true );
+ File f = new File(tlogDir, oldLogName);
+ try {
+ oldLog = new TransactionLog( f, null, true );
+ } catch (IOException e) {
+ log.warn("Failure to open existing log file " + f, e);
+ f.delete();
+ }
addOldLog(oldLog);
}
newestLogOnStartup = oldLog;
@@ -542,7 +547,11 @@ public class UpdateLog implements Plugin
private void ensureLog() {
if (tlog == null) {
String newLogName = String.format("%s.%019d", TLOG_NAME, id);
- tlog = new TransactionLog(new File(tlogDir, newLogName), globalStrings);
+ try {
+ tlog = new TransactionLog(new File(tlogDir, newLogName), globalStrings);
+ } catch (IOException e) {
+ throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Can't open new tlog!", e);
+ }
}
}