Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix parsing of node shutdown allocation delay #76589

Merged
merged 4 commits into from
Aug 17, 2021

Conversation

gwbrown
Copy link
Contributor

@gwbrown gwbrown commented Aug 17, 2021

This commit fixes the parsing of allocation delay from XContent, which
was previously completely broken. Also adjusts the tests to exercise
that parsing.

Follow-up to #75606

This commit fixes the parsing of allocation delay from XContent, which
was previously completely broken. Also adjusts the tests to exercise
that parsing.
@gwbrown gwbrown added >non-issue v8.0.0 :Core/Infra/Node Lifecycle Node startup, bootstrapping, and shutdown auto-backport Automatically create backport pull requests when merged v7.15.0 labels Aug 17, 2021
@gwbrown gwbrown requested a review from dakrone August 17, 2021 00:10
@elasticmachine elasticmachine added the Team:Core/Infra Meta label for core/infra team label Aug 17, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-core-infra (Team:Core/Infra)

Copy link
Member

@dakrone dakrone left a comment

Choose a reason for hiding this comment

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

LGTM, left one really minor comment

nodeId,
SingleNodeShutdownMetadata.Type.parse((String) a[0]),
(String) a[1],
a[2] != null ? TimeValue.parseTimeValue((String) a[2], "put-shutdown-node-request-" + nodeId) : null
Copy link
Member

Choose a reason for hiding this comment

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

Super minor nit to avoid double negatives:

Suggested change
a[2] != null ? TimeValue.parseTimeValue((String) a[2], "put-shutdown-node-request-" + nodeId) : null
a[2] == null ? null : TimeValue.parseTimeValue((String) a[2], "put-shutdown-node-request-" + nodeId)

@gwbrown gwbrown merged commit 8baa753 into elastic:master Aug 17, 2021
gwbrown added a commit to gwbrown/elasticsearch that referenced this pull request Aug 17, 2021
This commit fixes the parsing of allocation delay from XContent, which
was previously completely broken. Also adjusts the tests to exercise
that parsing.
@elasticsearchmachine
Copy link
Collaborator

💚 Backport successful

Status Branch Result
7.x

elasticsearchmachine pushed a commit that referenced this pull request Aug 18, 2021
This commit fixes the parsing of allocation delay from XContent, which
was previously completely broken. Also adjusts the tests to exercise
that parsing.

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-backport Automatically create backport pull requests when merged :Core/Infra/Node Lifecycle Node startup, bootstrapping, and shutdown >non-issue Team:Core/Infra Meta label for core/infra team v7.15.0 v8.0.0-alpha2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants