Skip to content

Commit 7077cb3

Browse files
authored
Add ability to listen to group of affix settings (#37679) (#38135)
Currently we have the ability to listen for setting changes to two group affix settings. However, it is possible that we might have the need to listen to more than two. This commit adds a method that allows consumer to listen to a list of affix settings for changes.
1 parent 94d4862 commit 7077cb3

File tree

2 files changed

+133
-0
lines changed

2 files changed

+133
-0
lines changed

server/src/main/java/org/elasticsearch/common/settings/AbstractScopedSettings.java

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,54 @@ public void apply(Map<String, Tuple<A, B>> values, Settings current, Settings pr
295295
});
296296
}
297297

298+
/**
299+
* Adds a affix settings consumer that accepts the settings for a group of settings. The consumer is only
300+
* notified if at least one of the settings change.
301+
* <p>
302+
* Note: Only settings registered in {@link SettingsModule} can be changed dynamically.
303+
* </p>
304+
*/
305+
public synchronized void addAffixGroupUpdateConsumer(List<Setting.AffixSetting<?>> settings, BiConsumer<String, Settings> consumer) {
306+
List<SettingUpdater> affixUpdaters = new ArrayList<>(settings.size());
307+
for (Setting.AffixSetting<?> setting : settings) {
308+
ensureSettingIsRegistered(setting);
309+
affixUpdaters.add(setting.newAffixUpdater((a,b)-> {}, logger, (a,b)-> {}));
310+
}
311+
312+
addSettingsUpdater(new SettingUpdater<Map<String, Settings>>() {
313+
314+
@Override
315+
public boolean hasChanged(Settings current, Settings previous) {
316+
return affixUpdaters.stream().anyMatch(au -> au.hasChanged(current, previous));
317+
}
318+
319+
@Override
320+
public Map<String, Settings> getValue(Settings current, Settings previous) {
321+
Set<String> namespaces = new HashSet<>();
322+
for (Setting.AffixSetting<?> setting : settings) {
323+
SettingUpdater affixUpdaterA = setting.newAffixUpdater((k, v) -> namespaces.add(k), logger, (a, b) ->{});
324+
affixUpdaterA.apply(current, previous);
325+
}
326+
Map<String, Settings> namespaceToSettings = new HashMap<>(namespaces.size());
327+
for (String namespace : namespaces) {
328+
Set<String> concreteSettings = new HashSet<>(settings.size());
329+
for (Setting.AffixSetting<?> setting : settings) {
330+
concreteSettings.add(setting.getConcreteSettingForNamespace(namespace).getKey());
331+
}
332+
namespaceToSettings.put(namespace, current.filter(concreteSettings::contains));
333+
}
334+
return namespaceToSettings;
335+
}
336+
337+
@Override
338+
public void apply(Map<String, Settings> values, Settings current, Settings previous) {
339+
for (Map.Entry<String, Settings> entry : values.entrySet()) {
340+
consumer.accept(entry.getKey(), entry.getValue());
341+
}
342+
}
343+
});
344+
}
345+
298346
private void ensureSettingIsRegistered(Setting.AffixSetting<?> setting) {
299347
final Setting<?> registeredSetting = this.complexMatchers.get(setting.getKey());
300348
if (setting != registeredSetting) {

server/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,91 @@ public void testTupleAffixUpdateConsumer() {
316316
assertEquals(0, results.size());
317317
}
318318

319+
public void testAffixGroupUpdateConsumer() {
320+
String prefix = randomAlphaOfLength(3) + "foo.";
321+
String intSuffix = randomAlphaOfLength(3);
322+
String listSuffix = randomAlphaOfLength(4);
323+
Setting.AffixSetting<Integer> intSetting = Setting.affixKeySetting(prefix, intSuffix,
324+
(k) -> Setting.intSetting(k, 1, Property.Dynamic, Property.NodeScope));
325+
Setting.AffixSetting<List<Integer>> listSetting = Setting.affixKeySetting(prefix, listSuffix,
326+
(k) -> Setting.listSetting(k, Arrays.asList("1"), Integer::parseInt, Property.Dynamic, Property.NodeScope));
327+
AbstractScopedSettings service = new ClusterSettings(Settings.EMPTY,new HashSet<>(Arrays.asList(intSetting, listSetting)));
328+
Map<String, Settings> results = new HashMap<>();
329+
Function<String, String> listBuilder = g -> (prefix + g + "." + listSuffix);
330+
Function<String, String> intBuilder = g -> (prefix + g + "." + intSuffix);
331+
String group1 = randomAlphaOfLength(3);
332+
String group2 = randomAlphaOfLength(4);
333+
String group3 = randomAlphaOfLength(5);
334+
BiConsumer<String, Settings> listConsumer = results::put;
335+
336+
service.addAffixGroupUpdateConsumer(Arrays.asList(intSetting, listSetting), listConsumer);
337+
assertEquals(0, results.size());
338+
service.applySettings(Settings.builder()
339+
.put(intBuilder.apply(group1), 2)
340+
.put(intBuilder.apply(group2), 7)
341+
.putList(listBuilder.apply(group1), "16", "17")
342+
.putList(listBuilder.apply(group2), "18", "19", "20")
343+
.build());
344+
Settings groupOneSettings = results.get(group1);
345+
Settings groupTwoSettings = results.get(group2);
346+
assertEquals(2, intSetting.getConcreteSettingForNamespace(group1).get(groupOneSettings).intValue());
347+
assertEquals(7, intSetting.getConcreteSettingForNamespace(group2).get(groupTwoSettings).intValue());
348+
assertEquals(Arrays.asList(16, 17), listSetting.getConcreteSettingForNamespace(group1).get(groupOneSettings));
349+
assertEquals(Arrays.asList(18, 19, 20), listSetting.getConcreteSettingForNamespace(group2).get(groupTwoSettings));
350+
assertEquals(2, groupOneSettings.size());
351+
assertEquals(2, groupTwoSettings.size());
352+
assertEquals(2, results.size());
353+
354+
results.clear();
355+
356+
service.applySettings(Settings.builder()
357+
.put(intBuilder.apply(group1), 2)
358+
.put(intBuilder.apply(group2), 7)
359+
.putList(listBuilder.apply(group1), "16", "17")
360+
.putNull(listBuilder.apply(group2)) // removed
361+
.build());
362+
363+
assertNull(group1 + " wasn't changed", results.get(group1));
364+
groupTwoSettings = results.get(group2);
365+
assertEquals(7, intSetting.getConcreteSettingForNamespace(group2).get(groupTwoSettings).intValue());
366+
assertEquals(Arrays.asList(1), listSetting.getConcreteSettingForNamespace(group2).get(groupTwoSettings));
367+
assertEquals(1, results.size());
368+
assertEquals(2, groupTwoSettings.size());
369+
results.clear();
370+
371+
service.applySettings(Settings.builder()
372+
.put(intBuilder.apply(group1), 2)
373+
.put(intBuilder.apply(group2), 7)
374+
.putList(listBuilder.apply(group1), "16", "17")
375+
.putList(listBuilder.apply(group3), "5", "6") // added
376+
.build());
377+
assertNull(group1 + " wasn't changed", results.get(group1));
378+
assertNull(group2 + " wasn't changed", results.get(group2));
379+
380+
Settings groupThreeSettings = results.get(group3);
381+
assertEquals(1, intSetting.getConcreteSettingForNamespace(group3).get(groupThreeSettings).intValue());
382+
assertEquals(Arrays.asList(5, 6), listSetting.getConcreteSettingForNamespace(group3).get(groupThreeSettings));
383+
assertEquals(1, results.size());
384+
assertEquals(1, groupThreeSettings.size());
385+
results.clear();
386+
387+
service.applySettings(Settings.builder()
388+
.put(intBuilder.apply(group1), 4) // modified
389+
.put(intBuilder.apply(group2), 7)
390+
.putList(listBuilder.apply(group1), "16", "17")
391+
.putList(listBuilder.apply(group3), "5", "6")
392+
.build());
393+
assertNull(group2 + " wasn't changed", results.get(group2));
394+
assertNull(group3 + " wasn't changed", results.get(group3));
395+
396+
groupOneSettings = results.get(group1);
397+
assertEquals(4, intSetting.getConcreteSettingForNamespace(group1).get(groupOneSettings).intValue());
398+
assertEquals(Arrays.asList(16, 17), listSetting.getConcreteSettingForNamespace(group1).get(groupOneSettings));
399+
assertEquals(1, results.size());
400+
assertEquals(2, groupOneSettings.size());
401+
results.clear();
402+
}
403+
319404
public void testAddConsumerAffix() {
320405
Setting.AffixSetting<Integer> intSetting = Setting.affixKeySetting("foo.", "bar",
321406
(k) -> Setting.intSetting(k, 1, Property.Dynamic, Property.NodeScope));

0 commit comments

Comments
 (0)