Re-order log statements to be correct for segment and top level warming.

elastic · Apr 23, 2014 · f8d35d8 · f8d35d8
1 parent 640085c
commit f8d35d8
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 4 deletions.
diff --git a/src/main/java/org/elasticsearch/indices/warmer/IndicesWarmer.java b/src/main/java/org/elasticsearch/indices/warmer/IndicesWarmer.java
@@ -88,6 +88,19 @@ public Engine.Searcher newSearcher() {
         public IndexReader indexReader() {
             return indexReader;
         }
+
+        @Override
+        public String toString() {
+            final String value;
+            if (newSearcher != null) {
+                value = newSearcher.reader().toString();
+            } else if (indexReader != null) {
+                value = indexReader.toString();
+            } else {
+                value = "null";
+            }
+            return "WarmerContext: " + value;
+        }
     }
 
     void addListener(Listener listener);

diff --git a/src/main/java/org/elasticsearch/indices/warmer/InternalIndicesWarmer.java b/src/main/java/org/elasticsearch/indices/warmer/InternalIndicesWarmer.java
@@ -93,9 +93,9 @@ private void warmInternal(final WarmerContext context, boolean topReader) {
         }
         if (logger.isTraceEnabled()) {
             if (topReader) {
-                logger.trace("[{}][{}] warming [{}]", context.shardId().index().name(), context.shardId().id(), context.newSearcher().reader());
+                logger.trace("[{}][{}] top warming [{}]", context.shardId().index().name(), context.shardId().id(), context);
             } else {
-                logger.trace("[{}][{}] top warming [{}]", context.shardId().index().name(), context.shardId().id(), context.indexReader());
+                logger.trace("[{}][{}] warming [{}]", context.shardId().index().name(), context.shardId().id(), context);
             }
         }
         indexShard.warmerService().onPreWarm();
@@ -116,9 +116,9 @@ private void warmInternal(final WarmerContext context, boolean topReader) {
             } catch (InterruptedException e) {
                 Thread.currentThread().interrupt();
                 if (topReader) {
-                    logger.warn("warming has been interrupted", e);
-                } else {
                     logger.warn("top warming has been interrupted", e);
+                } else {
+                    logger.warn("warming has been interrupted", e);
                 }
                 break;
             }

diff --git a/src/test/java/org/elasticsearch/index/fielddata/FieldDataLoadingTests.java b/src/test/java/org/elasticsearch/index/fielddata/FieldDataLoadingTests.java
@@ -49,4 +49,22 @@ public void testEagerFieldDataLoading() throws Exception {
         assertThat(response.getIndicesStats().getFieldData().getMemorySizeInBytes(), greaterThan(0l));
     }
 
+    @Test
+    public void testEagerGlobalOrdinalsFieldDataLoading() throws Exception {
+        assertAcked(prepareCreate("test")
+                .addMapping("type", jsonBuilder().startObject().startObject("type").startObject("properties")
+                        .startObject("name")
+                        .field("type", "string")
+                        .startObject("fielddata").field("loading", "eager_global_ordinals").endObject()
+                        .endObject()
+                        .endObject().endObject().endObject()));
+        ensureGreen();
+
+        client().prepareIndex("test", "type", "1").setSource("name", "name").get();
+        client().admin().indices().prepareRefresh("test").get();
+
+        ClusterStatsResponse response = client().admin().cluster().prepareClusterStats().get();
+        assertThat(response.getIndicesStats().getFieldData().getMemorySizeInBytes(), greaterThan(0l));
+    }
+
 }