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 2013/05/16 22:50:00 UTC
svn commit: r1483561 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/cloud/ElectionContext.java
core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
core/src/java/org/apache/solr/update/UpdateLog.java
Author: yonik
Date: Thu May 16 20:49:59 2013
New Revision: 1483561
URL: http://svn.apache.org/r1483561
Log:
SOLR-4829: fix tlog leaks
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateLog.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1483561&r1=1483560&r2=1483561&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Thu May 16 20:49:59 2013
@@ -180,6 +180,10 @@ Bug Fixes
* SOLR-4813: Fix SynonymFilterFactory to allow init parameters for
tokenizer factory used when parsing synonyms file. (Shingo Sasaki, hossman)
+
+* SOLR-4829: Fix transaction log leaks (a failure to clean up some old logs)
+ on a shard leader, or when unexpected exceptions are thrown during log
+ recovery. (Steven Bower, Mark Miller, yonik)
Other Changes
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java?rev=1483561&r1=1483560&r2=1483561&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java Thu May 16 20:49:59 2013
@@ -186,15 +186,29 @@ final class ShardLeaderElectionContext e
}
UpdateLog ulog = core.getUpdateHandler().getUpdateLog();
-
- if (!success && (ulog == null || ulog.getRecentUpdates().getVersions(1).isEmpty())) {
- // we failed sync, but we have no versions - we can't sync in that case
- // - we were active
- // before, so become leader anyway
- log.info("We failed sync, but we have no versions - we can't sync in that case - we were active before, so become leader anyway");
- success = true;
+
+ if (!success) {
+ boolean hasRecentUpdates = false;
+ if (ulog != null) {
+ // TODO: we could optimize this if necessary
+ UpdateLog.RecentUpdates recentUpdates = ulog.getRecentUpdates();
+ try {
+ hasRecentUpdates = !recentUpdates.getVersions(1).isEmpty();
+ } finally {
+ recentUpdates.close();
+ }
+ }
+
+ if (!hasRecentUpdates) {
+ // we failed sync, but we have no versions - we can't sync in that case
+ // - we were active
+ // before, so become leader anyway
+ log.info("We failed sync, but we have no versions - we can't sync in that case - we were active before, so become leader anyway");
+ success = true;
+ }
}
-
+
+
// if !success but no one else is in active mode,
// we are the leader anyway
// TODO: should we also be leader if there is only one other active?
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java?rev=1483561&r1=1483560&r2=1483561&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java Thu May 16 20:49:59 2013
@@ -554,13 +554,13 @@ public class RealTimeGetComponent extend
List<String> versions = StrUtils.splitSmart(versionsStr, ",", true);
- // TODO: get this from cache instead of rebuilding?
- UpdateLog.RecentUpdates recentUpdates = ulog.getRecentUpdates();
List<Object> updates = new ArrayList<Object>(versions.size());
long minVersion = Long.MAX_VALUE;
-
+
+ // TODO: get this from cache instead of rebuilding?
+ UpdateLog.RecentUpdates recentUpdates = ulog.getRecentUpdates();
try {
for (String versionStr : versions) {
long version = Long.parseLong(versionStr);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateLog.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateLog.java?rev=1483561&r1=1483560&r2=1483561&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateLog.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateLog.java Thu May 16 20:49:59 2013
@@ -989,7 +989,7 @@ public class UpdateLog implements Plugin
}
}
-
+ /** The RecentUpdates object returned must be closed after use */
public RecentUpdates getRecentUpdates() {
Deque<TransactionLog> logList;
synchronized (this) {
@@ -1009,9 +1009,21 @@ public class UpdateLog implements Plugin
// TODO: what if I hand out a list of updates, then do an update, then hand out another list (and
// one of the updates I originally handed out fell off the list). Over-request?
- RecentUpdates recentUpdates = new RecentUpdates();
- recentUpdates.logList = logList;
- recentUpdates.update();
+
+ boolean success = false;
+ RecentUpdates recentUpdates = null;
+ try {
+ recentUpdates = new RecentUpdates();
+ recentUpdates.logList = logList;
+ recentUpdates.update();
+ success = true;
+ } finally {
+ // defensive: if some unknown exception is thrown,
+ // make sure we close so that the tlogs are decref'd
+ if (!success && recentUpdates != null) {
+ recentUpdates.close();
+ }
+ }
return recentUpdates;
}
@@ -1132,14 +1144,15 @@ public class UpdateLog implements Plugin
class LogReplayer implements Runnable {
private Logger loglog = log; // set to something different?
- List<TransactionLog> translogs;
+ Deque<TransactionLog> translogs;
TransactionLog.LogReader tlogReader;
boolean activeLog;
boolean finishing = false; // state where we lock out other updates and finish those updates that snuck in before we locked
boolean debug = loglog.isDebugEnabled();
public LogReplayer(List<TransactionLog> translogs, boolean activeLog) {
- this.translogs = translogs;
+ this.translogs = new LinkedList<TransactionLog>();
+ this.translogs.addAll(translogs);
this.activeLog = activeLog;
}
@@ -1159,7 +1172,9 @@ public class UpdateLog implements Plugin
SolrRequestInfo.setRequestInfo(new SolrRequestInfo(req, rsp)); // setting request info will help logging
try {
- for (TransactionLog translog : translogs) {
+ for(;;) {
+ TransactionLog translog = translogs.pollFirst();
+ if (translog == null) break;
doReplay(translog);
}
} catch (SolrException e) {
@@ -1179,6 +1194,13 @@ public class UpdateLog implements Plugin
if (finishing) {
versionInfo.unblockUpdates();
}
+
+ // clean up in case we hit some unexpected exception and didn't get
+ // to more transaction logs
+ for (TransactionLog translog : translogs) {
+ log.error("ERROR: didn't get to recover from tlog " + translog);
+ translog.decref();
+ }
}
loglog.warn("Log replay finished. recoveryInfo=" + recoveryInfo);