You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ki...@apache.org on 2015/01/12 22:37:49 UTC
hadoop git commit: HDFS-7533. Datanode sometimes does not shutdown on
receiving upgrade shutdown command. Contributed by Eric Payne.
Repository: hadoop
Updated Branches:
refs/heads/trunk b78b4a153 -> 6bbf9fdd0
HDFS-7533. Datanode sometimes does not shutdown on receiving upgrade shutdown command. Contributed by Eric Payne.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6bbf9fdd
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6bbf9fdd
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6bbf9fdd
Branch: refs/heads/trunk
Commit: 6bbf9fdd041d2413dd78e2bce51abae15f3334c2
Parents: b78b4a1
Author: Kihwal Lee <ki...@apache.org>
Authored: Mon Jan 12 15:36:55 2015 -0600
Committer: Kihwal Lee <ki...@apache.org>
Committed: Mon Jan 12 15:36:55 2015 -0600
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../hadoop/hdfs/server/datanode/DataNode.java | 10 +++++++---
.../hdfs/server/datanode/TestDataNodeExit.java | 16 ++++++++++++++++
3 files changed, 26 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6bbf9fdd/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index f83ac65..05cb745 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -673,6 +673,9 @@ Release 2.7.0 - UNRELEASED
HDFS-7596. NameNode should prune dead storages from storageMap.
(Arpit Agarwal via cnauroth)
+ HDFS-7533. Datanode sometimes does not shutdown on receiving upgrade
+ shutdown command (Eric Payne via kihwal)
+
Release 2.6.1 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6bbf9fdd/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
index 899a729..d5d8429 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
@@ -1618,9 +1618,13 @@ public class DataNode extends ReconfigurableBase
// in order to avoid any further acceptance of requests, but the peers
// for block writes are not closed until the clients are notified.
if (dataXceiverServer != null) {
- xserver.sendOOBToPeers();
- ((DataXceiverServer) this.dataXceiverServer.getRunnable()).kill();
- this.dataXceiverServer.interrupt();
+ try {
+ xserver.sendOOBToPeers();
+ ((DataXceiverServer) this.dataXceiverServer.getRunnable()).kill();
+ this.dataXceiverServer.interrupt();
+ } catch (Throwable e) {
+ // Ignore, since the out of band messaging is advisory.
+ }
}
// Interrupt the checkDiskErrorThread and terminate it.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6bbf9fdd/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeExit.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeExit.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeExit.java
index 9d59496..c067b07 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeExit.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeExit.java
@@ -21,6 +21,7 @@ package org.apache.hadoop.hdfs.server.datanode;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.IOException;
@@ -32,6 +33,7 @@ import org.apache.hadoop.hdfs.MiniDFSNNTopology;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.mockito.Mockito;
/**
* Tests if DataNode process exits if all Block Pool services exit.
@@ -88,4 +90,18 @@ public class TestDataNodeExit {
stopBPServiceThreads(2, dn);
assertFalse("DataNode should exit", dn.isDatanodeUp());
}
+
+ @Test
+ 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();
+ dn.xserver = spyXserver;
+ try {
+ dn.shutdown();
+ } catch (Throwable t) {
+ fail("DataNode shutdown should not have thrown exception " + t);
+ }
+ }
}