Fix get-license test failure by ensure cluster is ready #60498
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ywangd
added
>test
ywangd
changed the title
Add assertBusy to more places where license checking can fail.
Collaborator
|
Pinging @elastic/es-security (:Security/License) |
tvernum
approved these changes
Aug 3, 2020
|
|
||
| protected boolean isGetLicenseTest() { | ||
| String testName = getTestName(); | ||
| return testName != null && (testName.contains("/get-license/") || testName.contains("\\get-license\\")); |
Contributor
There was a problem hiding this comment.
Why does this need to support \\ but ccr doesn't?
Member
Author
There was a problem hiding this comment.
My guess is that ccr tests do not run on Windows? There are other similar methods in this file, e.g. isMachineLearningTest, isTransformTest and they all check for the backslash'd variant. The CI does have machine learning specific jobs so I think they are justified.
For license check, I decided to add it because we do have multijob-windows-compatibility jobs. I am not completely sure that these jobs run the license check. But it's easy to add so I just did it.
ywangd
added a commit
to ywangd/elasticsearch
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.
ywangd
added a commit
to ywangd/elasticsearch
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.
ywangd
added a commit
to ywangd/elasticsearch
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.
ywangd
added a commit
to ywangd/elasticsearch
that referenced
this pull request
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.
This was referenced Aug 3, 2020
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
ywangd
added a commit
that referenced
this pull request
Aug 5, 2020
Fix another variant of missing license test failure similar to the cases fixed by #60498.
ywangd
added a commit
to ywangd/elasticsearch
that referenced
this pull request
Aug 5, 2020
Fix another variant of missing license test failure similar to the cases fixed by elastic#60498.
ywangd
added a commit
to ywangd/elasticsearch
that referenced
this pull request
Aug 5, 2020
Fix another variant of missing license test failure similar to the cases fixed by elastic#60498.
ywangd
added a commit
to ywangd/elasticsearch
that referenced
this pull request
Aug 5, 2020
Fix another variant of missing license test failure similar to the cases fixed by elastic#60498.
This was referenced Aug 5, 2020
ywangd
added a commit
that referenced
this pull request
Aug 5, 2020
ywangd
added a commit
that referenced
this pull request
Aug 5, 2020
ywangd
added a commit
that referenced
this pull request
Aug 5, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When a new cluster starts, the HTTP layer become ready to accept incoming requests while the basic license is still being generated in the background. When a get license request comes in before the license is ready, it can get
404error. This PR fixes it by either: ensure the cluster is ready before issue the license request or wrap the license request in assertBusy.Resolves: #59157
Resolves: #60468
Resolves: #60519