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

Try to renew sync ID if `flush=true` on forceMerge 

Today we do a force flush which wipes the sync ID if there is one which
can cause the lost of all benefits of the sync ID ie. fast recovery.
This commit adds a check to renew the sync ID if possible. The flush call
is now also not forced since the IW will show pending changes if the forceMerge added new segments.
if we keep using force we will wipe the sync ID even if no renew was actually needed.

Closes #17019
This commit is contained in:
Simon Willnauer 2016-03-15 12:50:57 +01:00
parent be09778dc0
commit e8152d375e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -743,7 +743,9 @@ public class InternalEngine extends Engine {
indexWriter.forceMerge(maxNumSegments, true /* blocks and waits for merges*/); indexWriter.forceMerge(maxNumSegments, true /* blocks and waits for merges*/);
} }
if (flush) { if (flush) {
flush(true, true); if (tryRenewSyncCommit() == false) {
flush(false, true);
}
} }
if (upgrade) { if (upgrade) {
logger.info("finished segment upgrade"); logger.info("finished segment upgrade");

4
core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
View File

@ -485,7 +485,7 @@ public class InternalEngineTests extends ESTestCase {
if (flush) { if (flush) {
// we should have had just 1 merge, so last generation should be exact // we should have had just 1 merge, so last generation should be exact
assertEquals(gen2 + 1, store.readLastCommittedSegmentsInfo().getLastGeneration()); assertEquals(gen2, store.readLastCommittedSegmentsInfo().getLastGeneration());
} }
} }
} }
@ -843,7 +843,7 @@ public class InternalEngineTests extends ESTestCase {
Engine.SyncedFlushResult.SUCCESS); Engine.SyncedFlushResult.SUCCESS);
assertEquals(3, engine.segments(false).size()); assertEquals(3, engine.segments(false).size());
engine.forceMerge(false, 1, false, false, false); engine.forceMerge(forceMergeFlushes, 1, false, false, false);
if (forceMergeFlushes == false) { if (forceMergeFlushes == false) {
engine.refresh("make all segments visible"); engine.refresh("make all segments visible");
assertEquals(4, engine.segments(false).size()); assertEquals(4, engine.segments(false).size());