honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Acquire seacher on closing engine should throw ACE (#33331) 

Closes #33330
This commit is contained in:
Nhat Nguyen 2018-09-05 19:03:34 -04:00 committed by GitHub
parent b697f485bb
commit 41839cf9a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java
View File

@ -2014,7 +2014,9 @@ public class InternalEngine extends Engine {
/* Acquire order here is store -> manager since we need /* Acquire order here is store -> manager since we need
* to make sure that the store is not closed before * to make sure that the store is not closed before
* the searcher is acquired. */ * the searcher is acquired. */
store.incRef(); if (store.tryIncRef() == false) {
throw new AlreadyClosedException(shardId + " store is closed", failedEngine.get());
}
Releasable releasable = store::decRef; Releasable releasable = store::decRef;
try { try {
final ReferenceManager<IndexSearcher> referenceManager; final ReferenceManager<IndexSearcher> referenceManager;

5
server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
View File

@ -5020,6 +5020,11 @@ public class InternalEngineTests extends EngineTestCase {
assertThat(engine.lastRefreshedCheckpoint(), equalTo(engine.getLocalCheckpoint())); 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 { private static void trimUnsafeCommits(EngineConfig config) throws IOException {
final Store store = config.getStore(); final Store store = config.getStore();
final TranslogConfig translogConfig = config.getTranslogConfig(); final TranslogConfig translogConfig = config.getTranslogConfig();

1
server/src/test/java/org/elasticsearch/index/shard/PrimaryReplicaSyncerTests.java
View File

@ -125,7 +125,6 @@ public class PrimaryReplicaSyncerTests extends IndexShardTestCase {
closeShards(shard); closeShards(shard);
} }
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/33330")
public void testSyncerOnClosingShard() throws Exception { public void testSyncerOnClosingShard() throws Exception {
IndexShard shard = newStartedShard(true); IndexShard shard = newStartedShard(true);
AtomicBoolean syncActionCalled = new AtomicBoolean(); AtomicBoolean syncActionCalled = new AtomicBoolean();