Revert "HBASE-26680 Close and do not write trailer for the broken WAL…

… writer(addendum) (apache#4405)" This reverts commit f133df4.
wenwj0 · Jun 14, 2022 · 5796b0c · 5796b0c
1 parent 41e5b6c
commit 5796b0c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/...ver/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AbstractProtobufLogWriter.java b/...ver/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AbstractProtobufLogWriter.java
@@ -199,7 +199,7 @@ public void init(FileSystem fs, Path path, Configuration conf, boolean overwrita
       }
     } catch (Exception e) {
       LOG.warn("Init output failed, path={}", path, e);
-      closeOutputIfNecessary();
+      closeOutput();
       throw e;
     }
   }
@@ -269,10 +269,9 @@ protected abstract void initOutput(FileSystem fs, Path path, boolean overwritabl
     throws IOException, StreamLacksCapabilityException;
 
   /**
-   * It is straight forward to close the output, do not need to write trailer like the Writer.close
+   * simply close the output, do not need to write trailer like the Writer.close
    */
-  protected void closeOutputIfNecessary() {
-  }
+  protected abstract void closeOutput();
 
   /**
    * return the file length after written.

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
@@ -195,7 +195,7 @@ protected void initOutput(FileSystem fs, Path path, boolean overwritable, int bu
   }
 
   @Override
-  protected void closeOutputIfNecessary() {
+  protected void closeOutput() {
     if (this.output != null) {
       try {
         this.output.close();

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogWriter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogWriter.java
@@ -127,7 +127,7 @@ protected void initOutput(FileSystem fs, Path path, boolean overwritable, int bu
   }
 
   @Override
-  protected void closeOutputIfNecessary() {
+  protected void closeOutput() {
     if (this.output != null) {
       try {
         this.output.close();