Skip to content

Commit 77a1649

Browse files
bleskesbleskes
committed
Merge pull request #16522 from dongjoon-hyun/rename_variables
Fix settings typos
2 parents c121af6 + 3bad16c commit 77a1649

File tree

11 files changed

+27
-27
lines changed

11 files changed

+27
-27
lines changed

‎core/src/main/java/org/elasticsearch/common/settings/IndexScopedSettings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public final class IndexScopedSettings extends AbstractScopedSettings {
117117
UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING,
118118
EnableAllocationDecider.INDEX_ROUTING_REBALANCE_ENABLE_SETTING,
119119
EnableAllocationDecider.INDEX_ROUTING_ALLOCATION_ENABLE_SETTING,
120-
IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTTING,
120+
IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTING,
121121
IndexFieldDataService.INDEX_FIELDDATA_CACHE_KEY,
122122
FieldMapper.IGNORE_MALFORMED_SETTING,
123123
FieldMapper.COERCE_SETTING,

‎core/src/main/java/org/elasticsearch/common/settings/Setting.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,8 @@ AbstractScopedSettings.SettingUpdater<T> newUpdater(Consumer<T> consumer, ESLogg
256256
* this is used for settings that depend on each other... see {@link org.elasticsearch.common.settings.AbstractScopedSettings#addSettingsUpdateConsumer(Setting, Setting, BiConsumer)} and it's
257257
* usage for details.
258258
*/
259-
static <A, B> AbstractScopedSettings.SettingUpdater<Tuple<A, B>> compoundUpdater(final BiConsumer<A,B> consumer, final Setting<A> aSettting, final Setting<B> bSetting, ESLogger logger) {
260-
final AbstractScopedSettings.SettingUpdater<A> aSettingUpdater = aSettting.newUpdater(null, logger);
259+
static <A, B> AbstractScopedSettings.SettingUpdater<Tuple<A, B>> compoundUpdater(final BiConsumer<A,B> consumer, final Setting<A> aSetting, final Setting<B> bSetting, ESLogger logger) {
260+
final AbstractScopedSettings.SettingUpdater<A> aSettingUpdater = aSetting.newUpdater(null, logger);
261261
final AbstractScopedSettings.SettingUpdater<B> bSettingUpdater = bSetting.newUpdater(null, logger);
262262
return new AbstractScopedSettings.SettingUpdater<Tuple<A, B>>() {
263263
@Override

‎core/src/main/java/org/elasticsearch/index/IndexSettings.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public final class IndexSettings {
8282
public static final Setting<Integer> MAX_RESULT_WINDOW_SETTING = Setting.intSetting("index.max_result_window", 10000, 1, true, Setting.Scope.INDEX);
8383
public static final TimeValue DEFAULT_REFRESH_INTERVAL = new TimeValue(1, TimeUnit.SECONDS);
8484
public static final Setting<TimeValue> INDEX_REFRESH_INTERVAL_SETTING = Setting.timeSetting("index.refresh_interval", DEFAULT_REFRESH_INTERVAL, new TimeValue(-1, TimeUnit.MILLISECONDS), true, Setting.Scope.INDEX);
85-
public static final Setting<ByteSizeValue> INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTTING = Setting.byteSizeSetting("index.translog.flush_threshold_size", new ByteSizeValue(512, ByteSizeUnit.MB), true, Setting.Scope.INDEX);
85+
public static final Setting<ByteSizeValue> INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTING = Setting.byteSizeSetting("index.translog.flush_threshold_size", new ByteSizeValue(512, ByteSizeUnit.MB), true, Setting.Scope.INDEX);
8686

8787

8888
/**
@@ -197,7 +197,7 @@ public IndexSettings(final IndexMetaData indexMetaData, final Settings nodeSetti
197197
this.durability = scopedSettings.get(INDEX_TRANSLOG_DURABILITY_SETTING);
198198
syncInterval = INDEX_TRANSLOG_SYNC_INTERVAL_SETTING.get(settings);
199199
refreshInterval = scopedSettings.get(INDEX_REFRESH_INTERVAL_SETTING);
200-
flushThresholdSize = scopedSettings.get(INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTTING);
200+
flushThresholdSize = scopedSettings.get(INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTING);
201201
mergeSchedulerConfig = new MergeSchedulerConfig(this);
202202
gcDeletesInMillis = scopedSettings.get(INDEX_GC_DELETES_SETTING).getMillis();
203203
warmerEnabled = scopedSettings.get(INDEX_WARMER_ENABLED_SETTING);
@@ -222,7 +222,7 @@ public IndexSettings(final IndexMetaData indexMetaData, final Settings nodeSetti
222222
scopedSettings.addSettingsUpdateConsumer(MAX_RESULT_WINDOW_SETTING, this::setMaxResultWindow);
223223
scopedSettings.addSettingsUpdateConsumer(INDEX_WARMER_ENABLED_SETTING, this::setEnableWarmer);
224224
scopedSettings.addSettingsUpdateConsumer(INDEX_GC_DELETES_SETTING, this::setGCDeletes);
225-
scopedSettings.addSettingsUpdateConsumer(INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTTING, this::setTranslogFlushThresholdSize);
225+
scopedSettings.addSettingsUpdateConsumer(INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTING, this::setTranslogFlushThresholdSize);
226226
scopedSettings.addSettingsUpdateConsumer(INDEX_REFRESH_INTERVAL_SETTING, this::setRefreshInterval);
227227
}
228228

‎core/src/test/java/org/elasticsearch/index/IndexSettingsTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,16 +272,16 @@ public void testIsTTLPurgeDisabled() {
272272

273273
public void testTranslogFlushSizeThreshold() {
274274
ByteSizeValue translogFlushThresholdSize = new ByteSizeValue(Math.abs(randomInt()));
275-
ByteSizeValue actualValue = ByteSizeValue.parseBytesSizeValue(translogFlushThresholdSize.toString(), IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTTING.getKey());
275+
ByteSizeValue actualValue = ByteSizeValue.parseBytesSizeValue(translogFlushThresholdSize.toString(), IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTING.getKey());
276276
IndexMetaData metaData = newIndexMeta("index", Settings.settingsBuilder()
277277
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT)
278-
.put(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTTING.getKey(), translogFlushThresholdSize.toString())
278+
.put(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTING.getKey(), translogFlushThresholdSize.toString())
279279
.build());
280280
IndexSettings settings = new IndexSettings(metaData, Settings.EMPTY);
281281
assertEquals(actualValue, settings.getFlushThresholdSize());
282282
ByteSizeValue newTranslogFlushThresholdSize = new ByteSizeValue(Math.abs(randomInt()));
283-
ByteSizeValue actualNewTranslogFlushThresholdSize = ByteSizeValue.parseBytesSizeValue(newTranslogFlushThresholdSize.toString(), IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTTING.getKey());
284-
settings.updateIndexMetaData(newIndexMeta("index", Settings.builder().put(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTTING.getKey(), newTranslogFlushThresholdSize.toString()).build()));
283+
ByteSizeValue actualNewTranslogFlushThresholdSize = ByteSizeValue.parseBytesSizeValue(newTranslogFlushThresholdSize.toString(), IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTING.getKey());
284+
settings.updateIndexMetaData(newIndexMeta("index", Settings.builder().put(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTING.getKey(), newTranslogFlushThresholdSize.toString()).build()));
285285
assertEquals(actualNewTranslogFlushThresholdSize, settings.getFlushThresholdSize());
286286
}
287287
}

‎core/src/test/java/org/elasticsearch/index/IndexWithShadowReplicasIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public void testIndexWithFewDocuments() throws Exception {
182182
Settings idxSettings = Settings.builder()
183183
.put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1)
184184
.put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, 2)
185-
.put(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTTING.getKey(), new ByteSizeValue(1, ByteSizeUnit.PB))
185+
.put(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTING.getKey(), new ByteSizeValue(1, ByteSizeUnit.PB))
186186
.put(IndexMetaData.SETTING_DATA_PATH, dataPath.toAbsolutePath().toString())
187187
.put(IndexMetaData.SETTING_SHADOW_REPLICAS, true)
188188
.put(IndexMetaData.SETTING_SHARED_FILESYSTEM, true)

‎core/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@ public void testMaybeFlush() throws Exception {
704704
IndexService test = indicesService.indexService("test");
705705
IndexShard shard = test.getShardOrNull(0);
706706
assertFalse(shard.shouldFlush());
707-
client().admin().indices().prepareUpdateSettings("test").setSettings(settingsBuilder().put(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTTING.getKey(), new ByteSizeValue(133 /* size of the operation + header&footer*/, ByteSizeUnit.BYTES)).build()).get();
707+
client().admin().indices().prepareUpdateSettings("test").setSettings(settingsBuilder().put(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTING.getKey(), new ByteSizeValue(133 /* size of the operation + header&footer*/, ByteSizeUnit.BYTES)).build()).get();
708708
client().prepareIndex("test", "test", "0").setSource("{}").setRefresh(randomBoolean()).get();
709709
assertFalse(shard.shouldFlush());
710710
ParsedDocument doc = testParsedDocument("1", "1", "test", null, -1, -1, new ParseContext.Document(), new BytesArray(new byte[]{1}), null);
@@ -720,7 +720,7 @@ public void testMaybeFlush() throws Exception {
720720
shard.getEngine().getTranslog().sync();
721721
long size = shard.getEngine().getTranslog().sizeInBytes();
722722
logger.info("--> current translog size: [{}] num_ops [{}] generation [{}]", shard.getEngine().getTranslog().sizeInBytes(), shard.getEngine().getTranslog().totalOperations(), shard.getEngine().getTranslog().getGeneration());
723-
client().admin().indices().prepareUpdateSettings("test").setSettings(settingsBuilder().put(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTTING.getKey(), new ByteSizeValue(size, ByteSizeUnit.BYTES))
723+
client().admin().indices().prepareUpdateSettings("test").setSettings(settingsBuilder().put(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTING.getKey(), new ByteSizeValue(size, ByteSizeUnit.BYTES))
724724
.build()).get();
725725
client().prepareDelete("test", "test", "2").get();
726726
logger.info("--> translog size after delete: [{}] num_ops [{}] generation [{}]", shard.getEngine().getTranslog().sizeInBytes(), shard.getEngine().getTranslog().totalOperations(), shard.getEngine().getTranslog().getGeneration());
@@ -738,7 +738,7 @@ public void testStressMaybeFlush() throws Exception {
738738
IndexService test = indicesService.indexService("test");
739739
final IndexShard shard = test.getShardOrNull(0);
740740
assertFalse(shard.shouldFlush());
741-
client().admin().indices().prepareUpdateSettings("test").setSettings(settingsBuilder().put(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTTING.getKey(), new ByteSizeValue(133/* size of the operation + header&footer*/, ByteSizeUnit.BYTES)).build()).get();
741+
client().admin().indices().prepareUpdateSettings("test").setSettings(settingsBuilder().put(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTING.getKey(), new ByteSizeValue(133/* size of the operation + header&footer*/, ByteSizeUnit.BYTES)).build()).get();
742742
client().prepareIndex("test", "test", "0").setSource("{}").setRefresh(randomBoolean()).get();
743743
assertFalse(shard.shouldFlush());
744744
final AtomicBoolean running = new AtomicBoolean(true);

‎core/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public void testValidCtor() {
109109

110110
public void testGetRootPaths() throws IOException {
111111
boolean useCustomDataPath = randomBoolean();
112-
final Settings indexSetttings;
112+
final Settings indexSettings;
113113
final Settings nodeSettings;
114114
Settings.Builder indexSettingsBuilder = settingsBuilder()
115115
.put(IndexMetaData.SETTING_INDEX_UUID, "0xDEADBEEF")
@@ -118,7 +118,7 @@ public void testGetRootPaths() throws IOException {
118118
if (useCustomDataPath) {
119119
final Path path = createTempDir();
120120
final boolean includeNodeId = randomBoolean();
121-
indexSetttings = indexSettingsBuilder.put(IndexMetaData.SETTING_DATA_PATH, "custom").build();
121+
indexSettings = indexSettingsBuilder.put(IndexMetaData.SETTING_DATA_PATH, "custom").build();
122122
nodeSettings = settingsBuilder().put(Environment.PATH_SHARED_DATA_SETTING.getKey(), path.toAbsolutePath().toAbsolutePath())
123123
.put(NodeEnvironment.ADD_NODE_ID_TO_CUSTOM_PATH.getKey(), includeNodeId).build();
124124
if (includeNodeId) {
@@ -128,15 +128,15 @@ public void testGetRootPaths() throws IOException {
128128
}
129129
} else {
130130
customPath = null;
131-
indexSetttings = indexSettingsBuilder.build();
131+
indexSettings = indexSettingsBuilder.build();
132132
nodeSettings = Settings.EMPTY;
133133
}
134134
try (final NodeEnvironment env = newNodeEnvironment(nodeSettings)) {
135135
ShardId shardId = new ShardId("foo", "_na_", 0);
136136
Path[] paths = env.availableShardPaths(shardId);
137137
Path path = randomFrom(paths);
138138
ShardStateMetaData.FORMAT.write(new ShardStateMetaData(2, true, "0xDEADBEEF", AllocationId.newInitializing()), 2, path);
139-
ShardPath shardPath = ShardPath.loadShardPath(logger, env, shardId, IndexSettingsModule.newIndexSettings(shardId.getIndex(), indexSetttings));
139+
ShardPath shardPath = ShardPath.loadShardPath(logger, env, shardId, IndexSettingsModule.newIndexSettings(shardId.getIndex(), indexSettings));
140140
boolean found = false;
141141
for (Path p : env.nodeDataPaths()) {
142142
if (p.equals(shardPath.getRootStatePath())) {

‎core/src/test/java/org/elasticsearch/index/store/CorruptedFileIT.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public void testCorruptFileAndRecover() throws ExecutionException, InterruptedEx
146146
.put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, "1")
147147
.put(MergePolicyConfig.INDEX_MERGE_ENABLED, false)
148148
.put(MockFSIndexStore.INDEX_CHECK_INDEX_ON_CLOSE_SETTING.getKey(), false) // no checkindex - we corrupt shards on purpose
149-
.put(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTTING.getKey(), new ByteSizeValue(1, ByteSizeUnit.PB)) // no translog based flush - it might change the .liv / segments.N files
149+
.put(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTING.getKey(), new ByteSizeValue(1, ByteSizeUnit.PB)) // no translog based flush - it might change the .liv / segments.N files
150150
));
151151
ensureGreen();
152152
disableAllocation("test");
@@ -250,7 +250,7 @@ public void testCorruptPrimaryNoReplica() throws ExecutionException, Interrupted
250250
.put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, "0")
251251
.put(MergePolicyConfig.INDEX_MERGE_ENABLED, false)
252252
.put(MockFSIndexStore.INDEX_CHECK_INDEX_ON_CLOSE_SETTING.getKey(), false) // no checkindex - we corrupt shards on purpose
253-
.put(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTTING.getKey(), new ByteSizeValue(1, ByteSizeUnit.PB)) // no translog based flush - it might change the .liv / segments.N files
253+
.put(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTING.getKey(), new ByteSizeValue(1, ByteSizeUnit.PB)) // no translog based flush - it might change the .liv / segments.N files
254254
));
255255
ensureGreen();
256256
IndexRequestBuilder[] builders = new IndexRequestBuilder[numDocs];
@@ -475,7 +475,7 @@ public void testCorruptFileThenSnapshotAndRestore() throws ExecutionException, I
475475
.put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, "0") // no replicas for this test
476476
.put(MergePolicyConfig.INDEX_MERGE_ENABLED, false)
477477
.put(MockFSIndexStore.INDEX_CHECK_INDEX_ON_CLOSE_SETTING.getKey(), false) // no checkindex - we corrupt shards on purpose
478-
.put(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTTING.getKey(), new ByteSizeValue(1, ByteSizeUnit.PB)) // no translog based flush - it might change the .liv / segments.N files
478+
.put(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTING.getKey(), new ByteSizeValue(1, ByteSizeUnit.PB)) // no translog based flush - it might change the .liv / segments.N files
479479
));
480480
ensureGreen();
481481
IndexRequestBuilder[] builders = new IndexRequestBuilder[numDocs];
@@ -529,7 +529,7 @@ public void testReplicaCorruption() throws Exception {
529529
.put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, cluster().numDataNodes() - 1)
530530
.put(MergePolicyConfig.INDEX_MERGE_ENABLED, false)
531531
.put(MockFSIndexStore.INDEX_CHECK_INDEX_ON_CLOSE_SETTING.getKey(), false) // no checkindex - we corrupt shards on purpose
532-
.put(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTTING.getKey(), new ByteSizeValue(1, ByteSizeUnit.PB)) // no translog based flush - it might change the .liv / segments.N files
532+
.put(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTING.getKey(), new ByteSizeValue(1, ByteSizeUnit.PB)) // no translog based flush - it might change the .liv / segments.N files
533533
));
534534
ensureGreen();
535535
IndexRequestBuilder[] builders = new IndexRequestBuilder[numDocs];

‎core/src/test/java/org/elasticsearch/index/store/CorruptedTranslogIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,13 +167,13 @@ private void corruptRandomTranslogFiles() throws IOException {
167167

168168
/** Disables translog flushing for the specified index */
169169
private static void disableTranslogFlush(String index) {
170-
Settings settings = Settings.builder().put(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTTING.getKey(), new ByteSizeValue(1, ByteSizeUnit.PB)).build();
170+
Settings settings = Settings.builder().put(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTING.getKey(), new ByteSizeValue(1, ByteSizeUnit.PB)).build();
171171
client().admin().indices().prepareUpdateSettings(index).setSettings(settings).get();
172172
}
173173

174174
/** Enables translog flushing for the specified index */
175175
private static void enableTranslogFlush(String index) {
176-
Settings settings = Settings.builder().put(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTTING.getKey(), new ByteSizeValue(512, ByteSizeUnit.MB)).build();
176+
Settings settings = Settings.builder().put(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTING.getKey(), new ByteSizeValue(512, ByteSizeUnit.MB)).build();
177177
client().admin().indices().prepareUpdateSettings(index).setSettings(settings).get();
178178
}
179179
}

‎core/src/test/java/org/elasticsearch/indices/flush/FlushIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ public void testSyncedFlushWithConcurrentIndexing() throws Exception {
154154
createIndex("test");
155155

156156
client().admin().indices().prepareUpdateSettings("test").setSettings(
157-
Settings.builder().put(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTTING.getKey(), new ByteSizeValue(1, ByteSizeUnit.PB)).put("index.refresh_interval", -1).put("index.number_of_replicas", internalCluster().numDataNodes() - 1))
157+
Settings.builder().put(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTING.getKey(), new ByteSizeValue(1, ByteSizeUnit.PB)).put("index.refresh_interval", -1).put("index.number_of_replicas", internalCluster().numDataNodes() - 1))
158158
.get();
159159
ensureGreen();
160160
final AtomicBoolean stop = new AtomicBoolean(false);

0 commit comments

Comments
 (0)