You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@lucene.apache.org by ma...@apache.org on 2011/12/24 06:44:58 UTC

svn commit: r1222913 - /lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/RecoveryStrat.java

Author: markrmiller
Date: Sat Dec 24 05:44:58 2011
New Revision: 1222913

URL: http://svn.apache.org/viewvc?rev=1222913&view=rev
Log:
stop checking state first

Modified:
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/RecoveryStrat.java

Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/RecoveryStrat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/RecoveryStrat.java?rev=1222913&r1=1222912&r2=1222913&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/RecoveryStrat.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/RecoveryStrat.java Sat Dec 24 05:44:58 2011
@@ -96,12 +96,9 @@ public class RecoveryStrat {
         synchronized (core.getUpdateHandler().getSolrCoreState().getRecoveryLock()) {
           
           UpdateLog ulog = core.getUpdateHandler().getUpdateLog();
-          // TODO: consider any races issues here - if we failed though, an
-          // assert
-          // exception is thrown if we are already buffering...
-          if (ulog.getState() != UpdateLog.State.BUFFERING) {
-            ulog.bufferUpdates();
-          }
+          // TODO: consider any races issues here
+          // was checking state first, but there is a race..
+          ulog.bufferUpdates();  
           
           boolean succesfulRecovery = false;
           int retries = 0;