Apache Solr open-source search software
SOLR-17416: Fixed ExportHandler bug that silently suppressed errors and returned partial results in some situations
Chris Hostetter4a6e18b54cef
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 1f86e8e2f5a..80ed44d47ce 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -138,6 +138,8 @@ Bug Fixes* SOLR-17421: Fixed a rare case where overseer was stuck after a failure when changing overseer to honor thenode role for preferred overseer. (Pierre Salagnac)+* SOLR-17416: Fixed ExportHandler bug that silently suppressed errors and returned partial results in some situations (hossman)+Dependency Upgrades---------------------(No changes)diff --git a/solr/core/src/java/org/apache/solr/handler/export/ExportBuffers.java b/solr/core/src/java/org/apache/solr/handler/export/ExportBuffers.javaindex f07668a3264..a87410236e5 100644--- a/solr/core/src/java/org/apache/solr/handler/export/ExportBuffers.java+++ b/solr/core/src/java/org/apache/solr/handler/export/ExportBuffers.java@@ -31,6 +31,7 @@ import org.apache.lucene.index.LeafReaderContext;import org.apache.lucene.search.Sort;import org.apache.lucene.util.FixedBitSet;import org.apache.solr.common.IteratorWriter;+import org.apache.solr.common.util.EnvUtils;import org.apache.solr.common.util.ExecutorUtil;import org.apache.solr.common.util.SolrNamedThreadFactory;import org.apache.solr.handler.export.ExportWriter.MergeIterator;@@ -42,7 +43,8 @@ import org.slf4j.LoggerFactory;class ExportBuffers {private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());- static final long EXCHANGE_TIMEOUT_SECONDS = 600;+ static final long EXCHANGE_TIMEOUT_SECONDS =+ EnvUtils.getPropertyAsLong("solr.exportbuffers.exchange.timeout.sec", 600L);static final String EXPORT_BUFFERS_KEY = "__eb__";final Buffer bufferOne;@@ -161,8 +163,6 @@ class ExportBuffers {public void error(Throwable t) {error = t;- // break the lock on the other thread too- barrier.reset();}public Throwable getError() {diff --git a/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java b/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.javaindex e5e40e6d07e..209680aee12 100644--- a/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java+++ b/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java@@ -467,6 +467,9 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable {}return true;});+ if (null != buffers.getError()) {+ throw new IOException(buffers.getError().getMessage(), buffers.getError());+ }}}diff --git a/solr/core/src/java/org/apache/solr/handler/export/ExportWriterStream.java b/solr/core/src/java/org/apache/solr/handler/export/ExportWriterStream.javaindex 2bbed2d6dde..8700064bba7 100644--- a/solr/core/src/java/org/apache/solr/handler/export/ExportWriterStream.java+++ b/solr/core/src/java/org/apache/solr/handler/export/ExportWriterStream.java@@ -211,6 +211,9 @@ public class ExportWriterStream extends TupleStream implements Expressible {log.debug("--- ews EOF?");res = Tuple.EOF();}+ if (exportBuffers.getError() != null) {+ res = Tuple.EXCEPTION(exportBuffers.getError(), true);+ }if (res != null) {// only errors or EOF assigned result so far