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

Wait 3 seconds for the server to reload trust #79778

Merged
merged 1 commit into from
Oct 28, 2021

Conversation

tvernum
Copy link
Contributor

@tvernum tvernum commented Oct 26, 2021

Sometimes the final session seems to fail because it is still using
the old trust configuration. This commit adds an assertBusy to give it
time to settle.

Resolves: #77024

Sometimes the final session seems to fail because it is still using
the old trust configuration. This commit adds an assertBusy to give it
time to settle.

Resolves: elastic#77024
@tvernum tvernum added >test Issues or PRs that are addressing/adding tests :Security/Authentication Logging in, Usernames/passwords, Realms (Native/LDAP/AD/SAML/PKI/etc) :Security/TLS SSL/TLS, Certificates v8.0.0 v7.15.2 v7.16.1 labels Oct 26, 2021
@tvernum tvernum requested a review from ywangd October 26, 2021 05:02
@elasticmachine elasticmachine added the Team:Security Meta label for security team label Oct 26, 2021
@elasticmachine
Copy link
Collaborator

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

@tvernum tvernum added the auto-backport-and-merge Automatically create backport pull requests and merge when ready label Oct 26, 2021
Copy link
Member

@ywangd ywangd left a comment

Choose a reason for hiding this comment

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

LGTM

@tvernum tvernum merged commit 6c90ab8 into elastic:master Oct 28, 2021
tvernum added a commit to tvernum/elasticsearch that referenced this pull request Oct 28, 2021
Sometimes the final session seems to fail because it is still using
the old trust configuration. This commit adds an assertBusy to give it
time to settle.

Resolves: elastic#77024
tvernum added a commit to tvernum/elasticsearch that referenced this pull request Oct 28, 2021
Sometimes the final session seems to fail because it is still using
the old trust configuration. This commit adds an assertBusy to give it
time to settle.

Resolves: elastic#77024
tvernum added a commit to tvernum/elasticsearch that referenced this pull request Oct 28, 2021
Sometimes the final session seems to fail because it is still using
the old trust configuration. This commit adds an assertBusy to give it
time to settle.

Resolves: elastic#77024
@elasticsearchmachine
Copy link
Collaborator

💚 Backport successful

Status Branch Result
8.0
7.15
7.16

elasticsearchmachine pushed a commit that referenced this pull request Oct 28, 2021
Sometimes the final session seems to fail because it is still using
the old trust configuration. This commit adds an assertBusy to give it
time to settle.

Resolves: #77024
elasticsearchmachine pushed a commit that referenced this pull request Oct 28, 2021
Sometimes the final session seems to fail because it is still using
the old trust configuration. This commit adds an assertBusy to give it
time to settle.

Resolves: #77024
elasticsearchmachine pushed a commit that referenced this pull request Oct 28, 2021
Sometimes the final session seems to fail because it is still using
the old trust configuration. This commit adds an assertBusy to give it
time to settle.

Resolves: #77024
weizijun added a commit to weizijun/elasticsearch that referenced this pull request Oct 28, 2021
…formance

* upstream/master: (153 commits)
  [ML] update truncation default & adding field output when input is truncated (elastic#79942)
  [ML] stop using isAllowedByLicense for model license checks (elastic#79908)
  [ML] Retain built-in ML roles granting Kibana privileges (elastic#80014)
  [Transform] remove old mixed cluster BWC layers, not required for 8x (elastic#79927)
  Increase test timeout for CoordinatorTests testAllSearchesExecuted
  [Transform] add rolling upgrade tests for upgrade endpoint (elastic#79721)
  [ML] Update trained model docs for truncate parameter for bert tokenization (elastic#79652)
  `CoordinatorTests` sometimes needs three term bumps (elastic#79574)
  [ML] Account for service being triggered twice in tests (elastic#80000)
  SearchContext: remove unused variable (elastic#79917)
  Revert "Deprecate resolution loss on date field (elastic#78921)" (elastic#79914)
  Re-enable GeoIpDownloaderIT#testStartWithNoDatabases() (elastic#79907)
  Fix SnapshotBasedIndexRecoveryIT#testSeqNoBasedRecoveryIsUsedAfterPrimaryFailOver (elastic#79469)
  Fix RecoverySourceHandlerTests (elastic#79546)
  SQL: stabilize SqlSearchPageTimeoutIT (elastic#79928)
  Wait 3 seconds for the server to reload trust (elastic#79778)
  Skip automatically preserved request headers when rewriting (elastic#79973)
  Check whether stdout is a real console (elastic#79882)
  Convert remote license checker to use LicensedFeature (elastic#79876)
  Miscellaneous fixes for LDAP SDK v6 upgrade (elastic#79891)
  ...

# Conflicts:
#	libs/x-content/src/main/java/org/elasticsearch/xcontent/support/filtering/FilterPath.java
#	libs/x-content/src/test/java/org/elasticsearch/xcontent/support/filtering/FilterPathGeneratorFilteringTests.java
#	libs/x-content/src/test/java/org/elasticsearch/xcontent/support/filtering/FilterPathTests.java
@danhermann danhermann added v7.16.0 and removed v7.16.1 labels Nov 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-backport-and-merge Automatically create backport pull requests and merge when ready :Security/Authentication Logging in, Usernames/passwords, Realms (Native/LDAP/AD/SAML/PKI/etc) :Security/TLS SSL/TLS, Certificates Team:Security Meta label for security team >test Issues or PRs that are addressing/adding tests v7.15.2 v7.16.0 v8.0.0-beta1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[CI] LdapSessionFactoryTests testSslTrustIsReloaded failing
6 participants