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

Avoid AssertionError when closing engine (#43638) 

Lucene throwing an AlreadyClosedException when closing the engine is fine, and should not trigger
an AssertionError.

Closes #43626
This commit is contained in:
Yannick Welsch 2019-06-26 17:40:26 +02:00
parent 76d0edd1a4
commit 05b945d010
3 changed files with 33 additions and 3 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

@ -1412,7 +1412,7 @@ public class InternalEngine extends Engine {
return new DeleteResult( return new DeleteResult(
plan.versionOfDeletion, getPrimaryTerm(), delete.seqNo(), plan.currentlyDeleted == false); plan.versionOfDeletion, getPrimaryTerm(), delete.seqNo(), plan.currentlyDeleted == false);
} catch (Exception ex) { } catch (Exception ex) {
if (indexWriter.getTragicException() == null) { if (ex instanceof AlreadyClosedException == false && indexWriter.getTragicException() == null) {
throw new AssertionError("delete operation should never fail at document level", ex); throw new AssertionError("delete operation should never fail at document level", ex);
} }
throw ex; throw ex;
@ -1515,7 +1515,7 @@ public class InternalEngine extends Engine {
doc.add(softDeletesField); doc.add(softDeletesField);
indexWriter.addDocument(doc); indexWriter.addDocument(doc);
} catch (Exception ex) { } catch (Exception ex) {
if (indexWriter.getTragicException() == null) { if (ex instanceof AlreadyClosedException == false && indexWriter.getTragicException() == null) {
throw new AssertionError("noop operation should never fail at document level", ex); throw new AssertionError("noop operation should never fail at document level", ex);
} }
throw ex; throw ex;

1
server/src/test/java/org/elasticsearch/discovery/DiskDisruptionIT.java
View File

@ -98,7 +98,6 @@ public class DiskDisruptionIT extends AbstractDisruptionTestCase {
* It simulates a full power outage by preventing translog checkpoint files to be written and restart the cluster. This means that * It simulates a full power outage by preventing translog checkpoint files to be written and restart the cluster. This means that
* all un-fsynced data will be lost. * all un-fsynced data will be lost.
*/ */
@AwaitsFix( bugUrl = "https://github.com/elastic/elasticsearch/issues/43626")
public void testGlobalCheckpointIsSafe() throws Exception { public void testGlobalCheckpointIsSafe() throws Exception {
startCluster(rarely() ? 5 : 3); startCluster(rarely() ? 5 : 3);

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

@ -5595,6 +5595,37 @@ public class InternalEngineTests extends EngineTestCase {
expectThrows(AlreadyClosedException.class, () -> engine.acquireSearcher("test")); expectThrows(AlreadyClosedException.class, () -> engine.acquireSearcher("test"));
} }
public void testNoOpOnClosingEngine() throws Exception {
engine.close();
Settings settings = Settings.builder()
.put(defaultSettings.getSettings())
.put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true).build();
IndexSettings indexSettings = IndexSettingsModule.newIndexSettings(
IndexMetaData.builder(defaultSettings.getIndexMetaData()).settings(settings).build());
assertTrue(indexSettings.isSoftDeleteEnabled());
try (Store store = createStore();
InternalEngine engine = createEngine(config(indexSettings, store, createTempDir(), NoMergePolicy.INSTANCE, null))) {
engine.close();
expectThrows(AlreadyClosedException.class, () -> engine.noOp(
new Engine.NoOp(2, primaryTerm.get(), LOCAL_TRANSLOG_RECOVERY, System.nanoTime(), "reason")));
}
}
public void testSoftDeleteOnClosingEngine() throws Exception {
engine.close();
Settings settings = Settings.builder()
.put(defaultSettings.getSettings())
.put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true).build();
IndexSettings indexSettings = IndexSettingsModule.newIndexSettings(
IndexMetaData.builder(defaultSettings.getIndexMetaData()).settings(settings).build());
assertTrue(indexSettings.isSoftDeleteEnabled());
try (Store store = createStore();
InternalEngine engine = createEngine(config(indexSettings, store, createTempDir(), NoMergePolicy.INSTANCE, null))) {
engine.close();
expectThrows(AlreadyClosedException.class, () -> engine.delete(replicaDeleteForDoc("test", 42, 7, System.nanoTime())));
}
}
public void testTrackMaxSeqNoOfUpdatesOrDeletesOnPrimary() throws Exception { public void testTrackMaxSeqNoOfUpdatesOrDeletesOnPrimary() throws Exception {
engine.close(); engine.close();
Set<String> liveDocIds = new HashSet<>(); Set<String> liveDocIds = new HashSet<>();