Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Acquire seacher on closing engine should throw AlreadyClosedException #33331

Merged
merged 4 commits into from
Sep 5, 2018
+8 −2
Merged

Acquire seacher on closing engine should throw AlreadyClosedException #33331

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3aa4e6b
Acquire seacher on closing engine should throw AlreadyClosedException
dnhatn Sep 1, 2018
3448675
Revert "Mute testSyncerOnClosingShard"
dnhatn Sep 1, 2018
7d0adab
Merge branch 'master' into throw-ex-closing-engine
dnhatn Sep 5, 2018
d426ae8
Use tryIncRef
dnhatn Sep 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1994,12 +1994,14 @@ protected final void closeNoLock(String reason, CountDownLatch closedLatch) {

@Override
public Searcher acquireSearcher(String source, SearcherScope scope) {
/* Acquire order here is store -> manager since we need
* to make sure that the store is not closed before
* the searcher is acquired. */
store.incRef();
Releasable releasable = store::decRef;
ensureOpen();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are we doing this just for cosmetic reasons? because if we can't inc the store we will fail here with IllegalStateException if we don't want to do this we should maybe use if (store.tryIncRef()) and if we can't throw an already closed Exception? I jsut wanna make sure this is known that this is best effort.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice suggestion. I replaced it with tryIncRef.

Releasable releasable = null;
try {
/* Acquire order here is store -> manager since we need
* to make sure that the store is not closed before
* the searcher is acquired. */
store.incRef();
releasable = store::decRef;
final ReferenceManager<IndexSearcher> referenceManager;
switch (scope) {
case INTERNAL:
Expand Down
5 changes: 5 additions & 0 deletions server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5020,6 +5020,11 @@ public void testLastRefreshCheckpoint() throws Exception {
assertThat(engine.lastRefreshedCheckpoint(), equalTo(engine.getLocalCheckpoint()));
}

public void testAcquireSearcherOnClosingEngine() throws Exception {
engine.close();
expectThrows(AlreadyClosedException.class, () -> engine.acquireSearcher("test"));
}

private static void trimUnsafeCommits(EngineConfig config) throws IOException {
final Store store = config.getStore();
final TranslogConfig translogConfig = config.getTranslogConfig();
Expand Down
1 change: 0 additions & 1 deletion server/src/test/java/org/elasticsearch/index/shard/PrimaryReplicaSyncerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ public void testSyncerSendsOffCorrectDocuments() throws Exception {
closeShards(shard);
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/33330")
public void testSyncerOnClosingShard() throws Exception {
IndexShard shard = newStartedShard(true);
AtomicBoolean syncActionCalled = new AtomicBoolean();
Expand Down