From 19520d4640ece2178bcc66756efce3c728bcb186 Mon Sep 17 00:00:00 2001
From: Yannick Welsch <yannick@welsch.lu>
Date: Mon, 24 Jun 2019 12:28:59 +0200
Subject: [PATCH] Add additional logging for #43034

It's unclear why sometimes the shard is not flushed on closing
---
 server/src/main/java/org/elasticsearch/index/IndexService.java  | 2 ++
 server/src/main/java/org/elasticsearch/index/engine/Engine.java | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/server/src/main/java/org/elasticsearch/index/IndexService.java b/server/src/main/java/org/elasticsearch/index/IndexService.java
index 6c51a7a6f5c..a99fcda6b69 100644
--- a/server/src/main/java/org/elasticsearch/index/IndexService.java
+++ b/server/src/main/java/org/elasticsearch/index/IndexService.java
@@ -472,6 +472,8 @@ public class IndexService extends AbstractIndexComponent implements IndicesClust
                     try {
                         // only flush we are we closed (closed index or shutdown) and if we are not deleted
                         final boolean flushEngine = deleted.get() == false && closed.get();
+                        logger.trace("[{}] closing shard (flushEngine: {}, deleted: {}, closed: {})", shardId, flushEngine, deleted.get(),
+                            closed.get());
                         indexShard.close(reason, flushEngine);
                     } catch (Exception e) {
                         logger.debug(() -> new ParameterizedMessage("[{}] failed to close index shard", shardId), e);
diff --git a/server/src/main/java/org/elasticsearch/index/engine/Engine.java b/server/src/main/java/org/elasticsearch/index/engine/Engine.java
index e21b816aefd..a50d0c790d4 100644
--- a/server/src/main/java/org/elasticsearch/index/engine/Engine.java
+++ b/server/src/main/java/org/elasticsearch/index/engine/Engine.java
@@ -1716,6 +1716,8 @@ public abstract class Engine implements Closeable {
                     close(); // double close is not a problem
                 }
             }
+        } else {
+            logger.trace("skipping flushAndClose as already closed");
         }
         awaitPendingClose();
     }