allow CacheRecycler to be cleared via the REST API

src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java

@@ -34,9 +34,11 @@ public class ClearIndicesCacheRequest extends BroadcastOperationRequest<ClearInd
     private boolean filterCache = false;
     private boolean fieldDataCache = false;
     private boolean idCache = false;
+    private boolean recycler = false;
     private String[] fields = null;
     private String[] filterKeys = null;
     
+
     ClearIndicesCacheRequest() {
     }
 
@@ -86,6 +88,15 @@ public class ClearIndicesCacheRequest extends BroadcastOperationRequest<ClearInd
         return this.idCache;
     }
     
+    public ClearIndicesCacheRequest recycler(boolean recycler) {
+        this.recycler = recycler;
+        return this;
+    }
+    
+    public boolean recycler() {
+        return this.recycler;
+    }
+
     public ClearIndicesCacheRequest idCache(boolean idCache) {
         this.idCache = idCache;
         return this;
@@ -96,6 +107,7 @@ public class ClearIndicesCacheRequest extends BroadcastOperationRequest<ClearInd
         filterCache = in.readBoolean();
         fieldDataCache = in.readBoolean();
         idCache = in.readBoolean();
+        recycler = in.readBoolean();
         fields = in.readStringArray();
         filterKeys = in.readStringArray();
     }
@@ -105,7 +117,10 @@ public class ClearIndicesCacheRequest extends BroadcastOperationRequest<ClearInd
         out.writeBoolean(filterCache);
         out.writeBoolean(fieldDataCache);
         out.writeBoolean(idCache);
+        out.writeBoolean(recycler);
         out.writeStringArrayNullable(fields);
         out.writeStringArrayNullable(filterKeys);
     }
+
+   
 }

src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheRequest.java

@@ -33,6 +33,8 @@ class ShardClearIndicesCacheRequest extends BroadcastShardOperationRequest {
     private boolean filterCache = false;
     private boolean fieldDataCache = false;
     private boolean idCache = false;
+    private boolean recycler;
+
     private String[] fields = null;
     private String[] filterKeys = null;
 
@@ -46,6 +48,7 @@ class ShardClearIndicesCacheRequest extends BroadcastShardOperationRequest {
         idCache = request.idCache();
         fields = request.fields();
         filterKeys = request.filterKeys();
+        recycler = request.recycler();
     }
 
     public boolean filterCache() {
@@ -60,6 +63,10 @@ class ShardClearIndicesCacheRequest extends BroadcastShardOperationRequest {
         return this.idCache;
     }
     
+    public boolean recycler() {
+        return this.recycler;
+    }
+
     public String[] fields() {
         return this.fields;
     }
@@ -79,6 +86,7 @@ class ShardClearIndicesCacheRequest extends BroadcastShardOperationRequest {
         filterCache = in.readBoolean();
         fieldDataCache = in.readBoolean();
         idCache = in.readBoolean();
+        recycler = in.readBoolean();
         fields = in.readStringArray();
         filterKeys = in.readStringArray();
     }
@@ -89,6 +97,7 @@ class ShardClearIndicesCacheRequest extends BroadcastShardOperationRequest {
         out.writeBoolean(filterCache);
         out.writeBoolean(fieldDataCache);
         out.writeBoolean(idCache);
+        out.writeBoolean(recycler);
         out.writeStringArrayNullable(fields);
         out.writeStringArrayNullable(filterKeys);
     }

src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java

@@ -30,6 +30,7 @@ import org.elasticsearch.cluster.block.ClusterBlockException;
 import org.elasticsearch.cluster.block.ClusterBlockLevel;
 import org.elasticsearch.cluster.routing.GroupShardsIterator;
 import org.elasticsearch.cluster.routing.ShardRouting;
+import org.elasticsearch.common.CacheRecycler;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.service.IndexService;
@@ -143,6 +144,11 @@ public class TransportClearIndicesCacheAction extends TransportBroadcastOperatio
                     }
                 }
             }
+            if (request.recycler()) {
+                logger.info("Clear CacheRecycler on index [{}]", service.index());
+                clearedAtLeastOne = true;
+                CacheRecycler.clear();
+            }
             if (request.idCache()) {
                 clearedAtLeastOne = true;
                 service.cache().idCache().clear();

src/main/java/org/elasticsearch/common/CacheRecycler.java

@@ -21,13 +21,13 @@ package org.elasticsearch.common;
 
 import gnu.trove.map.hash.*;
 import gnu.trove.set.hash.THashSet;
+
 import org.elasticsearch.common.trove.ExtTDoubleObjectHashMap;
 import org.elasticsearch.common.trove.ExtTHashMap;
 import org.elasticsearch.common.trove.ExtTLongObjectHashMap;
 
 public final class CacheRecycler  {
 
-    
     private static final Recycler INSTANCE;
     static {
         String property = System.getProperty("ES.RECYCLE");

src/main/java/org/elasticsearch/common/DefaultCacheRecycler.java

@@ -42,7 +42,7 @@ import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
 
 public class DefaultCacheRecycler implements Recycler {
  
-    
+    private static final int QUEUE_MAX_SIZE = 256;
     
     @Override
     public void clear() {
@@ -113,9 +113,11 @@ public class DefaultCacheRecycler implements Recycler {
             ref = ConcurrentCollections.newQueue();
             hashMap.set(ref);
         }
+        if (ref.size() < QUEUE_MAX_SIZE) {
             map.clear();
             ref.add(map);
         }
+    }
 
     // ----- THashSet -----
 
@@ -148,9 +150,11 @@ public class DefaultCacheRecycler implements Recycler {
             ref = ConcurrentCollections.newQueue();
             hashSet.set(ref);
         }
+        if (ref.size() < QUEUE_MAX_SIZE) {
             map.clear();
             ref.add(map);
         }
+    }
 
     // ------ ExtTDoubleObjectHashMap -----
 
@@ -183,9 +187,11 @@ public class DefaultCacheRecycler implements Recycler {
             ref = ConcurrentCollections.newQueue();
             doubleObjectHashMap.set(ref);
         }
+        if (ref.size() < QUEUE_MAX_SIZE) {
             map.clear();
             ref.add(map);
         }
+    }
 
     // ----- ExtTLongObjectHashMap ----
 
@@ -218,9 +224,11 @@ public class DefaultCacheRecycler implements Recycler {
             ref = ConcurrentCollections.newQueue();
             longObjectHashMap.set(ref);
         }
+        if (ref.size() < QUEUE_MAX_SIZE) {
             map.clear();
             ref.add(map);
         }
+    }
 
     // ----- TLongLongHashMap ----
 
@@ -252,9 +260,11 @@ public class DefaultCacheRecycler implements Recycler {
             ref = ConcurrentCollections.newQueue();
             longLongHashMap.set(ref);
         }
+        if (ref.size() < QUEUE_MAX_SIZE) {
             map.clear();
             ref.add(map);
         }
+    }
 
     // ----- TIntIntHashMap ----
 
@@ -287,9 +297,11 @@ public class DefaultCacheRecycler implements Recycler {
             ref = ConcurrentCollections.newQueue();
             intIntHashMap.set(ref);
         }
+        if (ref.size() < QUEUE_MAX_SIZE) {
             map.clear();
             ref.add(map);
         }
+    }
 
 
     // ----- TFloatIntHashMap ---
@@ -323,9 +335,11 @@ public class DefaultCacheRecycler implements Recycler {
             ref = ConcurrentCollections.newQueue();
             floatIntHashMap.set(ref);
         }
+        if (ref.size() < QUEUE_MAX_SIZE) {
             map.clear();
             ref.add(map);
         }
+    }
 
 
     // ----- TDoubleIntHashMap ---
@@ -359,9 +373,11 @@ public class DefaultCacheRecycler implements Recycler {
             ref = ConcurrentCollections.newQueue();
             doubleIntHashMap.set(ref);
         }
+        if (ref.size() < QUEUE_MAX_SIZE) {
             map.clear();
             ref.add(map);
         }
+    }
 
 
     // ----- TByteIntHashMap ---
@@ -395,9 +411,11 @@ public class DefaultCacheRecycler implements Recycler {
             ref = ConcurrentCollections.newQueue();
             byteIntHashMap.set(ref);
         }
+        if (ref.size() < QUEUE_MAX_SIZE) {
             map.clear();
             ref.add(map);
         }
+    }
 
     // ----- TShortIntHashMap ---
 
@@ -430,9 +448,11 @@ public class DefaultCacheRecycler implements Recycler {
             ref = ConcurrentCollections.newQueue();
             shortIntHashMap.set(ref);
         }
+        if (ref.size() < QUEUE_MAX_SIZE) {
             map.clear();
             ref.add(map);
         }
+    }
 
 
     // ----- TLongIntHashMap ----
@@ -466,9 +486,11 @@ public class DefaultCacheRecycler implements Recycler {
             ref = ConcurrentCollections.newQueue();
             longIntHashMap.set(ref);
         }
+        if (ref.size() < QUEUE_MAX_SIZE) {
             map.clear();
             ref.add(map);
         }
+    }
 
     // ------ TObjectIntHashMap -----
 
@@ -502,9 +524,11 @@ public class DefaultCacheRecycler implements Recycler {
             ref = ConcurrentCollections.newQueue();
             objectIntHashMap.set(ref);
         }
+        if (ref.size() < QUEUE_MAX_SIZE) {
             map.clear();
             ref.add(map);
         }
+    }
 
     // ------ TIntObjectHashMap -----
 
@@ -538,9 +562,11 @@ public class DefaultCacheRecycler implements Recycler {
             ref = ConcurrentCollections.newQueue();
             intObjectHashMap.set(ref);
         }
+        if (ref.size() < QUEUE_MAX_SIZE) {
             map.clear();
             ref.add(map);
         }
+    }
 
     // ------ TObjectFloatHashMap -----
 
@@ -573,9 +599,11 @@ public class DefaultCacheRecycler implements Recycler {
             ref = ConcurrentCollections.newQueue();
             objectFloatHashMap.set(ref);
         }
+        if (ref.size() < QUEUE_MAX_SIZE) {
             map.clear();
             ref.add(map);
         }
+    }
 
     // ----- int[] -----
 
@@ -611,9 +639,11 @@ public class DefaultCacheRecycler implements Recycler {
             ref = ConcurrentCollections.newQueue();
             objectArray.set(ref);
         }
+        if (ref.size() < QUEUE_MAX_SIZE) {
             Arrays.fill(objects, null);
             ref.add(objects);
         }
+    }
 
 
     private final SoftWrapper<Queue<int[]>> intArray = new SoftWrapper<Queue<int[]>>();
@@ -676,7 +706,9 @@ public class DefaultCacheRecycler implements Recycler {
             ref = ConcurrentCollections.newQueue();
             intArray.set(ref);
         }
+        if (ref.size() < QUEUE_MAX_SIZE) {
             Arrays.fill(ints, sentinal);
             ref.add(ints);
         }
     }
+}

src/main/java/org/elasticsearch/common/NoCacheCacheRecycler.java

@@ -51,6 +51,7 @@ public class NoCacheCacheRecycler implements Recycler {
 
     @Override
     public void pushHashMap(ExtTHashMap map) {
+        map.clear();
     }
 
     @Override
@@ -61,6 +62,7 @@ public class NoCacheCacheRecycler implements Recycler {
 
     @Override
     public void pushHashSet(THashSet map) {
+        map.clear();
     }
 
     @Override
@@ -71,6 +73,7 @@ public class NoCacheCacheRecycler implements Recycler {
 
     @Override
     public void pushDoubleObjectMap(ExtTDoubleObjectHashMap map) {
+        map.clear();
     }
 
     @Override
@@ -81,6 +84,7 @@ public class NoCacheCacheRecycler implements Recycler {
 
     @Override
     public void pushLongObjectMap(ExtTLongObjectHashMap map) {
+        map.clear();
     }
 
     @Override

src/main/java/org/elasticsearch/rest/action/admin/indices/cache/clear/RestClearIndicesCacheAction.java

@@ -81,6 +81,9 @@ public class RestClearIndicesCacheAction extends BaseRestHandler {
             if (request.hasParam("id_cache")) {
                 clearIndicesCacheRequest.idCache(request.paramAsBoolean("id_cache", clearIndicesCacheRequest.idCache()));
             }
+            if (request.hasParam("recycler")) {
+                clearIndicesCacheRequest.recycler(request.paramAsBoolean("recycler", clearIndicesCacheRequest.recycler()));
+            }
             clearIndicesCacheRequest.fields(request.paramAsStringArray("fields", clearIndicesCacheRequest.fields()));
             clearIndicesCacheRequest.filterKeys(request.paramAsStringArray("filter_keys", clearIndicesCacheRequest.filterKeys()));
 

src/test/java/org/elasticsearch/test/integration/document/DocumentActionsTests.java

@@ -140,7 +140,7 @@ public class DocumentActionsTests extends AbstractNodesTests {
         assertThat(indicesExistsResponse.isExists(), equalTo(false));
 
         logger.info("Clearing cache");
-        ClearIndicesCacheResponse clearIndicesCacheResponse = client1.admin().indices().clearCache(clearIndicesCacheRequest("test")).actionGet();
+        ClearIndicesCacheResponse clearIndicesCacheResponse = client1.admin().indices().clearCache(clearIndicesCacheRequest("test").recycler(true).fieldDataCache(true).filterCache(true).idCache(true)).actionGet();
         assertThat(clearIndicesCacheResponse.getSuccessfulShards(), equalTo(10));
         assertThat(clearIndicesCacheResponse.getFailedShards(), equalTo(0));