Return-Path: 
 <common-commits-return-31443-apmail-hadoop-common-commits-archive=hadoop.apache.org@hadoop.apache.org>
X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org
Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 998D110E75
	for <apmail-hadoop-common-commits-archive@www.apache.org>;
 Fri, 13 Feb 2015 23:13:58 +0000 (UTC)
Received: (qmail 16242 invoked by uid 500); 13 Feb 2015 23:11:48 -0000
Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org
Received: (qmail 16202 invoked by uid 500); 13 Feb 2015 23:11:48 -0000
Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:common-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:common-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:common-commits@hadoop.apache.org>
List-Id: <common-commits.hadoop.apache.org>
Reply-To: common-dev@hadoop.apache.org
Delivered-To: mailing list common-commits@hadoop.apache.org
Received: (qmail 16193 invoked by uid 99); 13 Feb 2015 23:11:48 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Feb 2015 23:11:48 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 00DA5E03A1; Fri, 13 Feb 2015 23:11:34 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: cmccabe@apache.org
To: common-commits@hadoop.apache.org
Message-Id: <d66a4d6d7c074ed28576644ecbf78b6e@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: hadoop git commit: HDFS-7430 backport addendum. Add missing change.
 (cmccabe)
Date: Fri, 13 Feb 2015 23:11:34 +0000 (UTC)

Repository: hadoop
Updated Branches:
  refs/heads/branch-2 a8c6a96f3 -> a54b4a7fc


HDFS-7430 backport addendum.  Add missing change. (cmccabe)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a54b4a7f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a54b4a7f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a54b4a7f

Branch: refs/heads/branch-2
Commit: a54b4a7fc648ac1dbf099ce85519a48fcff7ec70
Parents: a8c6a96
Author: Colin Patrick Mccabe <cmccabe@cloudera.com>
Authored: Fri Feb 13 15:11:14 2015 -0800
Committer: Colin Patrick Mccabe <cmccabe@cloudera.com>
Committed: Fri Feb 13 15:11:14 2015 -0800

----------------------------------------------------------------------
 .../main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java  | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/a54b4a7f/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 93e64d2..b6a84c3 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
@@ -382,6 +382,7 @@ public class DataNode extends ReconfigurableBase
            final List<StorageLocation> dataDirs,
            final SecureResources resources) throws IOException {
     super(conf);
+    this.blockScanner = new BlockScanner(this, conf);
     this.lastDiskErrorCheck = 0;
     this.maxNumberOfBlocksToLog = conf.getLong(DFS_MAX_NUM_BLOCKS_TO_LOG_KEY,
         DFS_MAX_NUM_BLOCKS_TO_LOG_DEFAULT);