Skip to content

Commit 03cbb89

Browse files
committed
Increment version on system index settings change (elastic#84994)
The test was failing on assertion around index settings version change in case actual settings were changed. This change adds missing version increment and readable messages to the related assertions. (cherry picked from commit 351a410)
1 parent c831a61 commit 03cbb89

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

server/src/main/java/org/elasticsearch/cluster/metadata/SystemIndexMetadataUpgradeService.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ public ClusterState execute(ClusterState currentState) throws Exception {
9595
}
9696
if (isSystem && cursor.value.getSettings().getAsBoolean(IndexMetadata.SETTING_INDEX_HIDDEN, false)) {
9797
builder.settings(Settings.builder().put(cursor.value.getSettings()).put(IndexMetadata.SETTING_INDEX_HIDDEN, false));
98+
builder.settingsVersion(builder.settingsVersion() + 1);
9899
updated = true;
99100
}
100101
if (updated) {

server/src/main/java/org/elasticsearch/index/IndexService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -790,9 +790,9 @@ public synchronized void updateMetadata(final IndexMetadata currentIndexMetadata
790790
final long currentSettingsVersion = currentIndexMetadata.getSettingsVersion();
791791
final long newSettingsVersion = newIndexMetadata.getSettingsVersion();
792792
if (currentSettingsVersion == newSettingsVersion) {
793-
assert updateIndexSettings == false;
793+
assert updateIndexSettings == false : "No index updates are expected as index settings version has not changed";
794794
} else {
795-
assert updateIndexSettings;
795+
assert updateIndexSettings : "Index updates are expected as index settings version has changed";
796796
assert currentSettingsVersion < newSettingsVersion
797797
: "expected current settings version ["
798798
+ currentSettingsVersion

0 commit comments

Comments
 (0)