[GitHub] [lucene-solr] s1monw commented on a change in pull request #1319: LUCENE-9164: process all events before closing gracefully
s1monw commented on a change in pull request #1319: LUCENE-9164: process all
events before closing gracefully
URL: https://github.com/apache/lucene-solr/pull/1319#discussion_r389397690
##
File path: lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
##
@@ -299,7 +300,77 @@ static int getActualMaxDocs() {
final FieldNumbers globalFieldNumberMap;
final DocumentsWriter docWriter;
- private final Queue eventQueue = new ConcurrentLinkedQueue<>();
+ private final EventQueue eventQueue = new EventQueue(this);
+
+ static final class EventQueue implements Closeable {
+private volatile boolean closed = false;
+private final Semaphore permits = new Semaphore(Integer.MAX_VALUE);
+private final Queue queue = new ConcurrentLinkedQueue<>();
+private final IndexWriter writer;
+
+EventQueue(IndexWriter writer) {
+ this.writer = writer;
+}
+
+private void tryAcquire() {
+ if (permits.tryAcquire() == false) {
+throw new AlreadyClosedException("queue is closed");
+ }
+ if (closed) {
+throw new AlreadyClosedException("queue is closed");
+ }
+}
+
+boolean add(Event event) {
+ tryAcquire();
+ try {
+return queue.add(event);
+ } finally {
+permits.release();
+ }
+}
+
+void processEvents() throws IOException {
+ tryAcquire();
+ try {
+processEventsInternal();
+ } finally {
+permits.release();
+ }
+}
+
+private void processEventsInternal() throws IOException {
+ assert Integer.MAX_VALUE - permits.availablePermits() > 0 : "must
acquire a permit before processing events";
+ Event event;
+ while ((event = queue.poll()) != null) {
+event.process(writer);
+ }
+}
+
+@Override
+public synchronized void close() throws IOException {
Review comment:
correct
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
-
To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org
For additional commands, e-mail: issues-h...@lucene.apache.org
[GitHub] [lucene-solr] s1monw commented on a change in pull request #1319: LUCENE-9164: process all events before closing gracefully
s1monw commented on a change in pull request #1319: LUCENE-9164: process all
events before closing gracefully
URL: https://github.com/apache/lucene-solr/pull/1319#discussion_r389397721
##
File path: lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
##
@@ -299,7 +300,77 @@ static int getActualMaxDocs() {
final FieldNumbers globalFieldNumberMap;
final DocumentsWriter docWriter;
- private final Queue eventQueue = new ConcurrentLinkedQueue<>();
+ private final EventQueue eventQueue = new EventQueue(this);
+
+ static final class EventQueue implements Closeable {
+private volatile boolean closed = false;
+private final Semaphore permits = new Semaphore(Integer.MAX_VALUE);
+private final Queue queue = new ConcurrentLinkedQueue<>();
+private final IndexWriter writer;
+
+EventQueue(IndexWriter writer) {
+ this.writer = writer;
+}
+
+private void tryAcquire() {
+ if (permits.tryAcquire() == false) {
+throw new AlreadyClosedException("queue is closed");
+ }
+ if (closed) {
+throw new AlreadyClosedException("queue is closed");
Review comment:
I added a test to ensure this works
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
-
To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org
For additional commands, e-mail: issues-h...@lucene.apache.org
[GitHub] [lucene-solr] s1monw commented on a change in pull request #1319: LUCENE-9164: process all events before closing gracefully
s1monw commented on a change in pull request #1319: LUCENE-9164: process all
events before closing gracefully
URL: https://github.com/apache/lucene-solr/pull/1319#discussion_r389397123
##
File path: lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
##
@@ -299,7 +300,77 @@ static int getActualMaxDocs() {
final FieldNumbers globalFieldNumberMap;
final DocumentsWriter docWriter;
- private final Queue eventQueue = new ConcurrentLinkedQueue<>();
+ private final EventQueue eventQueue = new EventQueue(this);
+
+ static final class EventQueue implements Closeable {
+private volatile boolean closed = false;
+private final Semaphore permits = new Semaphore(Integer.MAX_VALUE);
+private final Queue queue = new ConcurrentLinkedQueue<>();
+private final IndexWriter writer;
+
+EventQueue(IndexWriter writer) {
+ this.writer = writer;
+}
+
+private void tryAcquire() {
+ if (permits.tryAcquire() == false) {
+throw new AlreadyClosedException("queue is closed");
+ }
+ if (closed) {
+throw new AlreadyClosedException("queue is closed");
+ }
+}
+
+boolean add(Event event) {
+ tryAcquire();
+ try {
+return queue.add(event);
+ } finally {
+permits.release();
+ }
+}
+
+void processEvents() throws IOException {
+ tryAcquire();
+ try {
+processEventsInternal();
+ } finally {
+permits.release();
+ }
+}
+
+private void processEventsInternal() throws IOException {
+ assert Integer.MAX_VALUE - permits.availablePermits() > 0 : "must
acquire a permit before processing events";
Review comment:
but this wouldn't catch the case where we didn't acquire any permit?
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
-
To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org
For additional commands, e-mail: issues-h...@lucene.apache.org
