Fix SearchResponse leaks in searchable snapshot test and production code #103118
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It's in the title. Fix all the tests like we have everywhere else. Fix the production use of SearchResponse in BlobStoreCacheMaintenanceService by properly ref-counting the response it holds on to.
original-brownbear
added
>non-issue
:Distributed/Snapshot/Restore
78 tasks
|
Pinging @elastic/es-distributed (Team:Distributed) |
|
@elasticmachine update branch |
| @@ -679,6 +689,16 @@ public void onFailure(Exception e) { | |||
| } | |||
| } | |||
| } | |||
|
|
|||
| private void setCurrentResponse(SearchResponse response) { | |||
There was a problem hiding this comment.
- There's no massive changes in this method, I just extracted 2 methods to keep the indent level under control now that we need a loop to have correct thread-safety around the response reference.
- I'm not sure this is the solution we want long-term. It might be better to just copy this kind of retained response to heap if it lives for an extended period of time compared to burdening the Netty buffer pool. Since it doesn't matter too much here, I decided to just handle this the straight forward way for now and not add a new API for that just yet.
DaveCTurner
reviewed
Dec 10, 2023
...org/elasticsearch/xpack/searchablesnapshots/cache/blob/BlobStoreCacheMaintenanceService.java
Outdated
Show resolved
Hide resolved
| @@ -417,7 +417,7 @@ private class PeriodicMaintenanceTask implements Runnable, Releasable { | |||
|
|
|||
| private volatile Map<String, Set<String>> existingSnapshots; | |||
| private volatile Set<String> existingRepositories; | |||
| private volatile SearchResponse searchResponse; | |||
| private final AtomicReference<SearchResponse> searchResponse = new AtomicReference<>(); | |||
There was a problem hiding this comment.
AFAICT this is all effectively single-threaded, so I'm not sure we need the extra protection that using getAndSet() gives us.
Also I'm pretty sure we don't need to retain the search response at all, we're really converting it directly into a bulk delete request as soon as we receive it. This run() method is doing too much.
Anyway nbd for now but would you open an issue to track this tech debt?
There was a problem hiding this comment.
#103245 there we go
…arch/xpack/searchablesnapshots/cache/blob/BlobStoreCacheMaintenanceService.java Co-authored-by: David Turner <david.turner@elastic.co>
|
Thanks David! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It's in the title. Fix all the tests like we have everywhere else. Fix the production use of SearchResponse in
BlobStoreCacheMaintenanceService by properly ref-counting the response it holds on to.
For #102030