Skip to content

Backport PR #16349 to 8.15: fix line used to determine ES is up#16350

Merged
jsvd merged 1 commit into8.15from
backport_16349_8.15
Aug 8, 2024
Merged

Backport PR #16349 to 8.15: fix line used to determine ES is up#16350
jsvd merged 1 commit into8.15from
backport_16349_8.15

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

Backport PR #16349 to 8.15 branch, original message:


Before we waited for the condition /license.*valid/, that matched:

[2024-07-24T15:03:23,157][INFO ][o.e.l.ClusterStateLicenseService] [arkham.local] license [8a5c66ef-1863-4d24-845a-339d8ad755a5] mode [basic] - valid

But now it can match:

[2024-07-24T15:03:16,331][INFO ][o.e.f.FeatureService     ] [arkham.local] Registered local node features [data_stream.auto_sharding, data_stream.lifecycle.global_retention, data_stream.rollover.lazy, desired_node.version_deprecated, esql.agg_values, esql.async_query, esql.base64_decode_encode, esql.casting_operator, esql.counter_types, esql.disable_nullable_opts, esql.from_options, esql.metadata_fields, esql.metrics_counter_fields, esql.metrics_syntax, esql.mv_ordering_sorted_ascending, esql.mv_sort, esql.resolve_fields_api, esql.spatial_points_from_source, esql.spatial_shapes, esql.st_centroid_agg, esql.st_contains_within, esql.st_disjoint, esql.st_intersects, esql.st_x_y, esql.string_literal_auto_casting, esql.string_literal_auto_casting_extended, esql.timespan_abbreviations, features_supported, file_settings, geoip.downloader.database.configuration, health.dsl.info, health.extended_repository_indicator, knn_retriever_supported, license-trial-independent-version, mapper.index_sorting_on_nested, mapper.keyword_dimension_ignore_above, mapper.pass_through_priority, mapper.query_index_mode, mapper.range.null_values_off_by_one_fix, mapper.segment_level_fields_stats, mapper.source.synthetic_source_fallback, mapper.track_ignored_source, mapper.vectors.bit_vectors, mapper.vectors.int4_quantization, rest.capabilities_action, retrievers_supported, rrf_retriever_supported, script.hamming, search.vectors.k_param_supported, security.migration_framework, security.roles_metadata_flattened, simulate.mapping.validation, standard_retriever_supported, stats.include_disk_thresholds, text_similarity_reranker_retriever_supported, unified_highlighter_matched_fields, usage.data_tiers.precalculate_stats]
[2024-07-24T15:03:23,157][INFO ][o.e.l.ClusterStateLicenseService] [arkham.local] license [8a5c66ef-1863-4d24-845a-339d8ad755a5] mode [basic] - valid

The first entry happens much sooner, so the tests start before ES is ready.
This PR ensure the line we expect, from ClusterStateLicenseService, happens before the tests begin.

The change lines up with https://github.com/elastic/elasticsearch/pull/110606/files#diff-97ba6f4f3881131b999ea982aa5ab22b31bad9eaf7aa1d14beda660309ae60b7R47

@elastic-sonarqube
Copy link
Copy Markdown

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

@elasticmachine
Copy link
Copy Markdown

💚 Build Succeeded

Copy link
Copy Markdown
Member

@jsvd jsvd left a comment

Choose a reason for hiding this comment

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

LGTM

@jsvd jsvd merged commit 3086aab into 8.15 Aug 8, 2024
@jsvd jsvd deleted the backport_16349_8.15 branch August 8, 2024 08:57
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.

2 participants