Skip to content

fix: CacheManager memory leak by reusing InheritableThreadLocal (#6730) #6732

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

Closed
mmustafasenoglu wants to merge 1 commit into from
+11 −10
Closed

fix: CacheManager memory leak by reusing InheritableThreadLocal (#6730) #6732

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: 11 additions & 10 deletions src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,16 @@ public class CacheManager extends ConfigTestElement implements TestStateListener
public static final String MAX_SIZE = "maxSize"; // $NON-NLS-1$
//-

private transient InheritableThreadLocal<Cache<String, CacheEntry>> threadCache;
@SuppressWarnings("ThreadLocalUsage") // intentionally using InheritableThreadLocal for per-thread cache
private final transient InheritableThreadLocal<Cache<String, CacheEntry>> threadCache =
new InheritableThreadLocal<Cache<String, CacheEntry>>(){
@Override
protected Cache<String, CacheEntry> initialValue() {
return Caffeine.newBuilder()
.maximumSize(getMaxSize())
.build();
}
};

private transient boolean useExpires; // Cached value

Expand Down Expand Up @@ -602,15 +611,7 @@ public void clear(){

private void clearCache() {
log.debug("Clear cache");
// TODO: avoid re-creating the thread local every time, reset its contents instead
threadCache = new InheritableThreadLocal<Cache<String, CacheEntry>>(){
@Override
protected Cache<String, CacheEntry> initialValue() {
return Caffeine.newBuilder()
.maximumSize(getMaxSize())
.build();
}
};
threadCache.remove();
}

/**
Expand Down