big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-15651. Client could not obtain block when DN CommandProcessingThread exit. Contributed by Aiphago.

Browse Source 
Reviewed-by: He Xiaoqiao <hexiaoqiao@apache.org>
Reviewed-by: Yiqun Lin <yqlin@apache.org>
(cherry picked from commit 3067a25fa1)

 Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBPOfferService.java
This commit is contained in:
He Xiaoqiao 2020-11-04 13:53:46 +08:00 committed by Wei-Chiu Chuang
parent 872839416b
commit ab451b8e42
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java
View File

@ -1312,6 +1312,10 @@ public void run() {
processQueue();
} catch (Throwable t) {
LOG.error("{} encountered fatal exception and exit.", getName(), t);
runningState = RunningState.FAILED;
} finally {
LOG.warn("Ending command processor service for: " + this);
shouldServiceRun = false;
}
}
@ -1327,6 +1331,7 @@ private void processQueue() {
dn.getMetrics().incrNumProcessedCommands();
} catch (InterruptedException e) {
LOG.error("{} encountered interrupt and exit.", getName());
Thread.currentThread().interrupt();
// ignore unless thread was specifically interrupted.
if (Thread.interrupted()) {
break;
@ -1398,4 +1403,11 @@ void enqueue(DatanodeCommand[] cmds) throws InterruptedException {
dn.getMetrics().incrActorCmdQueueLength(1);
}
}
@VisibleForTesting
void stopCommandProcessingThread() {
if (commandProcessingThread != null) {
commandProcessingThread.interrupt();
}
}
}

24
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBPOfferService.java
View File

@ -1216,4 +1216,26 @@ public void testCommandProcessingThread() throws Exception {
}
}
}
}
@Test(timeout = 5000)
public void testCommandProcessingThreadExit() throws Exception {
Configuration conf = new HdfsConfiguration();
MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf).
numDataNodes(1).build();
try {
List<DataNode> datanodes = cluster.getDataNodes();
DataNode dataNode = datanodes.get(0);
List<BPOfferService> allBpOs = dataNode.getAllBpOs();
BPOfferService bpos = allBpOs.get(0);
waitForInitialization(bpos);
BPServiceActor actor = bpos.getBPServiceActors().get(0);
// Stop and wait util actor exit.
actor.stopCommandProcessingThread();
GenericTestUtils.waitFor(() -> !actor.isAlive(), 100, 3000);
} finally {
if (cluster != null) {
cluster.shutdown();
}
}
}
}