Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-18135: Preserve merge exception; stop merge timer only once (#4939)

Nick8e02c856a1bb
diff --git a/changelog/unreleased/SOLR-18135.yml b/changelog/unreleased/SOLR-18135.yml
new file mode 100644
index 00000000000..d83db110aaf
--- /dev/null
+++ b/changelog/unreleased/SOLR-18135.yml
@@ -0,0 +1,7 @@
+title: Fix double-stop of the merge timer when segment merging fails with assertions enabled.
+type: fixed
+authors:
+ - name: Nick Shanin
+links:
+ - name: SOLR-18135
+ url: https://issues.apache.org/jira/browse/SOLR-18135
diff --git a/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java b/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java
index 200c85728c0..a1d6ba72891 100644
--- a/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java
+++ b/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java
@@ -229,16 +229,13 @@ public class SolrIndexWriter extends IndexWriter {
updateMergeMetrics(totalNumDocs, deletedDocs, segmentsCount, false, false, null);
try {
super.merge(merge);
- updateMergeMetrics(totalNumDocs, deletedDocs, segmentsCount, true, false, timer);
} catch (Throwable t) {
- if (timer != null) {
- timer.stop();
- }
updateMergeMetrics(totalNumDocs, deletedDocs, segmentsCount, true, true, timer);
throw t;
} finally {
runningMerges.remove(segString);
}
+ updateMergeMetrics(totalNumDocs, deletedDocs, segmentsCount, true, false, timer);
}
public Map<String, Object> getRunningMerges() {