Merge commit 'refs/pull/580/head' of github.com:apache/usergrid into debug_logging
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
index 302e453..86d7122 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
@@ -48,10 +48,7 @@
import org.apache.usergrid.persistence.index.utils.IndexValidationUtils;
import org.apache.usergrid.persistence.model.entity.Id;
import org.apache.usergrid.persistence.model.util.UUIDGenerator;
-import org.elasticsearch.action.ActionFuture;
-import org.elasticsearch.action.ActionListener;
-import org.elasticsearch.action.ListenableActionFuture;
-import org.elasticsearch.action.ShardOperationFailedException;
+import org.elasticsearch.action.*;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequestBuilder;
@@ -64,6 +61,7 @@
import org.elasticsearch.action.deletebyquery.IndexDeleteByQueryResponse;
import org.elasticsearch.action.search.SearchRequestBuilder;
import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.action.support.PlainListenableActionFuture;
import org.elasticsearch.client.AdminClient;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.settings.Settings;
@@ -77,6 +75,7 @@
import org.elasticsearch.search.aggregations.metrics.sum.Sum;
import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
import org.elasticsearch.search.sort.SortOrder;
+import org.elasticsearch.threadpool.ThreadPoolStats;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -533,7 +532,8 @@
try {
if (logger.isInfoEnabled()) {
- logger.info("Before Query execute {} ",
+ logger.info("Before Query execute srb = {} {} ",
+ srb.toString(),
DebugUtils.getLogMessage());
}
@@ -542,7 +542,27 @@
searchResponse = f.actionGet();
long end = System.nanoTime();
+ String stats = "";
+ if (f instanceof PlainListenableActionFuture) {
+ PlainListenableActionFuture p = (PlainListenableActionFuture) f;
+ ThreadPoolStats ts = p.threadPool().stats();
+ for (ThreadPoolStats.Stats s : ts) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(" Thread Pool starts ")
+ .append(s.getName())
+ .append(s.getQueue())
+ .append(s.getActive())
+ .append(s.getThreads());
+ stats += sb.toString();
+ }
+ }
+
if (logger.isInfoEnabled()) {
+
+ logger.info("ThreadPool stats {} {} ",
+ stats,
+ DebugUtils.getLogMessage());
+
logger.info("Waiting for ES Client took {} class of executor is {} class of future is {} {} ",
TimeUnit.NANOSECONDS.toMillis(end - start),
srb.getClass().getCanonicalName(),
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsProvider.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsProvider.java
index e81aa0f..58f3191 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsProvider.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsProvider.java
@@ -123,7 +123,8 @@
final String clusterName = indexFig.getClusterName();
final int port = indexFig.getPort();
- ImmutableSettings.Builder settings = ImmutableSettings.settingsBuilder().put( "cluster.name", clusterName )
+ ImmutableSettings.Builder settings = ImmutableSettings.settingsBuilder()
+ .put( "cluster.name", clusterName )
.put( "client.transport.sniff", true );
String nodeName = indexFig.getNodeName();
