Skip to content

Conversation

@imotov
Copy link
Contributor

@imotov imotov commented Jun 23, 2017

Adds additional logging and fixes a race condition in the test that otherwise can timeout waiting for cluster state update. It also fixes a possible NPE when a master node leaves the cluster and no other node can be elected as the master (this doesn't affect the test but causes unnecessary noise in the log file).

Relates to #25382

@imotov imotov added :Upgrade API >test Issues or PRs that are addressing/adding tests >upgrade labels Jun 23, 2017
@imotov imotov requested a review from abeyad June 23, 2017 20:57
Copy link

@abeyad abeyad left a comment

Choose a reason for hiding this comment

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

LGTM

@imotov imotov merged commit 79a8336 into elastic:master Jun 23, 2017
jasontedor added a commit to jasontedor/elasticsearch that referenced this pull request Jun 26, 2017
* master:
  Move more token filters to analysis-common module
  Test: Allow merging mock secure settings (elastic#25387)
  Remove remaining `index.mapper.single_type` setting usage from tests (elastic#25388)
  Remove dead logger prefix code
  Tests: Improve stability and logging of TemplateUpgradeServiceIT tests (elastic#25386)
  Remove `index.mapping.single_type=false` from reindex tests (elastic#25365)
  Adapt `SearchIT#testSearchWithParentJoin` to new join field (elastic#25379)
  Added unit test coverage for SignificantTerms (elastic#24904)
@imotov imotov deleted the issue-25382-improve-template-upgrade-logging branch May 1, 2020 22:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

>test Issues or PRs that are addressing/adding tests >upgrade v5.6.0 v6.0.0-beta1

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants