write should not perform cleanup at all, writeAndCleanup should always

Author: Andrey Ershov

server/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java

@@ -177,13 +177,12 @@ private static void performStateDirectoriesFsync(List<Tuple<Path, Directory>> st
     }
 
     /**
-     * Writes the given state to the given directories and performs cleanup.
+     * Writes the given state to the given directories and performs cleanup of old state files if the write succeeds or
+     * newly created state file if write fails.
      * See also {@link #write(Object, Path...)} and {@link #cleanupOldFiles(long, Path[])}.
      */
     public final long writeAndCleanup(final T state, final Path... locations) throws WriteStateException {
-        long currentGeneration = write(state, locations);
-        cleanupOldFiles(currentGeneration,locations);
-        return currentGeneration;
+        return write(state, true, locations);
     }
 
     /**
@@ -207,6 +206,10 @@ public final long writeAndCleanup(final T state, final Path... locations) throws
      * @return generation of newly written state.
      */
     public final long write(final T state, final Path... locations) throws WriteStateException {
+        return write(state, false, locations);
+    }
+
+    private final long write(final T state, boolean cleanup, final Path... locations) throws WriteStateException {
         if (locations == null) {
             throw new IllegalArgumentException("Locations must not be null");
         }
@@ -242,7 +245,9 @@ public final long write(final T state, final Path... locations) throws WriteStat
             performRenames(tmpFileName, fileName, directories);
             performStateDirectoriesFsync(directories);
         } catch (WriteStateException e) {
-            cleanupOldFiles(oldGenerationId, locations);
+            if (cleanup) {
+                cleanupOldFiles(oldGenerationId, locations);
+            }
             throw e;
         } finally {
             for (Tuple<Path, Directory> pathAndDirectory : directories) {
@@ -251,6 +256,10 @@ public final long write(final T state, final Path... locations) throws WriteStat
             }
         }
 
+        if (cleanup) {
+            cleanupOldFiles(newGenerationId, locations);
+        }
+
         return newGenerationId;
     }