Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make setting index.translog.sync_interval be dynamic #37382

Merged
merged 9 commits into from Mar 20, 2019
Merged

Make setting index.translog.sync_interval be dynamic #37382

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
443f31b
Make setting index.translog.sync_interval be dynamic
liketic Jan 12, 2019
f5a6343
Make sync interval updates work
liketic Jan 19, 2019
964acab
Merge branch 'master' of github.com:elastic/elasticsearch into make-s…
liketic Jan 26, 2019
8f0ae18
Merge branch 'master' of github.com:elastic/elasticsearch into make-s…
liketic Mar 18, 2019
018da3d
Address comments
liketic Mar 19, 2019
79c1ef1
checkstyle fix
ywelsch Mar 19, 2019
a159d22
Merge remote-tracking branch 'elastic/master' into pr/37382
ywelsch Mar 19, 2019
9eac473
fix test
ywelsch Mar 20, 2019
a8d466d
Merge remote-tracking branch 'elastic/master' into pr/37382
ywelsch Mar 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/index/IndexSettings.java
View file
Open in desktop
Expand Up @@ -62,7 +62,7 @@ public final class IndexSettings {
Setting.boolSetting("index.query.parse.allow_unmapped_fields", true, Property.IndexScope);
public static final Setting<TimeValue> INDEX_TRANSLOG_SYNC_INTERVAL_SETTING =
Setting.timeSetting("index.translog.sync_interval", TimeValue.timeValueSeconds(5), TimeValue.timeValueMillis(100),
Property.IndexScope);
Property.Dynamic, Property.IndexScope);
public static final Setting<TimeValue> INDEX_SEARCH_IDLE_AFTER =
Setting.timeSetting("index.search.idle.after", TimeValue.timeValueSeconds(30),
TimeValue.timeValueMinutes(0), Property.IndexScope, Property.Dynamic);
Expand Down
33 changes: 30 additions & 3 deletions server/src/test/java/org/elasticsearch/index/IndexServiceTests.java
View file
Open in desktop
Expand Up @@ -21,6 +21,7 @@

import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.TopDocs;
import org.elasticsearch.cluster.metadata.IndexMetaData;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.compress.CompressedXContent;
import org.elasticsearch.common.settings.Settings;
Expand Down Expand Up @@ -246,9 +247,7 @@ public void testAsyncFsyncActuallyWorks() throws Exception {
assertTrue(indexService.getRefreshTask().mustReschedule());
client().prepareIndex("test", "test", "1").setSource("{\"foo\": \"bar\"}", XContentType.JSON).get();
IndexShard shard = indexService.getShard(0);
assertBusy(() -> {
assertFalse(shard.isSyncNeeded());
});
assertBusy(() -> assertFalse(shard.isSyncNeeded()));
}

public void testRescheduleAsyncFsync() throws Exception {
Expand Down Expand Up @@ -320,4 +319,32 @@ public void testIllegalFsyncInterval() {
assertEquals("failed to parse value [0ms] for setting [index.translog.sync_interval], must be >= [100ms]", ex.getMessage());
}
}

public void testUpdateSyncIntervalDynamically() {
Settings settings = Settings.builder()
.put(IndexSettings.INDEX_TRANSLOG_SYNC_INTERVAL_SETTING.getKey(), "10s") // very often :)
.build();
createIndex("test", settings);
ensureGreen("test");

client()
.admin()
.indices()
.prepareUpdateSettings("test")
.setSettings(Settings.builder().put(IndexSettings.INDEX_TRANSLOG_SYNC_INTERVAL_SETTING.getKey(), "5s"))
.get();

IndexMetaData indexMetaData = client().admin().cluster().prepareState().execute().actionGet().getState().metaData().index("test");
assertEquals("5s", indexMetaData.getSettings().get(IndexSettings.INDEX_TRANSLOG_SYNC_INTERVAL_SETTING.getKey()));

client().admin().indices().prepareClose("test").get();
client()
.admin()
.indices()
.prepareUpdateSettings("test")
.setSettings(Settings.builder().put(IndexSettings.INDEX_TRANSLOG_SYNC_INTERVAL_SETTING.getKey(), "20s"))
.get();
indexMetaData = client().admin().cluster().prepareState().execute().actionGet().getState().metaData().index("test");
assertEquals("20s", indexMetaData.getSettings().get(IndexSettings.INDEX_TRANSLOG_SYNC_INTERVAL_SETTING.getKey()));
}
}