HBASE-26680 Close the broken writer in AsyncFSWALProvider#createAsync…

…Writer
apache · Mar 7, 2022 · 0be356d · 0be356d
1 parent f3a48d1
commit 0be356d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/...server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AsyncProtobufLogWriter.java b/...server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AsyncProtobufLogWriter.java
@@ -171,6 +171,19 @@ public synchronized void close() throws IOException {
     this.output = null;
   }
 
+  @Override
+  public synchronized void closeWithoutTrailer() {
+    if (this.output == null) {
+      return;
+    }
+    try {
+      output.close();
+    } catch (IOException e) {
+      LOG.warn("close without writing trailer failed, will not recover lease", e);
+    }
+    this.output = null;
+  }
+
   public AsyncFSOutput getOutput() {
     return this.output;
   }

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/AsyncFSWALProvider.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/AsyncFSWALProvider.java
@@ -35,7 +35,6 @@
 import org.apache.yetus.audience.InterfaceStability;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import org.apache.hbase.thirdparty.com.google.common.base.Throwables;
 import org.apache.hbase.thirdparty.io.netty.channel.Channel;
 import org.apache.hbase.thirdparty.io.netty.channel.EventLoopGroup;
@@ -102,8 +101,9 @@ public static AsyncWriter createAsyncWriter(Configuration conf, FileSystem fs, P
     // Configuration already does caching for the Class lookup.
     Class<? extends AsyncWriter> logWriterClass = conf.getClass(
       WRITER_IMPL, AsyncProtobufLogWriter.class, AsyncWriter.class);
+    AsyncWriter writer = null;
     try {
-      AsyncWriter writer = logWriterClass.getConstructor(EventLoopGroup.class, Class.class)
+      writer = logWriterClass.getConstructor(EventLoopGroup.class, Class.class)
           .newInstance(eventLoopGroup, channelClass);
       writer.init(fs, path, conf, overwritable, blocksize, monitor);
       return writer;
@@ -117,6 +117,9 @@ public static AsyncWriter createAsyncWriter(Configuration conf, FileSystem fs, P
       } else {
         LOG.debug("Error instantiating log writer.", e);
       }
+      if (writer != null) {
+        writer.closeWithoutTrailer();
+      }
       Throwables.propagateIfPossible(e, IOException.class);
       throw new IOException("cannot get log writer", e);
     }

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALProvider.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALProvider.java
@@ -108,6 +108,8 @@ interface AsyncWriter extends WriterBase {
     CompletableFuture<Long> sync(boolean forceSync);
 
     void append(WAL.Entry entry);
+
+    void closeWithoutTrailer();
   }
 
   /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -108,6 +108,8 @@ interface AsyncWriter extends WriterBase { @@
         CompletableFuture<Long> sync(boolean forceSync);
         void append(WAL.Entry entry);
+        void closeWithoutTrailer();
       }
       /**
@@ Expand Down @@