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

SOLR-12120: Fix bug in draining queue before shutdown

This commit is contained in:
Jan Høydahl 2019-05-02 23:26:09 +02:00
parent 8908205b42
commit cdd130ccb6
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
solr/core/src/java/org/apache/solr/security/AuditLoggerPlugin.java
View File

@ -32,6 +32,7 @@ import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import com.codahale.metrics.Counter; import com.codahale.metrics.Counter;
import com.codahale.metrics.Meter; import com.codahale.metrics.Meter;
@ -68,6 +69,7 @@ public abstract class AuditLoggerPlugin implements Closeable, Runnable, SolrInfo
private static final int DEFAULT_NUM_THREADS = Math.max(2, Runtime.getRuntime().availableProcessors() / 2); private static final int DEFAULT_NUM_THREADS = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
BlockingQueue<AuditEvent> queue; BlockingQueue<AuditEvent> queue;
AtomicInteger auditsInFlight = new AtomicInteger(0);
boolean async; boolean async;
boolean blockAsync; boolean blockAsync;
int blockingQueueSize; int blockingQueueSize;
@ -197,6 +199,7 @@ public abstract class AuditLoggerPlugin implements Closeable, Runnable, SolrInfo
while (!closed && !Thread.currentThread().isInterrupted()) { while (!closed && !Thread.currentThread().isInterrupted()) {
try { try {
AuditEvent event = queue.poll(1000, TimeUnit.MILLISECONDS); AuditEvent event = queue.poll(1000, TimeUnit.MILLISECONDS);
auditsInFlight.incrementAndGet();
if (event == null) continue; if (event == null) continue;
if (event.getDate() != null) { if (event.getDate() != null) {
queuedTime.update(new Date().getTime() - event.getDate().getTime(), TimeUnit.MILLISECONDS); queuedTime.update(new Date().getTime() - event.getDate().getTime(), TimeUnit.MILLISECONDS);
@ -211,6 +214,8 @@ public abstract class AuditLoggerPlugin implements Closeable, Runnable, SolrInfo
} catch (Exception ex) { } catch (Exception ex) {
log.error("Exception when attempting to audit log asynchronously", ex); log.error("Exception when attempting to audit log asynchronously", ex);
numErrors.mark(); numErrors.mark();
} finally {
auditsInFlight.decrementAndGet();
} }
} }
} }
@ -331,9 +336,9 @@ public abstract class AuditLoggerPlugin implements Closeable, Runnable, SolrInfo
protected void waitForQueueToDrain(int timeoutSeconds) { protected void waitForQueueToDrain(int timeoutSeconds) {
if (async && executorService != null) { if (async && executorService != null) {
int timeSlept = 0; int timeSlept = 0;
while (!queue.isEmpty() && timeSlept < timeoutSeconds) { while ((!queue.isEmpty() || auditsInFlight.get() > 0) && timeSlept < timeoutSeconds) {
try { try {
log.info("Async auditlogger queue still has {} elements, sleeping to let it drain...", queue.size()); log.info("Async auditlogger queue still has {} elements and {} audits in-flight, sleeping to drain...", queue.size(), auditsInFlight.get());
Thread.sleep(1000); Thread.sleep(1000);
timeSlept ++; timeSlept ++;
} catch (InterruptedException ignored) {} } catch (InterruptedException ignored) {}

1
solr/core/src/test/org/apache/solr/security/CallbackAuditLoggerPlugin.java
View File

@ -48,6 +48,7 @@ public class CallbackAuditLoggerPlugin extends AuditLoggerPlugin {
try { try {
Thread.sleep(delay); Thread.sleep(delay);
} catch (InterruptedException e) { } catch (InterruptedException e) {
log.warn("audit() interrupted while waiting to send callback, should not happen");
} }
} }
out.write(formatter.formatEvent(event) + "\n"); out.write(formatter.formatEvent(event) + "\n");