Skip to content

Conversation

jordan-powers
Copy link
Contributor

Fixes #136107

@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-storage-engine (Team:StorageEngine)

@elasticsearchmachine
Copy link
Collaborator

Hi @jordan-powers, I've created a changelog YAML for you.

import static org.hamcrest.Matchers.hasEntry;
import static org.hamcrest.Matchers.hasKey;

public class PatternTextBasicLicenseTests extends DataStreamLicenseChangeTestCase {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one seems orthogonal.. let's leave it outside, to simplify backporting.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added this test because the logic to gate pattern_text behind a basic license also depends on the mapping (to detect if pattern_text is in use), and so it was also suffering from this same bug. But I'll move the test into a follow-up PR.

@jordan-powers jordan-powers merged commit d513723 into elastic:main Oct 8, 2025
34 checks passed
jordan-powers added a commit to jordan-powers/elasticsearch that referenced this pull request Oct 8, 2025
@elasticsearchmachine
Copy link
Collaborator

💔 Backport failed

Status Branch Result
9.2
8.19 Commit could not be cherrypicked due to conflicts
9.1 Commit could not be cherrypicked due to conflicts
9.0 Commit could not be cherrypicked due to conflicts
8.18 Commit could not be cherrypicked due to conflicts

You can use sqren/backport to manually backport by running backport --upstream elastic/elasticsearch --pr 136119

jordan-powers added a commit to jordan-powers/elasticsearch that referenced this pull request Oct 8, 2025
Fixes elastic#136107

(cherry picked from commit d513723)

# Conflicts:
#	x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/LogsdbIndexModeSettingsProvider.java
#	x-pack/plugin/logsdb/src/test/java/org/elasticsearch/xpack/logsdb/LogsdbIndexModeSettingsProviderTests.java
#	x-pack/plugin/logsdb/src/yamlRestTest/resources/rest-api-spec/test/30_logsdb_default_mapping.yml
jordan-powers added a commit to jordan-powers/elasticsearch that referenced this pull request Oct 8, 2025
Fixes elastic#136107

(cherry picked from commit d513723)

# Conflicts:
#	x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/LogsdbIndexModeSettingsProvider.java
#	x-pack/plugin/logsdb/src/test/java/org/elasticsearch/xpack/logsdb/LogsdbIndexModeSettingsProviderTests.java
#	x-pack/plugin/logsdb/src/yamlRestTest/resources/rest-api-spec/test/30_logsdb_default_mapping.yml
@jordan-powers
Copy link
Contributor Author

💚 All backports created successfully

Status Branch Result
9.1
9.0
8.19
8.18

Questions ?

Please refer to the Backport tool documentation

jordan-powers added a commit to jordan-powers/elasticsearch that referenced this pull request Oct 8, 2025
Fixes elastic#136107

(cherry picked from commit d513723)

# Conflicts:
#	x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/LogsdbIndexModeSettingsProvider.java
#	x-pack/plugin/logsdb/src/test/java/org/elasticsearch/xpack/logsdb/LogsdbIndexModeSettingsProviderTests.java
#	x-pack/plugin/logsdb/src/yamlRestTest/resources/rest-api-spec/test/30_logsdb_default_mapping.yml
elasticsearchmachine pushed a commit that referenced this pull request Oct 8, 2025
Fixes #136107

(cherry picked from commit d513723)

# Conflicts:
#	x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/LogsdbIndexModeSettingsProvider.java
#	x-pack/plugin/logsdb/src/test/java/org/elasticsearch/xpack/logsdb/LogsdbIndexModeSettingsProviderTests.java
#	x-pack/plugin/logsdb/src/yamlRestTest/resources/rest-api-spec/test/30_logsdb_default_mapping.yml
elasticsearchmachine pushed a commit that referenced this pull request Oct 8, 2025
Fixes #136107

(cherry picked from commit d513723)

# Conflicts:
#	x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/LogsdbIndexModeSettingsProvider.java
#	x-pack/plugin/logsdb/src/test/java/org/elasticsearch/xpack/logsdb/LogsdbIndexModeSettingsProviderTests.java
#	x-pack/plugin/logsdb/src/yamlRestTest/resources/rest-api-spec/test/30_logsdb_default_mapping.yml
elasticsearchmachine pushed a commit that referenced this pull request Oct 8, 2025
Fixes #136107

(cherry picked from commit d513723)

# Conflicts:
#	x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/LogsdbIndexModeSettingsProvider.java
#	x-pack/plugin/logsdb/src/test/java/org/elasticsearch/xpack/logsdb/LogsdbIndexModeSettingsProviderTests.java
#	x-pack/plugin/logsdb/src/yamlRestTest/resources/rest-api-spec/test/30_logsdb_default_mapping.yml
elasticsearchmachine pushed a commit that referenced this pull request Oct 8, 2025
Fixes #136107

(cherry picked from commit d513723)

# Conflicts:
#	x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/LogsdbIndexModeSettingsProvider.java
#	x-pack/plugin/logsdb/src/test/java/org/elasticsearch/xpack/logsdb/LogsdbIndexModeSettingsProviderTests.java
#	x-pack/plugin/logsdb/src/yamlRestTest/resources/rest-api-spec/test/30_logsdb_default_mapping.yml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Mapping conflict during rollover when using "logsdb" index mode
3 participants