From 42bb5deca2d11d5b13ea83c1aff608caf805a319 Mon Sep 17 00:00:00 2001
From: Simon Willnauer <simonw@apache.org>
Date: Sat, 31 Jan 2015 23:48:34 +0100
Subject: [PATCH] Revert "[ENGINE] Fail engine if Lucene commit fails"

This reverts commit dda72428484b4a5d79b6d9c97d56365851a79543.
---
 .../index/engine/internal/InternalEngine.java | 21 +++++--------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/elasticsearch/index/engine/internal/InternalEngine.java b/src/main/java/org/elasticsearch/index/engine/internal/InternalEngine.java
index 7b5bbe3a0c1..34ddb7063bc 100644
--- a/src/main/java/org/elasticsearch/index/engine/internal/InternalEngine.java
+++ b/src/main/java/org/elasticsearch/index/engine/internal/InternalEngine.java
@@ -236,7 +236,7 @@ public class InternalEngine implements Engine {
                 }
                 if (mustCommitTranslogId) { // translog id is not in the metadata - fix this inconsistency some code relies on this and old indices might not have it.
                     indexWriter.setCommitData(Collections.singletonMap(Translog.TRANSLOG_ID_KEY, Long.toString(translogId)));
-                    commitIndexWriter(indexWriter);
+                    indexWriter.commit();
                 }
                 searcherManager = buildSearchManager(indexWriter);
                 lastCommittedSegmentInfos = store.readLastCommittedSegmentsInfo();
@@ -717,17 +717,6 @@ public class InternalEngine implements Engine {
         versionMapRefreshPending.set(false);
     }
 
-    private void commitIndexWriter(IndexWriter writer) throws IOException {
-        try {
-            writer.commit();
-        } catch (AlreadyClosedException ex) {
-            throw ex;
-        } catch (Throwable ex) {
-            failEngine("lucene commit failed", ex);
-            throw ex;
-        }
-    }
-
     @Override
     public void flush(FlushType type, boolean force, boolean waitIfOngoing) throws EngineException {
         ensureOpen();
@@ -754,7 +743,7 @@ public class InternalEngine implements Engine {
                         { // commit and close the current writer - we write the current tanslog ID just in case
                             final long translogId = translog.currentId();
                             indexWriter.setCommitData(Collections.singletonMap(Translog.TRANSLOG_ID_KEY, Long.toString(translogId)));
-                            commitIndexWriter(indexWriter);
+                            indexWriter.commit();
                             indexWriter.rollback();
                         }
                         indexWriter = createWriter();
@@ -764,7 +753,7 @@ public class InternalEngine implements Engine {
                             flushNeeded = false;
                             long translogId = translogIdGenerator.incrementAndGet();
                             indexWriter.setCommitData(Collections.singletonMap(Translog.TRANSLOG_ID_KEY, Long.toString(translogId)));
-                            commitIndexWriter(indexWriter);
+                            indexWriter.commit();
                             translog.newTranslog(translogId);
                         }
 
@@ -797,7 +786,7 @@ public class InternalEngine implements Engine {
                             long translogId = translogIdGenerator.incrementAndGet();
                             translog.newTransientTranslog(translogId);
                             indexWriter.setCommitData(Collections.singletonMap(Translog.TRANSLOG_ID_KEY, Long.toString(translogId)));
-                            commitIndexWriter(indexWriter);
+                            indexWriter.commit();
                             // we need to refresh in order to clear older version values
                             refresh("version_table_flush");
                             // we need to move transient to current only after we refresh
@@ -834,7 +823,7 @@ public class InternalEngine implements Engine {
                     try {
                         long translogId = translog.currentId();
                         indexWriter.setCommitData(Collections.singletonMap(Translog.TRANSLOG_ID_KEY, Long.toString(translogId)));
-                        commitIndexWriter(indexWriter);
+                        indexWriter.commit();
                     } catch (Throwable e) {
                         throw new FlushFailedEngineException(shardId, e);
                     }