Skip to content

Conversation

@ywangd
Copy link
Member

@ywangd ywangd commented Aug 3, 2020

This is a follow up for #60498 to ensure an AssertionError is throw when the license is ready.
The client throws a ResponseException for 404 status code. It needs to be converted to an AssertionError to correctly work with assertBusy.

@ywangd ywangd added >test Issues or PRs that are addressing/adding tests :Security/License License functionality for commercial features v8.0.0 v7.8.2 v7.10.0 v7.9.1 labels Aug 3, 2020
@ywangd ywangd requested a review from tvernum August 3, 2020 06:08
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-security (:Security/License)

@elasticmachine elasticmachine added the Team:Security Meta label for security team label Aug 3, 2020
@ywangd
Copy link
Member Author

ywangd commented Aug 3, 2020

@tvernum I just realised that #60498 will not work properly without converting ResponseException to AssertionError. I had it in one place but somehow missed for the other two. This PR addresses it. Sorry for the inconvenience.

Sicne the backports have not been merged for #60498 yet. I am going to combine the backports into a single one for both this PR and #60498.

@ywangd ywangd merged commit 22f2978 into elastic:master Aug 3, 2020
ywangd added a commit to ywangd/elasticsearch that referenced this pull request Aug 3, 2020
…lastic#60573)

This is a follow up for elastic#60498 to ensure an AssertionError is throw when the license is ready.
The client throws a ResponseException for 404 status code. It needs to be converted to an AssertionError to correctly work with assertBusy.
ywangd added a commit to ywangd/elasticsearch that referenced this pull request Aug 3, 2020
…lastic#60573)

This is a follow up for elastic#60498 to ensure an AssertionError is throw when the license is ready.
The client throws a ResponseException for 404 status code. It needs to be converted to an AssertionError to correctly work with assertBusy.
ywangd added a commit to ywangd/elasticsearch that referenced this pull request Aug 3, 2020
…lastic#60573)

This is a follow up for elastic#60498 to ensure an AssertionError is throw when the license is ready.
The client throws a ResponseException for 404 status code. It needs to be converted to an AssertionError to correctly work with assertBusy.
ywangd added a commit that referenced this pull request Aug 3, 2020
)

When a new cluster starts, the HTTP layer becomes ready to accept incoming 
requests while the basic license is still being populated in the background. 
When a get license request comes in before the license is ready, it can get 
404 error. This PR fixes it by either wrap the license check in assertBusy or 
ensure the license is ready before perform the check.

This is a backport for both #60498 and #60573
ywangd added a commit that referenced this pull request Aug 3, 2020
)

When a new cluster starts, the HTTP layer becomes ready to accept incoming 
requests while the basic license is still being populated in the background. 
When a get license request comes in before the license is ready, it can get 
404 error. This PR fixes it by either wrap the license check in assertBusy or 
ensure the license is ready before perform the check.

This is a backport for both #60498 and #60573
ywangd added a commit that referenced this pull request Aug 3, 2020
)

When a new cluster starts, the HTTP layer becomes ready to accept incoming 
requests while the basic license is still being populated in the background. 
When a get license request comes in before the license is ready, it can get 
404 error. This PR fixes it by either wrap the license check in assertBusy or 
ensure the license is ready before perform the check.

This is a backport for both #60498 and #60573
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

:Security/License License functionality for commercial features Team:Security Meta label for security team >test Issues or PRs that are addressing/adding tests v7.8.2 v7.9.1 v7.10.0 v8.0.0-alpha1

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants