ARTEMIS-4171/ARTEMIS-4233 Large Message Send

In case a Throwable happened, we should also deal with the file in the file system.
apache · Apr 7, 2023 · de772ac · de772ac
1 parent d23ced5
commit de772ac
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/.../main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java b/.../main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java
@@ -1131,13 +1131,15 @@ private void sendContinuations(final int packetSize,
             try {
                session.send(session.getCurrentTransaction(), EmbedMessageUtil.extractEmbedded((ICoreMessage) message.toMessage(), storageManager), false, producers.get(senderID), false);
             } catch (Exception e) {
+               logger.warn(e.getMessage(), e);
                message.deleteFile();
                throw e;
             } catch (Throwable e) {
-               logger.warn("********************************************************************************");
-               logger.warn("Throwable on currentLargeMessage {}", message.getMessageID(), e);
-               logger.warn("********************************************************************************");
-
+               logger.warn(e.getMessage(), e);
+               message.deleteFile();
+               ActiveMQException e2 =  new ActiveMQException(e.getMessage());
+               e2.initCause(e);
+               throw e2;
             }
          }
       }

diff --git a/.../src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java b/.../src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java
@@ -332,6 +332,15 @@ public void testDeleteOnNoBinding() throws Exception {
 
    @Test
    public void testFileRemovalOnFailure() throws Exception {
+      internalFileRemoveOnFailure(false);
+   }
+
+   @Test
+   public void testFileRemovalOnFailureThrowable() throws Exception {
+      internalFileRemoveOnFailure(true);
+   }
+
+   private void internalFileRemoveOnFailure(boolean useError) throws Exception {
       final AtomicBoolean throwException = new AtomicBoolean(false);
       final String queueName = RandomUtil.randomString();
       final int messageSize = (int) (3.5 * ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE);
@@ -344,7 +353,11 @@ public void testFileRemovalOnFailure() throws Exception {
          @Override
          public void beforeMessageRoute(Message message, RoutingContext context, boolean direct, boolean rejectDuplicates) throws ActiveMQException {
             if (throwException.get()) {
-               throw new ActiveMQException();
+               if (useError) {
+                  throw new OutOfMemoryError();
+               } else {
+                  throw new ActiveMQException();
+               }
             }
          }
       });