HDFS-7932. Speed up the shutdown of datanode during rolling upgrade. …

…Contributed by Kihwal Lee.
apache · Mar 19, 2015 · 61a4c7f · 61a4c7f
1 parent 1ccbc29
commit 61a4c7f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1216,6 +1216,8 @@ Release 2.7.0 - UNRELEASED
 
  HDFS-7816. Unable to open webhdfs paths with "+". (wheat9 via kihwal)
 
+ HDFS-7932. Speed up the shutdown of datanode during rolling upgrade.(kihwal)
+
  BREAKDOWN OF HDFS-7584 SUBTASKS AND RELATED JIRAS
 
  HDFS-7720. Quota by Storage Type API, tools and ClientNameNode

diff --git a/...fs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java b/...fs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
@@ -1724,8 +1724,9 @@ public void shutdown() {
  // termination of receiver threads.
  if (!this.shutdownForUpgrade ||
  (this.shutdownForUpgrade && (Time.monotonicNow() - timeNotified
- > 2500))) {
+ > 1000))) {
  this.threadGroup.interrupt();
+ break;
  }
  LOG.info("Waiting for threadgroup to exit, active threads is " +
  this.threadGroup.activeCount());
@@ -1736,8 +1737,8 @@ public void shutdown() {
  Thread.sleep(sleepMs);
  } catch (InterruptedException e) {}
  sleepMs = sleepMs * 3 / 2; // exponential backoff
- if (sleepMs > 1000) {
- sleepMs = 1000;
+ if (sleepMs > 200) {
+ sleepMs = 200;
  }
  }
  this.threadGroup = null;