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 RecoverySourceHandlerTests #79546

Merged
merged 3 commits into from
Oct 28, 2021

Conversation

fcofdez
Copy link
Contributor

@fcofdez fcofdez commented Oct 20, 2021

Today RecoverySourceHandlerTests#generateFiles can generate files with
different name but same content since the lengths that we use for tests
are small. In order to avoid tripping assertions when we check that two
files are different we should check that the name is different as well
as the content are different.

Closes #79502

Today RecoverySourceHandlerTests#generateFiles can generate files with
different name but same content since the lengths that we use for tests
are small. In order to avoid tripping assertions when we check that two
files are different we should check that the name is different as well
as the content are different.

Closes elastic#79502
@fcofdez fcofdez added >test Issues or PRs that are addressing/adding tests :Distributed Indexing/Recovery Anything around constructing a new shard, either from a local or a remote source. v8.0.0 Team:Distributed (Obsolete) Meta label for distributed team (obsolete). Replaced by Distributed Indexing/Coordination. v7.16.0 labels Oct 20, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-distributed (Team:Distributed)

@fcofdez
Copy link
Contributor Author

fcofdez commented Oct 20, 2021

@elasticmachine run elasticsearch-ci/part-2

@danhermann danhermann added v8.1.0 and removed v7.16.0 labels Oct 27, 2021
Copy link
Contributor

@arteam arteam left a comment

Choose a reason for hiding this comment

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

LGTM!

@fcofdez
Copy link
Contributor Author

fcofdez commented Oct 27, 2021

@elasticmachine update branch

@fcofdez
Copy link
Contributor Author

fcofdez commented Oct 28, 2021

@elasticmachine update branch

@fcofdez fcofdez added auto-backport Automatically create backport pull requests when merged v7.16.0 v8.0.0-beta1 and removed v7.16.1 v8.0.0 labels Oct 28, 2021
@fcofdez fcofdez merged commit f8838aa into elastic:master Oct 28, 2021
@fcofdez
Copy link
Contributor Author

fcofdez commented Oct 28, 2021

Thanks Artem!

fcofdez added a commit to fcofdez/elasticsearch that referenced this pull request Oct 28, 2021
Today RecoverySourceHandlerTests#generateFiles can generate files with
different name but same content since the lengths that we use for tests
are small. In order to avoid tripping assertions when we check that two
files are different we should check that the name is different as well
as the content are different.

Closes elastic#79502
fcofdez added a commit to fcofdez/elasticsearch that referenced this pull request Oct 28, 2021
Today RecoverySourceHandlerTests#generateFiles can generate files with
different name but same content since the lengths that we use for tests
are small. In order to avoid tripping assertions when we check that two
files are different we should check that the name is different as well
as the content are different.

Closes elastic#79502
@elasticsearchmachine
Copy link
Collaborator

💚 Backport successful

Status Branch Result
7.16
8.0

fcofdez added a commit that referenced this pull request Oct 28, 2021
Today RecoverySourceHandlerTests#generateFiles can generate files with
different name but same content since the lengths that we use for tests
are small. In order to avoid tripping assertions when we check that two
files are different we should check that the name is different as well
as the content are different.

Closes #79502
Backport of #79546
fcofdez added a commit that referenced this pull request Oct 28, 2021
Today RecoverySourceHandlerTests#generateFiles can generate files with
different name but same content since the lengths that we use for tests
are small. In order to avoid tripping assertions when we check that two
files are different we should check that the name is different as well
as the content are different.

Closes #79502
Backport of #79546
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
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 :Distributed Indexing/Recovery Anything around constructing a new shard, either from a local or a remote source. Team:Distributed (Obsolete) Meta label for distributed team (obsolete). Replaced by Distributed Indexing/Coordination. >test Issues or PRs that are addressing/adding tests v7.16.0 v8.0.0-beta1 v8.1.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[CI] RecoverySourceHandlerTests testSeqNoBasedRecoveryRecoversFromFallbackPlanAfterAFailure failing
5 participants