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.

Sign up for GitHub

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

Jump to bottom

ES backport: fix test #13047

Merged
merged 2 commits into from Sep 17, 2022
Merged

ES backport: fix test #13047

merged 2 commits into from Sep 17, 2022

Conversation

matriv
Copy link
Contributor

@matriv matriv commented Sep 16, 2022

Summary of the changes / Why this improves CrateDB

See commit messages

Follows: 208fc2b

Checklist

  • Added an entry in CHANGES.txt for user facing changes
  • Updated documentation & sql_features table for user facing changes
  • Touched code is covered by tests
  • CLA is signed
  • This does not contain breaking changes, or if it does:
    • It is released within a major release
    • It is recorded in CHANGES.txt
    • It was marked as deprecated in an earlier release if possible
    • You've thought about the consequences and other components are adapted
      (E.g. AdminUI)

@matriv
bp: Fix exception check in RecoveryRequestTrackerTests
91e1db9 
Currently we check that exceptions are the same in the recovery request
tracker test. This is inconsistent because the future wraps the
exception in a new instance. This commit fixes the test by comparing a
random exception message.

elastic/elasticsearch@9eaee3d
@matriv
bp: Fix race in RecoveryRequestTrackerTests
386d990 
Currently in the recovery request tracker tests we place the futures
into the future map on the GENERIC thread. It is possible that the test
has already advanced past the point where we block on these futures
before they are placed in the map. This introduces other potential
failures as we expect all futures have been completed. This commit fixes
the test by places the futures in the map prior to dispatching.

elastic/elasticsearch@b1c3ad8
@matriv matriv changed the title ES backport fixes ES backport: fix test Sep 16, 2022
@matriv
Copy link
Contributor Author

matriv commented Sep 16, 2022

retest this please

@matriv matriv added the ready-to-merge Let Mergify merge the PR once approved and checks pass label Sep 17, 2022
@mergify mergify bot merged commit a3eb7f0 into master Sep 17, 2022
@mergify mergify bot deleted the mt/es-backports-fixes branch September 17, 2022 03:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mfussenegger mfussenegger mfussenegger approved these changes

Assignees
No one assigned
Labels
ready-to-merge Let Mergify merge the PR once approved and checks pass
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@matriv @mfussenegger