Revert "HBASE-23601: OutputSink.WriterThread exception gets stuck and…

… repeated indefinietly (apache#956)" This reverts commit ce7c559.
symat · Jan 10, 2020 · fd6eb38 · fd6eb38
1 parent b01fb05
commit fd6eb38
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 147 deletions.
diff --git a/...va/org/apache/hadoop/hbase/replication/regionserver/RegionReplicaReplicationEndpoint.java b/...va/org/apache/hadoop/hbase/replication/regionserver/RegionReplicaReplicationEndpoint.java
@@ -250,7 +250,6 @@ public boolean replicate(ReplicateContext replicateContext) {
       } catch (IOException e) {
         LOG.warn("Received IOException while trying to replicate"
             + StringUtils.stringifyException(e));
-        outputSink.restartWriterThreadsIfNeeded();
       }
     }
 

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/OutputSink.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/OutputSink.java
@@ -91,19 +91,6 @@ public synchronized void startWriterThreads() {
     }
   }
 
-  public synchronized void restartWriterThreadsIfNeeded() {
-    for(int i = 0; i< writerThreads.size(); i++){
-      WriterThread t = writerThreads.get(i);
-      if (!t.isAlive()){
-        String threadName = t.getName();
-        LOG.debug("Replacing dead thread: " + threadName);
-        WriterThread newThread = new WriterThread(controller, entryBuffers, this, threadName);
-        newThread.start();
-        writerThreads.set(i, newThread);
-      }
-    }
-  }
-
   /**
    * Update region's maximum edit log SeqNum.
    */
@@ -201,12 +188,7 @@ public static class WriterThread extends Thread {
 
     WriterThread(WALSplitter.PipelineController controller, EntryBuffers entryBuffers,
         OutputSink sink, int i) {
-      this(controller, entryBuffers, sink, Thread.currentThread().getName() + "-Writer-" + i);
-    }
-
-    WriterThread(WALSplitter.PipelineController controller, EntryBuffers entryBuffers,
-        OutputSink sink, String threadName) {
-      super(threadName);
+      super(Thread.currentThread().getName() + "-Writer-" + i);
       this.controller = controller;
       this.entryBuffers = entryBuffers;
       outputSink = sink;

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java
@@ -472,7 +472,6 @@ void checkForErrors() throws IOException {
       if (thrown == null) {
         return;
       }
-      this.thrown.set(null);
       if (thrown instanceof IOException) {
         throw new IOException(thrown);
       } else {

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestOutputSinkWriter.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestOutputSinkWriter.java