HDFS-9181. Better handling of exceptions thrown during upgrade shutdown. Contributed by Wei-Chiu Chuang.
This commit is contained in:
parent
4aa9b3e75c
commit
c11fc8a1be
|
@ -1500,6 +1500,9 @@ Release 2.8.0 - UNRELEASED
|
|||
HDFS-8164. cTime is 0 in VERSION file for newly formatted NameNode.
|
||||
(Xiao Chen via Yongjun Zhang)
|
||||
|
||||
HDFS-9181. Better handling of exceptions thrown during upgrade shutdown.
|
||||
(Wei-Chiu Chuang via Yongjun Zhang)
|
||||
|
||||
OPTIMIZATIONS
|
||||
|
||||
HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than
|
||||
|
|
|
@ -1743,8 +1743,9 @@ public class DataNode extends ReconfigurableBase
|
|||
xserver.sendOOBToPeers();
|
||||
((DataXceiverServer) this.dataXceiverServer.getRunnable()).kill();
|
||||
this.dataXceiverServer.interrupt();
|
||||
} catch (Throwable e) {
|
||||
} catch (Exception e) {
|
||||
// Ignore, since the out of band messaging is advisory.
|
||||
LOG.trace("Exception interrupting DataXceiverServer: ", e);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -96,13 +96,13 @@ public class TestDataNodeExit {
|
|||
public void testSendOOBToPeers() throws Exception {
|
||||
DataNode dn = cluster.getDataNodes().get(0);
|
||||
DataXceiverServer spyXserver = Mockito.spy(dn.getXferServer());
|
||||
NullPointerException e = new NullPointerException();
|
||||
Mockito.doThrow(e).when(spyXserver).sendOOBToPeers();
|
||||
NullPointerException npe = new NullPointerException();
|
||||
Mockito.doThrow(npe).when(spyXserver).sendOOBToPeers();
|
||||
dn.xserver = spyXserver;
|
||||
try {
|
||||
dn.shutdown();
|
||||
} catch (Throwable t) {
|
||||
fail("DataNode shutdown should not have thrown exception " + t);
|
||||
} catch (Exception e) {
|
||||
fail("DataNode shutdown should not have thrown exception " + e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue