opendev/gerrit
Code Issues Proposed changes

Revert "Drain executor of index change requests before closing index"

Browse Source 
This reverts commit 804f1d9c19.

The intention was to drain and close the executor before closing the
index but closing an index doesn't necessarily means that executor
should be closed. After online reindexing is completed, the old index
version is closed which closed the executor and make any subsequent
Lucene interaction fails.

Bug: Issue 4618
Change-Id: I6ec90eb73312008714aa790308e806a0134a124e
This commit is contained in:
Hugo Arès
2016-09-22 17:43:15 +02:00
parent dcb574ce8e
commit 2e382534c0
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java
View File

@@ -30,11 +30,12 @@ import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Multimap;
import com.google.common.collect.Sets;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.PatchSet;
@@ -95,7 +96,6 @@ import java.util.Set;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
/**
* Secondary index implementation using Apache Lucene.
@@ -188,13 +188,20 @@ public class LuceneChangeIndex implements ChangeIndex {
@Override
public void close() {
MoreExecutors.shutdownAndAwaitTermination(
executor, Long.MAX_VALUE, TimeUnit.SECONDS);
try {
openIndex.close();
} finally {
closedIndex.close();
}
List<ListenableFuture<?>> closeFutures = Lists.newArrayListWithCapacity(2);
closeFutures.add(executor.submit(new Runnable() {
@Override
public void run() {
openIndex.close();
}
}));
closeFutures.add(executor.submit(new Runnable() {
@Override
public void run() {
closedIndex.close();
}
}));
Futures.getUnchecked(Futures.allAsList(closeFutures));
}
@Override