From 96ad1911fd3264d47ed7778b0e94d08524483519 Mon Sep 17 00:00:00 2001
From: Simon Willnauer <simonw@apache.org>
Date: Tue, 4 Aug 2015 15:02:39 +0200
Subject: [PATCH 1/2] Use correct classname in all-signatures.txt

---
 dev-tools/src/main/resources/forbidden/all-signatures.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-tools/src/main/resources/forbidden/all-signatures.txt b/dev-tools/src/main/resources/forbidden/all-signatures.txt
index 985cdd5c5c0..b03cd14731f 100644
--- a/dev-tools/src/main/resources/forbidden/all-signatures.txt
+++ b/dev-tools/src/main/resources/forbidden/all-signatures.txt
@@ -53,7 +53,7 @@ org.joda.time.DateTime#<init>(int, int, int, int, int)
 org.joda.time.DateTime#<init>(int, int, int, int, int, int)
 org.joda.time.DateTime#<init>(int, int, int, int, int, int, int)
 org.joda.time.DateTime#now()
-org.joda.time.DateTime#getDefault()
+org.joda.time.DateTimeZone#getDefault()
 
 com.google.common.collect.Iterators#emptyIterator() @ Use Collections.emptyIterator instead
 

From 8f6e75b158724eee9b08313c072adcbb1579ffd3 Mon Sep 17 00:00:00 2001
From: Simon Willnauer <simonw@apache.org>
Date: Tue, 4 Aug 2015 15:43:17 +0200
Subject: [PATCH 2/2] Ignore EngineClosedException on IndexShard#sync

This method syncs the translog unless it's already synced. If the engine
is alreayd closed we are guaranteed to be synced already such that we can just
ignore this exception.

Closes #12603
---
 .../elasticsearch/action/index/TransportIndexAction.java   | 7 +------
 .../java/org/elasticsearch/index/shard/IndexShard.java     | 4 +++-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java b/core/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java
index b1371e18a32..97620829f3a 100644
--- a/core/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java
+++ b/core/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java
@@ -211,12 +211,7 @@ public class TransportIndexAction extends TransportReplicationAction<IndexReques
         }
 
         if (indexShard.getTranslogDurability() == Translog.Durabilty.REQUEST && location != null) {
-            try {
-                indexShard.sync(location);
-            } catch (EngineClosedException e) {
-                // ignore, the engine is already closed and we do not want the
-                // operation to be retried, because it has been modified
-            }
+            indexShard.sync(location);
         }
     }
 }
diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexShard.java b/core/src/main/java/org/elasticsearch/index/shard/IndexShard.java
index 6ee6504bf42..c4eecad452c 100644
--- a/core/src/main/java/org/elasticsearch/index/shard/IndexShard.java
+++ b/core/src/main/java/org/elasticsearch/index/shard/IndexShard.java
@@ -1403,9 +1403,11 @@ public class IndexShard extends AbstractIndexShardComponent {
      * Syncs the given location with the underlying storage unless already synced.
      */
     public void sync(Translog.Location location) {
-        final Engine engine = engine();
         try {
+            final Engine engine = engine();
             engine.getTranslog().ensureSynced(location);
+        } catch (EngineClosedException ex) {
+            // that's fine since we already synced everything on engine close - this also is conform with the methods documentation
         } catch (IOException ex) { // if this fails we are in deep shit - fail the request
             logger.debug("failed to sync translog", ex);
             throw new ElasticsearchException("failed to sync translog", ex);