Deal with exceptions when obtaining both retention locks

DaveCTurner · DaveCTurner · commit 7b6c2a0deb28 · 2019-02-14T16:14:18.000Z
diff --git a/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java b/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java
@@ -2567,10 +2567,23 @@ public final long getMinRetainedSeqNo() {
     public Closeable acquireRetentionLock() {
         if (softDeleteEnabled) {
             final Closeable softDeletesRetentionLock = softDeletesPolicy.acquireRetentionLock();
-            final Closeable translogRetentionLock = translog.acquireRetentionLock();
+            final Closeable translogRetentionLock;
+            try {
+                translogRetentionLock = translog.acquireRetentionLock();
+            } catch (Exception e) {
+                try {
+                    softDeletesRetentionLock.close();
+                } catch (IOException ioexception) {
+                    e.addSuppressed(ioexception);
+                }
+                throw e;
+            }
             return () -> {
-                softDeletesRetentionLock.close();
-                translogRetentionLock.close();
+                try {
+                    translogRetentionLock.close();
+                } finally {
+                    softDeletesRetentionLock.close();
+                }
             };
         } else {
             return translog.acquireRetentionLock();
