Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDDS-1830 OzoneManagerDoubleBuffer#stop should wait for daemon thread to die (#1156)

This commit is contained in:
Siyao Meng 2019-07-25 16:14:50 -07:00 committed by Arpit Agarwal
parent 2b1d8aedbb
commit b7fba78fb6
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java
View File

@ -21,6 +21,7 @@ package org.apache.hadoop.ozone.om.ratis;
import java.io.IOException; import java.io.IOException;
import java.util.Queue; import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLong;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
@ -64,7 +65,7 @@ public class OzoneManagerDoubleBuffer {
private final OMMetadataManager omMetadataManager; private final OMMetadataManager omMetadataManager;
private final AtomicLong flushedTransactionCount = new AtomicLong(0); private final AtomicLong flushedTransactionCount = new AtomicLong(0);
private final AtomicLong flushIterations = new AtomicLong(0); private final AtomicLong flushIterations = new AtomicLong(0);
private volatile boolean isRunning; private final AtomicBoolean isRunning = new AtomicBoolean(false);
private OzoneManagerDoubleBufferMetrics ozoneManagerDoubleBufferMetrics; private OzoneManagerDoubleBufferMetrics ozoneManagerDoubleBufferMetrics;
private long maxFlushedTransactionsInOneIteration; private long maxFlushedTransactionsInOneIteration;
@ -79,7 +80,7 @@ public class OzoneManagerDoubleBuffer {
this.ozoneManagerDoubleBufferMetrics = this.ozoneManagerDoubleBufferMetrics =
OzoneManagerDoubleBufferMetrics.create(); OzoneManagerDoubleBufferMetrics.create();
isRunning = true; isRunning.set(true);
// Daemon thread which runs in back ground and flushes transactions to DB. // Daemon thread which runs in back ground and flushes transactions to DB.
daemon = new Daemon(this::flushTransactions); daemon = new Daemon(this::flushTransactions);
daemon.setName("OMDoubleBufferFlushThread"); daemon.setName("OMDoubleBufferFlushThread");
@ -92,7 +93,7 @@ public class OzoneManagerDoubleBuffer {
* and commit to DB. * and commit to DB.
*/ */
private void flushTransactions() { private void flushTransactions() {
while(isRunning) { while (isRunning.get()) {
try { try {
if (canFlush()) { if (canFlush()) {
setReadyBuffer(); setReadyBuffer();
@ -140,7 +141,7 @@ public class OzoneManagerDoubleBuffer {
} }
} catch (InterruptedException ex) { } catch (InterruptedException ex) {
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
if (isRunning) { if (isRunning.get()) {
final String message = "OMDoubleBuffer flush thread " + final String message = "OMDoubleBuffer flush thread " +
Thread.currentThread().getName() + " encountered Interrupted " + Thread.currentThread().getName() + " encountered Interrupted " +
"exception while running"; "exception while running";
@ -201,11 +202,16 @@ public class OzoneManagerDoubleBuffer {
/** /**
* Stop OM DoubleBuffer flush thread. * Stop OM DoubleBuffer flush thread.
*/ */
public synchronized void stop() { public void stop() {
if (isRunning) { if (isRunning.compareAndSet(true, false)) {
LOG.info("Stopping OMDoubleBuffer flush thread"); LOG.info("Stopping OMDoubleBuffer flush thread");
isRunning = false;
daemon.interrupt(); daemon.interrupt();
try {
// Wait for daemon thread to exit
daemon.join();
} catch (InterruptedException e) {
LOG.error("Interrupted while waiting for daemon to exit.");
}
// stop metrics. // stop metrics.
ozoneManagerDoubleBufferMetrics.unRegister(); ozoneManagerDoubleBufferMetrics.unRegister();