Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-14351: commitScheduler was missing MDC logging (#1498)

This commit is contained in:
David Smiley 2020-05-13 20:58:07 -04:00 committed by GitHub
parent 08841b634f
commit 4b9808a03d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
solr/core/src/java/org/apache/solr/update/CommitTracker.java
View File

@ -29,6 +29,7 @@ import java.util.concurrent.atomic.AtomicLong;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.core.SolrCore;
import org.apache.solr.logging.MDCLoggingContext;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.common.util.SolrNamedThreadFactory;
@ -57,8 +58,10 @@ public final class CommitTracker implements Runnable {
private int docsUpperBound;
private long timeUpperBound;
private long tLogFileSizeUpperBound;
private final ScheduledExecutorService scheduler =
// note: can't use ExecutorsUtil because it doesn't have a *scheduled* ExecutorService.
// Not a big deal but it means we must take care of MDC logging here.
private final ScheduledExecutorService scheduler =
Executors.newScheduledThreadPool(1, new SolrNamedThreadFactory("commitScheduler"));
private ScheduledFuture pending;
@ -248,9 +251,8 @@ public final class CommitTracker implements Runnable {
pending = null; // allow a new commit to be scheduled
}
SolrQueryRequest req = new LocalSolrQueryRequest(core,
new ModifiableSolrParams());
try {
MDCLoggingContext.setCore(core);
try (SolrQueryRequest req = new LocalSolrQueryRequest(core, new ModifiableSolrParams())) {
CommitUpdateCommand command = new CommitUpdateCommand(req, false);
command.openSearcher = openSearcher;
command.waitSearcher = WAIT_SEARCHER;
@ -271,9 +273,9 @@ public final class CommitTracker implements Runnable {
} catch (Exception e) {
SolrException.log(log, "auto commit error...", e);
} finally {
// log.info("###done committing");
req.close();
MDCLoggingContext.clear();
}
// log.info("###done committing");
}
// to facilitate testing: blocks if called during commit