From a7f5ec25f7adaac31a86209ce005d8b3f038e5ff Mon Sep 17 00:00:00 2001 From: Tal Levy Date: Wed, 20 Feb 2019 10:57:26 -0800 Subject: [PATCH 1/5] fix index refresh in test within 20_mix_typeless_typeful the test "Implicitly create a typeless ... typed template" fails occasionally because the index operation hasn't propogated to update the index mapping in time for the following assertion about a dynamically mapped field "bar". error failed with: ``` field [test-1.mappings.my_type.properties.bar] doesn't have a true value Expected: not null but: was null ``` refreshing the index should resolve this timing issue. --- .../test/indices.create/20_mix_typeless_typeful.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/20_mix_typeless_typeful.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/20_mix_typeless_typeful.yml index 1eab9d6159764..288d0f5a50a25 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/20_mix_typeless_typeful.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/20_mix_typeless_typeful.yml @@ -123,6 +123,7 @@ index: index: test-1 body: { bar: 42 } + refresh: true - do: indices.get_mapping: From 55ae971ab7ad15c5778bfd97a5755a5b658921a6 Mon Sep 17 00:00:00 2001 From: Tal Levy Date: Wed, 20 Feb 2019 12:52:28 -0800 Subject: [PATCH 2/5] add bar to mapping --- .../test/indices.create/20_mix_typeless_typeful.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/20_mix_typeless_typeful.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/20_mix_typeless_typeful.yml index 288d0f5a50a25..db6f8fff1b120 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/20_mix_typeless_typeful.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/20_mix_typeless_typeful.yml @@ -118,6 +118,8 @@ properties: foo: type: keyword + bar: + type: long - do: index: From 8e11a4efe93022a3816b8fed2800aab5301f27ec Mon Sep 17 00:00:00 2001 From: Tal Levy Date: Wed, 20 Feb 2019 15:51:27 -0800 Subject: [PATCH 3/5] rework --- .../test/indices.create/20_mix_typeless_typeful.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/20_mix_typeless_typeful.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/20_mix_typeless_typeful.yml index db6f8fff1b120..6d3dd03d4ca36 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/20_mix_typeless_typeful.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/20_mix_typeless_typeful.yml @@ -118,14 +118,21 @@ properties: foo: type: keyword - bar: - type: long - do: index: index: test-1 body: { bar: 42 } - refresh: true + + - do: + indices.put_mapping: + include_type_name: true + index: test-1 + type: my_type + body: + properties: + bar: + type: "long" - do: indices.get_mapping: From 0a5fb646d16a45da2973cf08bb134a44541522e6 Mon Sep 17 00:00:00 2001 From: Tal Levy Date: Wed, 20 Feb 2019 16:14:02 -0800 Subject: [PATCH 4/5] unmute --- .../test/indices.create/20_mix_typeless_typeful.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/20_mix_typeless_typeful.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/20_mix_typeless_typeful.yml index 22d1317a5894b..6d3dd03d4ca36 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/20_mix_typeless_typeful.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/20_mix_typeless_typeful.yml @@ -104,8 +104,8 @@ "Implicitly create a typeless index while there is a typed template": - skip: - version: "all" - reason: "awaits fix in #39198" + version: " - 6.99.99" + reason: needs typeless index operations to work on typed indices - do: indices.put_template: From a71dc8e446383d8b9c1e9d482effc76afe7777ef Mon Sep 17 00:00:00 2001 From: Tal Levy Date: Thu, 7 Mar 2019 08:20:04 -0800 Subject: [PATCH 5/5] use cluster.health to wait for update --- .../test/indices.create/20_mix_typeless_typeful.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/20_mix_typeless_typeful.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/20_mix_typeless_typeful.yml index 6d3dd03d4ca36..a05134866628b 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/20_mix_typeless_typeful.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/20_mix_typeless_typeful.yml @@ -124,15 +124,10 @@ index: test-1 body: { bar: 42 } +# ensures dynamic mapping update is visible to get_mapping - do: - indices.put_mapping: - include_type_name: true - index: test-1 - type: my_type - body: - properties: - bar: - type: "long" + cluster.health: + wait_for_events: normal - do: indices.get_mapping: