(shardingsphere) branch master updated: Fix RAL E2E lifecycle exception handling (#40092)

[zhangliang]

This is an automated email from the ASF dual-hosted git repository.

terrymanu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new f893899dc96 Fix RAL E2E lifecycle exception handling (#40092)
f893899dc96 is described below

commit f893899dc96c94bba677df8cfd675b5c5e429572
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Wed Oct 7 15:58:30 2026 +0800

    Fix RAL E2E lifecycle exception handling (#40092)
    
    * Refactor DataSourcePoolCreatorTest
    
    * Skip cancellation of closed Statements during proxy cleanup
    
    * Remove obsolete Wagon HTTP options from workflows
    
    * Fix RAL E2E lifecycle exception handling
---
 .../test/e2e/sql/it/distsql/ral/RALE2EIT.java         | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/distsql/ral/RALE2EIT.java
 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/distsql/ral/RALE2EIT.java
index 1b973a29269..456cdb9cc7a 100644
--- 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/distsql/ral/RALE2EIT.java
+++ 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/distsql/ral/RALE2EIT.java
@@ -77,11 +77,26 @@ class RALE2EIT implements SQLE2EIT {
     @ArgumentsSource(SQLE2EITArgumentsProvider.class)
     void assertExecute(final AssertionTestParameter testParam) throws 
SQLException, IOException {
         SQLE2EITContext context = new SQLE2EITContext(testParam);
-        init(context);
+        Throwable primaryException = null;
         try {
+            init(context);
             assertExecute(context, testParam);
+            // CHECKSTYLE:OFF
+        } catch (final SQLException | IOException | RuntimeException | 
AssertionError ex) {
+            // CHECKSTYLE:ON
+            primaryException = ex;
+            throw ex;
         } finally {
-            tearDown(context);
+            try {
+                tearDown(context);
+                // CHECKSTYLE:OFF
+            } catch (final SQLException | RuntimeException ex) {
+                // CHECKSTYLE:ON
+                if (null == primaryException) {
+                    throw ex;
+                }
+                primaryException.addSuppressed(ex);
+            }
         }
     }