You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2015/10/22 21:14:24 UTC

svn commit: r1710078 - in /lucene/dev/trunk/solr: CHANGES.txt contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrWriter.java

Author: shalin
Date: Thu Oct 22 19:14:24 2015
New Revision: 1710078

URL: http://svn.apache.org/viewvc?rev=1710078&view=rev
Log:
SOLR-7843: DataImportHandler's delta imports leak memory because the delta keys are kept in memory and not cleared after the process is finished

Modified:
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrWriter.java

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1710078&r1=1710077&r2=1710078&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Thu Oct 22 19:14:24 2015
@@ -285,6 +285,9 @@ Bug Fixes
 
 * SOLR-8162: JmxMonitoredMap#clear triggers a query on all the MBeans thus generating lots of warnings.
   (Marius Dumitru Florea, shalin)
+
+* SOLR-7843: DataImportHandler's delta imports leak memory because the delta keys are kept in memory
+  and not cleared after the process is finished. (Pablo Lozano via shalin)
   
 Optimizations
 ----------------------

Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrWriter.java?rev=1710078&r1=1710077&r2=1710078&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrWriter.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrWriter.java Thu Oct 22 19:14:24 2015
@@ -60,6 +60,8 @@ public class SolrWriter extends DIHWrite
     } catch (IOException e) {
       throw new DataImportHandlerException(DataImportHandlerException.SEVERE,
           "Unable to call finish() on UpdateRequestProcessor", e);
+    } finally {
+      deltaKeys = null;
     }
   }
   @Override