(hbase) branch branch-2 updated: HBASE-28546 Make WAL rolling exception clear (#5848)

[weichiu]

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

weichiu pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2 by this push:
     new 8dff7cf4c02 HBASE-28546 Make WAL rolling exception clear (#5848)
8dff7cf4c02 is described below

commit 8dff7cf4c029f28c8867ca6a97f0d168e850cd2e
Author: Wei-Chiu Chuang <weic...@apache.org>
AuthorDate: Fri May 31 11:15:11 2024 -0700

    HBASE-28546 Make WAL rolling exception clear (#5848)
    
    Signed-off-by: Duo Zhang <zhang...@apache.org>
    (cherry picked from commit debb1921edc79ee7d712ae19381b777d4aafdff0)
    (cherry picked from commit 86544201da2d5cd7d049db07bae07008f6faede8)
---
 .../apache/hadoop/hbase/regionserver/wal/AsyncProtobufLogWriter.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AsyncProtobufLogWriter.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AsyncProtobufLogWriter.java
index f10f3922272..bb874a001d2 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AsyncProtobufLogWriter.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AsyncProtobufLogWriter.java
@@ -32,6 +32,7 @@ import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.HBaseConfiguration;
+import org.apache.hadoop.hbase.exceptions.TimeoutIOException;
 import org.apache.hadoop.hbase.io.ByteBufferWriter;
 import org.apache.hadoop.hbase.io.asyncfs.AsyncFSOutput;
 import org.apache.hadoop.hbase.io.asyncfs.AsyncFSOutputHelper;
@@ -205,9 +206,11 @@ public class AsyncProtobufLogWriter extends 
AbstractProtobufLogWriter
       InterruptedIOException ioe = new InterruptedIOException();
       ioe.initCause(e);
       throw ioe;
-    } catch (ExecutionException | TimeoutException e) {
+    } catch (ExecutionException e) {
       Throwables.propagateIfPossible(e.getCause(), IOException.class);
       throw new RuntimeException(e.getCause());
+    } catch (TimeoutException e) {
+      throw new TimeoutIOException(e);
     }
   }