Test fixes

Signed-off-by: Bukhtawar Khan <bukhtawa@amazon.com>
opensearch-project · Jun 24, 2022 · dc1d0c7 · dc1d0c7
1 parent 20772d8
commit dc1d0c7
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 9 deletions.
diff --git a/server/src/main/java/org/opensearch/index/engine/InternalEngine.java b/server/src/main/java/org/opensearch/index/engine/InternalEngine.java
@@ -292,7 +292,7 @@ public void onTragicFailure(AlreadyClosedException ex) {
                     readLock,
                     () -> getLocalCheckpointTracker(),
                     translogUUID,
-                    new CompositeTranslogEventListener(Arrays.asList(internalTranslogEventListener, translogEventListener)),
+                    new CompositeTranslogEventListener(Arrays.asList(internalTranslogEventListener, translogEventListener), shardId),
                     this::ensureOpen
                 );
                 this.translogManager = translogManagerRef;

diff --git a/.../src/main/java/org/opensearch/index/translog/listener/CompositeTranslogEventListener.java b/.../src/main/java/org/opensearch/index/translog/listener/CompositeTranslogEventListener.java
@@ -13,6 +13,8 @@
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.apache.lucene.store.AlreadyClosedException;
 import org.opensearch.ExceptionsHelper;
+import org.opensearch.index.shard.ShardId;
+import org.opensearch.index.translog.TranslogException;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -27,9 +29,11 @@
 public final class CompositeTranslogEventListener implements TranslogEventListener {
 
     private final List<TranslogEventListener> listeners;
+    private final ShardId shardId;
     private final Logger logger = LogManager.getLogger(CompositeTranslogEventListener.class);
 
-    public CompositeTranslogEventListener(Collection<TranslogEventListener> listeners) {
+    public CompositeTranslogEventListener(Collection<TranslogEventListener> listeners, ShardId shardId) {
+        this.shardId = shardId;
         for (TranslogEventListener listener : listeners) {
             if (listener == null) {
                 throw new IllegalArgumentException("listeners must be non-null");
@@ -49,7 +53,7 @@ public void onAfterTranslogSync() {
                 exceptionList.add(ex);
             }
         }
-        ExceptionsHelper.maybeThrowRuntimeAndSuppress(exceptionList);
+        maybeThrowTranslogExceptionAndSuppress(exceptionList);
     }
 
     @Override
@@ -63,7 +67,7 @@ public void onAfterTranslogRecovery() {
                 exceptionList.add(ex);
             }
         }
-        ExceptionsHelper.maybeThrowRuntimeAndSuppress(exceptionList);
+        maybeThrowTranslogExceptionAndSuppress(exceptionList);
     }
 
     @Override
@@ -77,7 +81,7 @@ public void onBeginTranslogRecovery() {
                 exceptionList.add(ex);
             }
         }
-        ExceptionsHelper.maybeThrowRuntimeAndSuppress(exceptionList);
+        maybeThrowTranslogExceptionAndSuppress(exceptionList);
     }
 
     @Override
@@ -91,7 +95,7 @@ public void onFailure(String reason, Exception e) {
                 exceptionList.add(ex);
             }
         }
-        ExceptionsHelper.maybeThrowRuntimeAndSuppress(exceptionList);
+        maybeThrowTranslogExceptionAndSuppress(exceptionList);
     }
 
     @Override
@@ -105,6 +109,16 @@ public void onTragicFailure(AlreadyClosedException e) {
                 exceptionList.add(ex);
             }
         }
-        ExceptionsHelper.maybeThrowRuntimeAndSuppress(exceptionList);
+        maybeThrowTranslogExceptionAndSuppress(exceptionList);
+    }
+
+    private <T extends Throwable> void maybeThrowTranslogExceptionAndSuppress(List<T> exceptions) {
+        T main = null;
+        for (T ex : exceptions) {
+            main = ExceptionsHelper.useOrSuppress(main, ex);
+        }
+        if (main != null) {
+            throw new TranslogException(shardId, "Error while executing translog event listener", main);
+        }
     }
 }
diff --git a/server/src/test/java/org/opensearch/index/translog/listener/TranslogListenerTests.java b/server/src/test/java/org/opensearch/index/translog/listener/TranslogListenerTests.java
@@ -9,6 +9,8 @@
 package org.opensearch.index.translog.listener;
 
 import org.apache.lucene.store.AlreadyClosedException;
+import org.opensearch.index.Index;
+import org.opensearch.index.shard.ShardId;
 import org.opensearch.test.OpenSearchTestCase;
 
 import java.lang.reflect.Proxy;
@@ -53,7 +55,10 @@ public void onTragicFailure(AlreadyClosedException ex) {
 
         final List<TranslogEventListener> translogEventListeners = new ArrayList<>(Arrays.asList(listener, listener));
         Collections.shuffle(translogEventListeners, random());
-        TranslogEventListener compositeListener = new CompositeTranslogEventListener(translogEventListeners);
+        TranslogEventListener compositeListener = new CompositeTranslogEventListener(
+            translogEventListeners,
+            new ShardId(new Index("indexName", "indexUuid"), 123)
+        );
         compositeListener.onAfterTranslogRecovery();
         compositeListener.onAfterTranslogSync();
         compositeListener.onBeginTranslogRecovery();
@@ -109,7 +114,10 @@ public void onTragicFailure(AlreadyClosedException ex) {
 
         final List<TranslogEventListener> translogEventListeners = new LinkedList<>(Arrays.asList(listener, throwingListener, listener));
         Collections.shuffle(translogEventListeners, random());
-        TranslogEventListener compositeListener = new CompositeTranslogEventListener(translogEventListeners);
+        TranslogEventListener compositeListener = new CompositeTranslogEventListener(
+            translogEventListeners,
+            new ShardId(new Index("indexName", "indexUuid"), 123)
+        );
         expectThrows(RuntimeException.class, () -> compositeListener.onAfterTranslogRecovery());
         expectThrows(RuntimeException.class, () -> compositeListener.onAfterTranslogSync());
         expectThrows(RuntimeException.class, () -> compositeListener.onBeginTranslogRecovery());