Skip to content

Fix another potential race in the file settings watcher #90302

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
Merged
merged 3 commits into from
Sep 23, 2022
Merged

Fix another potential race in the file settings watcher #90302

merged 3 commits into from
Sep 23, 2022

Conversation

@thecoop
Copy link
Member

@thecoop thecoop commented Sep 23, 2022

Fix race in the shutdown code of FileSettingsWatcher

Potential fix for #89500

@thecoop thecoop requested a review from grcevski September 23, 2022 13:19
@elasticsearchmachine elasticsearchmachine added needs:triage Requires assignment of a team area label v8.6.0 labels Sep 23, 2022
@thecoop thecoop added >bug :Core/Infra/Core Core issues without another label and removed needs:triage Requires assignment of a team area label labels Sep 23, 2022
@elasticsearchmachine elasticsearchmachine added the Team:Core/Infra Meta label for core/infra team label Sep 23, 2022
@elasticsearchmachine
Copy link
Collaborator

elasticsearchmachine commented Sep 23, 2022

Pinging @elastic/es-core-infra (Team:Core/Infra)

@elasticsearchmachine
Copy link
Collaborator

elasticsearchmachine commented Sep 23, 2022

Hi @thecoop, I've created a changelog YAML for you.

grcevski
grcevski approved these changes Sep 23, 2022
View reviewed changes
Copy link
Contributor

@grcevski grcevski left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks Simon!

@thecoop thecoop merged commit b76b968 into elastic:main Sep 23, 2022
@thecoop thecoop deleted the FileSettingsService-race branch September 23, 2022 16:03
@thecoop thecoop mentioned this pull request Sep 23, 2022
Closed
@dimitris-athanasiou
Copy link
Contributor

dimitris-athanasiou commented Sep 26, 2022

Hit a similar problem in https://gradle-enterprise.elastic.co/s/qqumxaoxabvuc/tests/:test:framework:integTest/org.elasticsearch.test.test.TestScopeClusterIT/testReproducible?top-execution=1. That was in 8.5 branch. Should we backport this in 8.5 as well?

@grcevski
Copy link
Contributor

grcevski commented Sep 26, 2022 •
edited
Loading

Hi @dimitris-athanasiou, yes it should be in 8.5 too, we should backport, all the way to 8.4.

@thecoop thecoop added auto-backport Automatically create backport pull requests when merged v8.4.0 v8.5.0 and removed auto-backport Automatically create backport pull requests when merged labels Sep 27, 2022
thecoop added a commit to thecoop/elasticsearch that referenced this pull request Sep 27, 2022
@thecoop
Fix another potential race in the file settings watcher (elastic#90302)
113fb64 
Fix another potential race in the file settings watcher for issue elastic#89500
thecoop added a commit to thecoop/elasticsearch that referenced this pull request Sep 27, 2022
@thecoop
Fix another potential race in the file settings watcher (elastic#90302)
9e41b44 
Fix another potential race in the file settings watcher for issue elastic#89500
This was referenced Sep 27, 2022
Merged
Merged
thecoop added a commit that referenced this pull request Sep 27, 2022
@thecoop
Fix another potential race in the file settings watcher (#90388)
5f55955 
Fix another potential race in the file settings watcher for issue #89500
This backports #90302
thecoop added a commit that referenced this pull request Sep 27, 2022
@thecoop
Fix another potential race in the file settings watcher (#90302)
3ab4269 
Fix another potential race in the file settings watcher for issue #89500

Backports #90302 to 8.5
lockewritesdocs pushed a commit that referenced this pull request Sep 28, 2022
[DOCS] Update changelog for #90302
cb7c063
@lockewritesdocs lockewritesdocs mentioned this pull request Sep 28, 2022
Merged
lockewritesdocs pushed a commit to slobodanadamovic/elasticsearch that referenced this pull request Sep 29, 2022
Remove release note for elastic#90302
6533c66
@lockewritesdocs lockewritesdocs mentioned this pull request Sep 29, 2022
Closed
lockewritesdocs pushed a commit that referenced this pull request Sep 29, 2022
@slobodanadamovic
[Doc] Release notes for v8.4.3 (#90443)
25a196f 
* Update docs for v8.4.3 release

* Update release highlights for 8.4.3 version.

* Update docs/reference/release-notes/8.4.3.asciidoc

Co-authored-by: Adam Locke <[email protected]>

* Update docs/reference/release-notes/8.4.3.asciidoc

Co-authored-by: Adam Locke <[email protected]>

* Update docs/reference/release-notes/highlights.asciidoc

Co-authored-by: Adam Locke <[email protected]>

* Make link external type

* Update release notes to include #90319 PR after creating BC2.

* Remove release note for #90302

* Minor grammar fix

Co-authored-by: Adam Locke <[email protected]>
lockewritesdocs pushed a commit to lockewritesdocs/elasticsearch that referenced this pull request Sep 29, 2022
@slobodanadamovic
[Doc] Release notes for v8.4.3 (elastic#90443)
264dd41 
* Update docs for v8.4.3 release

* Update release highlights for 8.4.3 version.

* Update docs/reference/release-notes/8.4.3.asciidoc

Co-authored-by: Adam Locke <[email protected]>

* Update docs/reference/release-notes/8.4.3.asciidoc

Co-authored-by: Adam Locke <[email protected]>

* Update docs/reference/release-notes/highlights.asciidoc

Co-authored-by: Adam Locke <[email protected]>

* Make link external type

* Update release notes to include elastic#90319 PR after creating BC2.

* Remove release note for elastic#90302

* Minor grammar fix

Co-authored-by: Adam Locke <[email protected]>
(cherry picked from commit 25a196f)

# Conflicts:
#	docs/reference/release-notes.asciidoc
#	docs/reference/release-notes/highlights.asciidoc
lockewritesdocs pushed a commit to lockewritesdocs/elasticsearch that referenced this pull request Sep 29, 2022
@slobodanadamovic
[Doc] Release notes for v8.4.3 (elastic#90443)
54c2c83 
* Update docs for v8.4.3 release

* Update release highlights for 8.4.3 version.

* Update docs/reference/release-notes/8.4.3.asciidoc

Co-authored-by: Adam Locke <[email protected]>

* Update docs/reference/release-notes/8.4.3.asciidoc

Co-authored-by: Adam Locke <[email protected]>

* Update docs/reference/release-notes/highlights.asciidoc

Co-authored-by: Adam Locke <[email protected]>

* Make link external type

* Update release notes to include elastic#90319 PR after creating BC2.

* Remove release note for elastic#90302

* Minor grammar fix

Co-authored-by: Adam Locke <[email protected]>
(cherry picked from commit 25a196f)

# Conflicts:
#	docs/reference/release-notes.asciidoc
#	docs/reference/release-notes/highlights.asciidoc
lockewritesdocs pushed a commit that referenced this pull request Sep 30, 2022
@slobodanadamovic
[Doc] Release notes for v8.4.3 (#90443) (#90539)
d9284db 
* Update docs for v8.4.3 release

* Update release highlights for 8.4.3 version.

* Update docs/reference/release-notes/8.4.3.asciidoc

Co-authored-by: Adam Locke <[email protected]>

* Update docs/reference/release-notes/8.4.3.asciidoc

Co-authored-by: Adam Locke <[email protected]>

* Update docs/reference/release-notes/highlights.asciidoc

Co-authored-by: Adam Locke <[email protected]>

* Make link external type

* Update release notes to include #90319 PR after creating BC2.

* Remove release note for #90302

* Minor grammar fix

Co-authored-by: Adam Locke <[email protected]>
(cherry picked from commit 25a196f)

# Conflicts:
#	docs/reference/release-notes.asciidoc
#	docs/reference/release-notes/highlights.asciidoc

Co-authored-by: Slobodan Adamović <[email protected]>
lockewritesdocs pushed a commit that referenced this pull request Sep 30, 2022
@slobodanadamovic
[Doc] Release notes for v8.4.3 (#90443) (#90538)
52feb55 
* Update docs for v8.4.3 release

* Update release highlights for 8.4.3 version.

* Update docs/reference/release-notes/8.4.3.asciidoc

Co-authored-by: Adam Locke <[email protected]>

* Update docs/reference/release-notes/8.4.3.asciidoc

Co-authored-by: Adam Locke <[email protected]>

* Update docs/reference/release-notes/highlights.asciidoc

Co-authored-by: Adam Locke <[email protected]>

* Make link external type

* Update release notes to include #90319 PR after creating BC2.

* Remove release note for #90302

* Minor grammar fix

Co-authored-by: Adam Locke <[email protected]>
(cherry picked from commit 25a196f)

# Conflicts:
#	docs/reference/release-notes.asciidoc
#	docs/reference/release-notes/highlights.asciidoc

Co-authored-by: Slobodan Adamović <[email protected]>
@csoulios csoulios added v8.5.0 and removed v8.5.1 labels Nov 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@grcevski grcevski grcevski approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

>bug :Core/Infra/Core Core issues without another label Team:Core/Infra Meta label for core/infra team v8.4.3 v8.5.0 v8.6.0

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@thecoop @elasticsearchmachine @dimitris-athanasiou @grcevski @csoulios