Skip to content

Fix Semantic Text 8.x Upgrade Bug #125446

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

Merged
merged 4 commits into from
Mar 24, 2025
Merged

Fix Semantic Text 8.x Upgrade Bug #125446

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7c0adbe
Fix bug where 8.x upgrades would revert to the legacy format
Mikep86 Mar 21, 2025
b97f4bf
Update docs/changelog/125446.yaml
Mikep86 Mar 21, 2025
751d044
Update changelog
Mikep86 Mar 21, 2025
65f0db4
Randomize index versions
Mikep86 Mar 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/changelog/125446.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 125446
summary: Fix Semantic Text 8.x Upgrade Bug
area: Mapping
type: bug
issues: []
4 changes: 3 additions & 1 deletion server/src/main/java/org/elasticsearch/index/mapper/InferenceMetadataFieldsMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,9 @@ public static boolean isEnabled(Settings settings) {
var version = IndexMetadata.SETTING_INDEX_VERSION_CREATED.get(settings);
if ((version.before(IndexVersions.INFERENCE_METADATA_FIELDS)
&& version.between(IndexVersions.INFERENCE_METADATA_FIELDS_BACKPORT, IndexVersions.UPGRADE_TO_LUCENE_10_0_0) == false)
|| (version.before(USE_NEW_SEMANTIC_TEXT_FORMAT_BY_DEFAULT) && USE_LEGACY_SEMANTIC_TEXT_FORMAT.exists(settings) == false)) {
|| (version.onOrAfter(IndexVersions.UPGRADE_TO_LUCENE_10_0_0)
&& version.before(USE_NEW_SEMANTIC_TEXT_FORMAT_BY_DEFAULT)
&& USE_LEGACY_SEMANTIC_TEXT_FORMAT.exists(settings) == false)) {
return false;
}

Expand Down
14 changes: 14 additions & 0 deletions .../org/elasticsearch/xpack/inference/mapper/SemanticInferenceMetadataFieldsMapperTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,20 @@ public void testIsEnabledByDefault() {
)
.build();
assertTrue(InferenceMetadataFieldsMapper.isEnabled(settings));

// Test upgrades from 8.x
settings = Settings.builder()
.put(
IndexMetadata.SETTING_INDEX_VERSION_CREATED.getKey(),
IndexVersionUtils.getPreviousVersion(IndexVersions.INFERENCE_METADATA_FIELDS_BACKPORT)
)
.build();
assertFalse(InferenceMetadataFieldsMapper.isEnabled(settings));

settings = Settings.builder()
.put(IndexMetadata.SETTING_INDEX_VERSION_CREATED.getKey(), IndexVersions.INFERENCE_METADATA_FIELDS_BACKPORT)
.build();
assertTrue(InferenceMetadataFieldsMapper.isEnabled(settings));
}

@Override
Expand Down
Loading