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

[ENGINE] Remove flushNeeded in favor of IW#hasUncommittedChanges() 

We maintain a boolean that is obsolete since IW maintains the same
property that we can just piggyback on.
This commit is contained in:
Simon Willnauer 2015-05-19 14:10:07 +02:00
parent a1a16276da
commit d6e7817666
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,9 +92,6 @@ public class InternalEngine extends Engine {
private final SearcherFactory searcherFactory; private final SearcherFactory searcherFactory;
private final SearcherManager searcherManager; private final SearcherManager searcherManager;
// we use flushNeeded here, since if there are no changes, then the commit won't write
// will not really happen, and then the commitUserData and the new translog will not be reflected
private volatile boolean flushNeeded = false;
private final Lock flushLock = new ReentrantLock(); private final Lock flushLock = new ReentrantLock();
private final ReentrantLock optimizeLock = new ReentrantLock(); private final ReentrantLock optimizeLock = new ReentrantLock();
@ -344,7 +341,6 @@ public class InternalEngine extends Engine {
innerCreate(create); innerCreate(create);
} }
} }
flushNeeded = true;
} catch (OutOfMemoryError | IllegalStateException | IOException t) { } catch (OutOfMemoryError | IllegalStateException | IOException t) {
maybeFailEngine("create", t); maybeFailEngine("create", t);
throw new CreateFailedEngineException(shardId, create, t); throw new CreateFailedEngineException(shardId, create, t);
@ -451,7 +447,6 @@ public class InternalEngine extends Engine {
created = innerIndex(index); created = innerIndex(index);
} }
} }
flushNeeded = true;
} catch (OutOfMemoryError | IllegalStateException | IOException t) { } catch (OutOfMemoryError | IllegalStateException | IOException t) {
maybeFailEngine("index", t); maybeFailEngine("index", t);
throw new IndexFailedEngineException(shardId, index, t); throw new IndexFailedEngineException(shardId, index, t);
@ -549,7 +544,6 @@ public class InternalEngine extends Engine {
ensureOpen(); ensureOpen();
// NOTE: we don't throttle this when merges fall behind because delete-by-id does not create new segments: // NOTE: we don't throttle this when merges fall behind because delete-by-id does not create new segments:
innerDelete(delete); innerDelete(delete);
flushNeeded = true;
} catch (OutOfMemoryError | IllegalStateException | IOException t) { } catch (OutOfMemoryError | IllegalStateException | IOException t) {
maybeFailEngine("delete", t); maybeFailEngine("delete", t);
throw new DeleteFailedEngineException(shardId, delete, t); throw new DeleteFailedEngineException(shardId, delete, t);
@ -644,7 +638,6 @@ public class InternalEngine extends Engine {
indexWriter.deleteDocuments(query); indexWriter.deleteDocuments(query);
translog.add(new Translog.DeleteByQuery(delete)); translog.add(new Translog.DeleteByQuery(delete));
flushNeeded = true;
} catch (Throwable t) { } catch (Throwable t) {
maybeFailEngine("delete_by_query", t); maybeFailEngine("delete_by_query", t);
throw new DeleteByQueryFailedEngineException(shardId, delete, t); throw new DeleteByQueryFailedEngineException(shardId, delete, t);
@ -710,9 +703,7 @@ public class InternalEngine extends Engine {
logger.trace("acquired flush lock immediately"); logger.trace("acquired flush lock immediately");
} }
try { try {
if (flushNeeded || force) { if (indexWriter.hasUncommittedChanges() || force) {
flushNeeded = false;
final long translogId;
try { try {
translog.prepareCommit(); translog.prepareCommit();
logger.trace("starting commit for flush; commitTranslog=true"); logger.trace("starting commit for flush; commitTranslog=true");
@ -721,7 +712,6 @@ public class InternalEngine extends Engine {
translog.commit(); translog.commit();
// we need to refresh in order to clear older version values // we need to refresh in order to clear older version values
refresh("version_table_flush"); refresh("version_table_flush");
} catch (Throwable e) { } catch (Throwable e) {
throw new FlushFailedEngineException(shardId, e); throw new FlushFailedEngineException(shardId, e);
} }