Ensure `index.mapping.single_type` can only be set on 5.x indices by s1monw · Pull Request #25375 · elastic/elasticsearch

s1monw · 2017-06-23T10:03:48Z

In 6.x we prevent multiple types and default to index.mapping.single_type: false
This change removes the registered setting and ensures that it's preserved for
5.x indices.

Relates to #24961

Note this might still fail since not all places are cut over

In 6.x we prevent multiple types and default to `index.mapping.single_type: false` This change removes the registered setting and ensures that it's preserved for 5.x indices. Relates to elastic#24961

nik9000

LGTM anytime the tests are ready for it.

nik9000 · 2017-06-23T15:52:57Z

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

+            case IndexSettings.INDEX_MAPPING_SINGLE_TYPE_SETTING_KEY:
+                // this was settable in 5.x but not anymore in 6.x so we have to preserve the value ie. make it read-only
+                // this can be removed in later versions
+                    return true;


Nit: extra indent.

nik9000 · 2017-06-23T15:56:23Z

core/src/main/java/org/elasticsearch/index/mapper/TypeFieldMapper.java

+    private static MappedFieldType defaultFieldType(IndexSettings indexSettings) {
        MappedFieldType defaultFieldType = Defaults.FIELD_TYPE.clone();
-        if (MapperService.INDEX_MAPPING_SINGLE_TYPE_SETTING.get(indexSettings)) {
+        if (indexSettings.isSingleType()) {


nik9000 · 2017-06-23T15:58:20Z

core/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTestCase.java


    @Before
    public void setup() throws Exception {
-        indexService = createIndex("test", Settings.builder().put("mapping.single_type", false).build());


nik9000 · 2017-06-23T16:02:05Z

qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/10_basic.yml

 - match: { hits.total: 5 } # just check we recovered fine

+
+ - do:


This change removes the remaining explicitly specified `index.mapper.single_type` settings from tests in order to allow the removal of the setting. This is the already approved part of elastic#25375 broken out to simplfiy reviews on

…25388) This change removes the remaining explicitly specified `index.mapper.single_type` settings from tests in order to allow the removal of the setting. This is the already approved part of #25375 broken out to simplfiy reviews on

jpountz

LGTM!

jamshid · 2019-11-15T02:49:53Z

Sorry I know this is closed but in case someone else ends up here from a web search...

Seems https://www.elastic.co/guide/en/elasticsearch/reference/6.7/removal-of-types.html falsely claims that index.mapping.single_type: true continues to work with 6.x. Not only is that the default value, but the PUT request is not allowed to specify this value.

The following examples can be used in Elasticsearch 5.6 or Elasticsearch 6.x. In 6.x, there is no need to specify index.mapping.single_type as that is the default.

This fails against ES 6.8.3 with a 400 error:

curl -X PUT -H 'Content-type: application/json' http://ELASTICSEARCH:9200/index1 --data-binary '
{
  "settings": {
    "index.mapping.single_type": true
  },
  "mappings": {
    "_doc": {
      "properties": {
        "name": {
          "type": "text"
        },
        "user_name": {
          "type": "keyword"
        },
        "email": {
          "type": "keyword"
        }
      }
    }
  }
}
'

HTTP/1.1 400 Bad Request
Warning: 299 Elasticsearch-6.8.3-0c48c0e "[types removal] The parameter include_type_name should be explicitly specified in create index requests to prepare for 7.0. In 7.0 include_type_name will default to 'false', and requests are expected to omit the type name in mapping definitions."
content-type: application/json; charset=UTF-8
content-length: X
{
  "error": {
    "root_cause": [
      {
        "type": "remote_transport_exception",
        "reason": "[...][indices:admin/create]"
      }
    ],
    "type": "illegal_argument_exception",
    "reason": "unknown setting [index.mapping.single_type] please check that any required plugins are installed, or check the breaking changes documentation for removed settings"
  },
  "status": 400
}

I tried adding ?include_type_name=true to the url, the docs indicate that's needed for some other backward compatibility, but it does not help.

PS: having to add a parameter for a release, then remove it for the next release, makes it hard for an app to support multiple ES versions.

Ensure index.mapping.single_type can only be set on 5.x indices

d0a12f1

In 6.x we prevent multiple types and default to `index.mapping.single_type: false` This change removes the registered setting and ensures that it's preserved for 5.x indices. Relates to elastic#24961

s1monw added :Core/Infra/Settings Settings infrastructure and APIs blocker v6.0.0 labels Jun 23, 2017

s1monw requested review from jpountz and nik9000 June 23, 2017 10:03

s1monw added 4 commits June 23, 2017 14:46

Remove obsolete mapper.single_type settings

91f58c5

fix rest tests to rely on index.version.created

50d8290

fix remaining core tests

947f753

separate out multi type test for fields limits

f0484fa

nik9000 approved these changes Jun 23, 2017

View reviewed changes

s1monw added 2 commits June 24, 2017 15:42

Merge branch 'master' into make_type_setting_private

976ff28

fix indentation

2415dfd

s1monw mentioned this pull request Jun 24, 2017

Remove remaining index.mapper.single_type setting usage from tests #25388

Merged

Merge branch 'master' into make_type_setting_private

620debc

s1monw mentioned this pull request Jun 25, 2017

Make mapping.single_type only settable if the index is a 5.x index #24961

Closed

6 tasks

Merge branch 'master' into make_type_setting_private

77f8473

jpountz approved these changes Jul 4, 2017

View reviewed changes

Merge branch 'master' into make_type_setting_private

5121e05

s1monw merged commit 7c637a0 into elastic:master Jul 5, 2017

s1monw deleted the make_type_setting_private branch July 5, 2017 13:16

jsvd mentioned this pull request Jul 6, 2017

Add support for using kibana dashboard import api elastic/logstash#7591

Merged

andrewkroh mentioned this pull request Jul 12, 2017

metricbeat dashboards install - unknown setting [index.mapping.single_type] elastic/beats#4659

Closed

colings86 added v6.0.0-beta1 and removed v6.0.0 labels Aug 3, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Ensure `index.mapping.single_type` can only be set on 5.x indices#25375

Ensure `index.mapping.single_type` can only be set on 5.x indices#25375
s1monw merged 10 commits intoelastic:masterfrom
s1monw:make_type_setting_private

s1monw commented Jun 23, 2017

Uh oh!

nik9000 left a comment

Uh oh!

nik9000 Jun 23, 2017

Uh oh!

nik9000 Jun 23, 2017

Uh oh!

nik9000 Jun 23, 2017

Uh oh!

nik9000 Jun 23, 2017

Uh oh!

jpountz left a comment

Uh oh!

jamshid commented Nov 15, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

		- match: { hits.total: 5 } # just check we recovered fine


		- do:

Conversation

s1monw commented Jun 23, 2017

Uh oh!

nik9000 left a comment

Choose a reason for hiding this comment

Uh oh!

nik9000 Jun 23, 2017

Choose a reason for hiding this comment

Uh oh!

nik9000 Jun 23, 2017

Choose a reason for hiding this comment

Uh oh!

nik9000 Jun 23, 2017

Choose a reason for hiding this comment

Uh oh!

nik9000 Jun 23, 2017

Choose a reason for hiding this comment

Uh oh!

jpountz left a comment

Choose a reason for hiding this comment

Uh oh!

jamshid commented Nov 15, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants