Skip to content

Fix test memory leak #88362

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

Merged
merged 6 commits into from
Jul 12, 2022
Merged

Fix test memory leak #88362

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a81c683
Fix memory leak
Jul 8, 2022
158d0db
Remove static requirement
Jul 8, 2022
12807d5
Better naming
Jul 8, 2022
28f3828
Simplify with 1:1 mapping
Jul 8, 2022
11b4f95
Use our createExtensions SPI
Jul 11, 2022
260db95
Remove unused code
Jul 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions ...lugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/ILMImmutableStateHandlerProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,22 @@
import org.elasticsearch.immutablestate.ImmutableClusterStateHandler;
import org.elasticsearch.immutablestate.ImmutableClusterStateHandlerProvider;

import java.util.Arrays;
import java.util.Collection;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.Collections;
import java.util.List;

/**
* ILM Provider implementation for the {@link ImmutableClusterStateHandlerProvider} service interface
*/
public class ILMImmutableStateHandlerProvider implements ImmutableClusterStateHandlerProvider {
private static final Set<ImmutableClusterStateHandler<?>> handlers = ConcurrentHashMap.newKeySet();
private static volatile Collection<ImmutableClusterStateHandler<?>> handlers = Collections.emptyList();
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
private static volatile Collection<ImmutableClusterStateHandler<?>> handlers = Collections.emptyList();
private static final SetOnce<Collection<ImmutableClusterStateHandler<?>>> handlers = new SetOnce<>();

I wonder if this should be a SetOnce<Collection<ImmutableClusterStateHandler<?>>>, then when registerHandlers is called trySet() can be used to atomically update the collection?


@Override
public Collection<ImmutableClusterStateHandler<?>> handlers() {
return handlers;
}

public static void registerHandlers(ImmutableClusterStateHandler<?>... stateHandlers) {
handlers.addAll(Arrays.asList(stateHandlers));
handlers = List.of(stateHandlers);
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
handlers = List.of(stateHandlers);
handlers.trySet(List.of(stateHandlers));

Since this completely changes the stored values, it may be good to rename registerHandlers to better indicate that it won't set the values if they are already set.

}
}