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

HDFS-15641. DataNode could meet deadlock if invoke refreshNameNode. Contributed by Hongbing Wang.

Browse Source 
(cherry picked from commit 12c908c827)
This commit is contained in:
Hui Fei 2020-10-26 22:12:27 +08:00
parent 8312f230eb
commit b8cc09d7c7
3 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPOfferService.java
View File

@ -206,6 +206,7 @@ String getBlockPoolId(boolean quiet) {
if (id != null) { if (id != null) {
return id; return id;
} }
DataNodeFaultInjector.get().delayWhenOfferServiceHoldLock();
readLock(); readLock();
try { try {
if (bpNSInfo != null) { if (bpNSInfo != null) {
@ -382,6 +383,7 @@ void verifyAndSetNamespaceInfo(BPServiceActor actor, NamespaceInfo nsInfo)
} }
try { try {
DataNodeFaultInjector.get().delayWhenOfferServiceHoldLock();
if (setNamespaceInfo(nsInfo) == null) { if (setNamespaceInfo(nsInfo) == null) {
boolean success = false; boolean success = false;

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

@ -572,11 +572,11 @@ void start() {
} }
bpThread = new Thread(this); bpThread = new Thread(this);
bpThread.setDaemon(true); // needed for JUnit testing bpThread.setDaemon(true); // needed for JUnit testing
bpThread.start();
if (lifelineSender != null) { if (lifelineSender != null) {
lifelineSender.start(); lifelineSender.start();
} }
bpThread.start();
} }
private String formatThreadName( private String formatThreadName(

34
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestRefreshNamenodes.java
View File

@ -26,6 +26,8 @@
import java.util.Set; import java.util.Set;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdfs.DFSConfigKeys;
import org.apache.hadoop.hdfs.HdfsConfiguration;
import org.apache.hadoop.hdfs.MiniDFSCluster; import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.hadoop.hdfs.MiniDFSNNTopology; import org.apache.hadoop.hdfs.MiniDFSNNTopology;
import org.apache.hadoop.hdfs.MiniDFSNNTopology.NNConf; import org.apache.hadoop.hdfs.MiniDFSNNTopology.NNConf;
@ -93,4 +95,36 @@ public void testRefreshNamenodes() throws IOException {
} }
} }
} }
@Test(timeout=10000)
public void testRefreshNameNodeDeadLock() throws Exception {
Configuration conf = new HdfsConfiguration();
MiniDFSCluster cluster = null;
try {
cluster = new MiniDFSCluster.Builder(conf).numDataNodes(3).build();
cluster.waitActive();
DataNodeFaultInjector.set(new DataNodeFaultInjector() {
@Override
public void delayWhenOfferServiceHoldLock() {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
});
DataNode dn = cluster.getDataNodes().get(0);
Configuration dnConf = dn.getConf();
dnConf.set(DFSConfigKeys.DFS_NAMESERVICES, "ns1");
dnConf.set(DFSConfigKeys.DFS_NAMENODE_LIFELINE_RPC_ADDRESS_KEY + ".ns1",
"mock:8022");
dn.refreshNamenodes(dnConf);
} finally {
if (cluster != null) {
cluster.shutdown();
}
}
}
} }