honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix mem leak in NodeStatsCollector 

Instead of injecting a provider for `DiskThresholdDecider` we now inject the `DiskThresholdDecider` directly.

Original commit: elastic/x-pack-elasticsearch@9aeacbee24
This commit is contained in:
uboness 2015-10-21 18:17:25 +02:00
parent 93065acf59
commit e9b35af03f
2 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
marvel/src/main/java/org/elasticsearch/marvel/agent/collector/node/NodeStatsCollector.java
View File

@ -10,10 +10,7 @@ import org.elasticsearch.action.admin.cluster.node.stats.NodeStats;
import org.elasticsearch.bootstrap.BootstrapInfo;
import org.elasticsearch.cluster.ClusterService;
import org.elasticsearch.cluster.routing.allocation.decider.DiskThresholdDecider;
import org.elasticsearch.common.inject.ConfigurationException;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.inject.Provider;
import org.elasticsearch.common.inject.ProvisionException;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.discovery.DiscoveryService;
import org.elasticsearch.env.NodeEnvironment;
@ -43,19 +40,17 @@ public class NodeStatsCollector extends AbstractCollector<NodeStatsCollector> {
private final DiscoveryService discoveryService;
private final NodeEnvironment nodeEnvironment;
// Use a provider in order to avoid Guice circular injection
// issues because AllocationDecider is not an interface and cannot be proxied
private final Provider<DiskThresholdDecider> diskThresholdDeciderProvider;
private final DiskThresholdDecider diskThresholdDecider;
@Inject
public NodeStatsCollector(Settings settings, ClusterService clusterService, MarvelSettings marvelSettings, MarvelLicensee marvelLicensee,
NodeService nodeService, DiscoveryService discoveryService, NodeEnvironment nodeEnvironment,
Provider<DiskThresholdDecider> diskThresholdDeciderProvider) {
DiskThresholdDecider diskThresholdDecider) {
super(settings, NAME, clusterService, marvelSettings, marvelLicensee);
this.nodeService = nodeService;
this.discoveryService = discoveryService;
this.nodeEnvironment = nodeEnvironment;
this.diskThresholdDeciderProvider = diskThresholdDeciderProvider;
this.diskThresholdDecider = diskThresholdDecider;
}
@Override
@ -69,13 +64,6 @@ public class NodeStatsCollector extends AbstractCollector<NodeStatsCollector> {
NodeStats nodeStats = nodeService.stats();
DiskThresholdDecider diskThresholdDecider = null;
try {
diskThresholdDecider = diskThresholdDeciderProvider.get();
} catch (ProvisionException | ConfigurationException e) {
logger.warn("unable to retrieve disk threshold decider information", e);
}
// Here we are calling directly the DiskThresholdDecider to retrieve the high watermark value
// It would be nicer to use a settings API like documented in #6732
Double diskThresholdWatermarkHigh = (diskThresholdDecider != null) ? 100.0 - diskThresholdDecider.getFreeDiskThresholdHigh() : -1;

8
marvel/src/test/java/org/elasticsearch/marvel/agent/collector/node/NodeStatsCollectorTests.java
View File

@ -8,7 +8,6 @@ package org.elasticsearch.marvel.agent.collector.node;
import org.elasticsearch.bootstrap.BootstrapInfo;
import org.elasticsearch.cluster.ClusterService;
import org.elasticsearch.cluster.routing.allocation.decider.DiskThresholdDecider;
import org.elasticsearch.common.inject.Provider;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.discovery.DiscoveryService;
import org.elasticsearch.env.NodeEnvironment;
@ -95,11 +94,6 @@ public class NodeStatsCollectorTests extends AbstractCollectorTestCase {
internalCluster().getInstance(NodeService.class, nodeId),
internalCluster().getInstance(DiscoveryService.class, nodeId),
internalCluster().getInstance(NodeEnvironment.class, nodeId),
new Provider<DiskThresholdDecider>() {
@Override
public DiskThresholdDecider get() {
return internalCluster().getInstance(DiskThresholdDecider.class, nodeId);
}
});
internalCluster().getInstance(DiskThresholdDecider.class, nodeId));
}
}