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

don't clean thread locals explicitly, let GC clean them

This commit is contained in:
kimchy 2010-06-12 12:45:38 +03:00
parent 288aa36a39
commit 2daa54a2bb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/elasticsearch/src/main/java/org/elasticsearch/monitor/memory/alpha/AlphaMemoryMonitor.java
View File

@ -25,7 +25,6 @@ import org.elasticsearch.monitor.memory.MemoryMonitor;
import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.util.SizeUnit; import org.elasticsearch.util.SizeUnit;
import org.elasticsearch.util.SizeValue; import org.elasticsearch.util.SizeValue;
import org.elasticsearch.util.ThreadLocals;
import org.elasticsearch.util.TimeValue; import org.elasticsearch.util.TimeValue;
import org.elasticsearch.util.component.AbstractLifecycleComponent; import org.elasticsearch.util.component.AbstractLifecycleComponent;
import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.inject.Inject;
@ -177,7 +176,8 @@ public class AlphaMemoryMonitor extends AbstractLifecycleComponent<MemoryMonitor
indicesMemoryCleaner.cacheClear(); indicesMemoryCleaner.cacheClear();
// TODO this ends up doing a flush with "true", basically, at the end, replacing the IndexWriter, might not be needed with Lucene 3.0.2. // TODO this ends up doing a flush with "true", basically, at the end, replacing the IndexWriter, might not be needed with Lucene 3.0.2.
indicesMemoryCleaner.fullMemoryClean(); indicesMemoryCleaner.fullMemoryClean();
ThreadLocals.clearReferencesThreadLocals(); // don't clean thread locals, let GC clean them (so we won't run into visibility issues)
// ThreadLocals.clearReferencesThreadLocals();
fullCounter = 0; fullCounter = 0;
} else { } else {
long totalClean = totalCleans.incrementAndGet(); long totalClean = totalCleans.incrementAndGet();