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

Merge pull request #10993 from kimchy/sync_interval_not_to_control_type 

Use buffered tanslog type also when sync is set to 0
This commit is contained in:
Shay Banon 2015-05-05 23:06:11 +02:00
parent 603a0c193b ebac29d8a2
commit b4b5603617
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/elasticsearch/index/translog/Translog.java
View File

@ -152,10 +152,10 @@ public class Translog extends AbstractIndexShardComponent implements IndexShardC
syncInterval = indexSettings.getAsTime(INDEX_TRANSLOG_SYNC_INTERVAL, TimeValue.timeValueSeconds(5)); syncInterval = indexSettings.getAsTime(INDEX_TRANSLOG_SYNC_INTERVAL, TimeValue.timeValueSeconds(5));
if (syncInterval.millis() > 0 && threadPool != null) { if (syncInterval.millis() > 0 && threadPool != null) {
syncOnEachOperation(false); this.syncOnEachOperation = false;
syncScheduler = threadPool.schedule(syncInterval, ThreadPool.Names.SAME, new Sync()); syncScheduler = threadPool.schedule(syncInterval, ThreadPool.Names.SAME, new Sync());
} else if (syncInterval.millis() == 0) { } else if (syncInterval.millis() == 0) {
syncOnEachOperation(true); this.syncOnEachOperation = true;
} }
if (indexSettingsService != null) { if (indexSettingsService != null) {
@ -507,15 +507,6 @@ public class Translog extends AbstractIndexShardComponent implements IndexShardC
} }
} }
public void syncOnEachOperation(boolean syncOnEachOperation) {
this.syncOnEachOperation = syncOnEachOperation;
if (syncOnEachOperation) {
type = TranslogFile.Type.SIMPLE;
} else {
type = TranslogFile.Type.BUFFERED;
}
}
/** package private for testing */ /** package private for testing */
String getFilename(long translogId) { String getFilename(long translogId) {
return TRANSLOG_FILE_PREFIX + translogId; return TRANSLOG_FILE_PREFIX + translogId;