Skip to content

Fix memory leak in jmx bean #259

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 1 commit into from
Sep 21, 2019
Merged

Fix memory leak in jmx bean #259

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 14 additions & 7 deletions cluster/src/main/java/io/scalecube/cluster/membership/MembershipProtocolImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit;
import java.util.function.Predicate;
Expand All @@ -43,7 +44,6 @@
import reactor.core.publisher.FluxSink;
import reactor.core.publisher.Mono;
import reactor.core.publisher.MonoSink;
import reactor.core.publisher.ReplayProcessor;
import reactor.core.scheduler.Scheduler;

public final class MembershipProtocolImpl implements MembershipProtocol {
Expand Down Expand Up @@ -742,15 +742,22 @@ public static class JmxMonitorMBean extends AbstractMonitorMBean implements Moni
public static final int REMOVED_MEMBERS_HISTORY_SIZE = 42;

private final MembershipProtocolImpl membershipProtocol;
private final ReplayProcessor<MembershipEvent> removedMembersHistory;
private final List<MembershipEvent> removedMembersHistory;

private JmxMonitorMBean(MembershipProtocolImpl membershipProtocol) {
this.membershipProtocol = membershipProtocol;
this.removedMembersHistory = ReplayProcessor.create(REMOVED_MEMBERS_HISTORY_SIZE);
this.removedMembersHistory = new CopyOnWriteArrayList<>();

membershipProtocol
.listen()
.filter(MembershipEvent::isRemoved)
.subscribe(removedMembersHistory);
.subscribe(
event -> {
removedMembersHistory.add(event);
if (removedMembersHistory.size() > REMOVED_MEMBERS_HISTORY_SIZE) {
removedMembersHistory.remove(0);
}
});
}

@Override
Expand Down Expand Up @@ -782,9 +789,9 @@ public String getSuspectedMembersAsString() {

@Override
public List<String> getDeadMembers() {
List<String> deadMembers = new ArrayList<>();
removedMembersHistory.map(MembershipEvent::toString).subscribe(deadMembers::add);
return deadMembers;
return removedMembersHistory.stream()
.map(MembershipEvent::toString)
.collect(Collectors.toList());
}

@Override
Expand Down