From f4b9662e3b39d0377a338984dfa2236676761728 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Feb 2021 10:28:19 +0000 Subject: [PATCH 1/4] Add data_frozen node role (#5322) (#5324) Co-authored-by: Steve Gordon (cherry picked from commit 397294554e0d94bec3825515fb195d5d6826ad15) --- src/Nest/Cluster/NodesInfo/NodeRole.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Nest/Cluster/NodesInfo/NodeRole.cs b/src/Nest/Cluster/NodesInfo/NodeRole.cs index ef7efe73c71..a5f869be9c4 100644 --- a/src/Nest/Cluster/NodesInfo/NodeRole.cs +++ b/src/Nest/Cluster/NodesInfo/NodeRole.cs @@ -20,6 +20,9 @@ public enum NodeRole [EnumMember(Value = "data_cold")] DataCold, + [EnumMember(Value = "data_frozen")] + DataFrozen, + [EnumMember(Value = "data_content")] DataContent, From 4c470f4df49d95cc580eeb583afe61283efc8e93 Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Thu, 25 Mar 2021 08:26:34 +0000 Subject: [PATCH 2/4] Less flaky test assertions (#5462) (#5477) (cherry picked from commit 26ccb7fb305bbc41688fa39f215760b751b7a0ad) --- tests/Tests/Search/Search/SearchApiTests.cs | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/tests/Tests/Search/Search/SearchApiTests.cs b/tests/Tests/Search/Search/SearchApiTests.cs index 36060a22583..ff871f0185e 100644 --- a/tests/Tests/Search/Search/SearchApiTests.cs +++ b/tests/Tests/Search/Search/SearchApiTests.cs @@ -722,11 +722,22 @@ public SearchApiRuntimeFieldsTests(ReadOnlyCluster cluster, EndpointUsage usage) protected override void ExpectResponse(ISearchResponse response) { response.Hits.Count.Should().BeGreaterThan(0); - response.Hits.First().Should().NotBeNull(); - response.Hits.First().Type.Should().NotBeNullOrWhiteSpace(); - response.Hits.First().Fields.ValueOf(p => p.StartedOnDayOfWeek).Should().NotBeNullOrEmpty(); - response.Hits.First().Fields.ValueOf(p => p.ThirtyDaysFromStarted).Should().NotBeNullOrEmpty(); - response.Hits.First().Fields[RuntimeFieldName].As().FirstOrDefault().Should().NotBeNullOrEmpty(); + + foreach (var hit in response.Hits) + { + hit.Should().NotBeNull(); + + if (hit.Source.StartedOn != default) + { + hit.Fields.ValueOf(p => p.StartedOnDayOfWeek).Should().NotBeNullOrEmpty(); + hit.Fields.ValueOf(p => p.ThirtyDaysFromStarted).Should().NotBeNullOrEmpty(); + } + + if (!string.IsNullOrEmpty(hit.Source.Type)) + { + hit.Fields[RuntimeFieldName].As().FirstOrDefault().Should().NotBeNullOrEmpty(); + } + } } } } From 5d40bb52f60defd8ea98c57030349adc63b67720 Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Thu, 1 Apr 2021 15:49:04 +0100 Subject: [PATCH 3/4] bump --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index a10d1a06f51..9763a4a5c1b 100644 --- a/readme.md +++ b/readme.md @@ -402,3 +402,4 @@ A small HTTP server will be spun up locally on port 8000 through which you can v This software is Copyright (c) 2014-2019 by Elasticsearch BV. This is free software, licensed under: [The Apache License Version 2.0](https://github.com/elastic/elasticsearch-net/blob/master/license.txt). + From bb514f1e2b4a11d99c62a3020d0e5af7c2b2fe3d Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Thu, 1 Apr 2021 16:40:14 +0100 Subject: [PATCH 4/4] Update test matric --- .ci/test-matrix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/test-matrix.yml b/.ci/test-matrix.yml index 36a091dc183..6aa24bf6103 100755 --- a/.ci/test-matrix.yml +++ b/.ci/test-matrix.yml @@ -1,7 +1,7 @@ --- STACK_VERSION: - - 7.x-SNAPSHOT + - 7.11-SNAPSHOT TEST_SUITE: - free