Return-Path: X-Original-To: apmail-hadoop-hdfs-issues-archive@minotaur.apache.org Delivered-To: apmail-hadoop-hdfs-issues-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2182111562 for ; Wed, 18 Jun 2014 06:00:48 +0000 (UTC) Received: (qmail 72818 invoked by uid 500); 18 Jun 2014 06:00:47 -0000 Delivered-To: apmail-hadoop-hdfs-issues-archive@hadoop.apache.org Received: (qmail 72706 invoked by uid 500); 18 Jun 2014 06:00:47 -0000 Mailing-List: contact hdfs-issues-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hdfs-issues@hadoop.apache.org Delivered-To: mailing list hdfs-issues@hadoop.apache.org Received: (qmail 72557 invoked by uid 99); 18 Jun 2014 06:00:47 -0000 Received: from arcas.apache.org (HELO arcas.apache.org) (140.211.11.28) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Jun 2014 06:00:47 +0000 Date: Wed, 18 Jun 2014 06:00:47 +0000 (UTC) From: "Amir Langer (JIRA)" To: hdfs-issues@hadoop.apache.org Message-ID: In-Reply-To: References: Subject: [jira] [Updated] (HDFS-6552) add DN storage to a BlockInfo will not replace the different storage from same DN MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 [ https://issues.apache.org/jira/browse/HDFS-6552?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Amir Langer updated HDFS-6552: ------------------------------ Target Version/s: 2.4.0 Status: Patch Available (was: Open) added tests that cover this scenario + fixed code. - Done on current branch-2 > add DN storage to a BlockInfo will not replace the different storage from same DN > --------------------------------------------------------------------------------- > > Key: HDFS-6552 > URL: https://issues.apache.org/jira/browse/HDFS-6552 > Project: Hadoop HDFS > Issue Type: Bug > Components: namenode > Affects Versions: 2.4.0, 2.3.0 > Reporter: Amir Langer > Priority: Trivial > Fix For: Heterogeneous Storage (HDFS-2832) > > > In BlockInfo - addStorage code looks wrong. > At line 10 (below) - we remove the storage we're about to add from the list of storages, then add it. > If the aim was to replace the different storage that was there the line should have been: > {code:java} > removeStorage(getStorageInfo(idx)); > {code} > method code: > {code:java} > 1 boolean addStorage(DatanodeStorageInfo storage) { > 2 boolean added = true; > 3 int idx = findDatanode(storage.getDatanodeDescriptor()); > 4 if(idx >= 0) { > 5 if (getStorageInfo(idx) == storage) { // the storage is already there > 6 return false; > 7 } else { > 8 // The block is on the DN but belongs to a different storage. > 9 // Update our state. > 10 removeStorage(storage); > 11 added = false; // Just updating storage. Return false. > 12 } > 13 } > 14 // find the last null node > 15 int lastNode = ensureCapacity(1); > 16 setStorageInfo(lastNode, storage); > 17 setNext(lastNode, null); > 18 setPrevious(lastNode, null); > 19 return added; > 20} > {code} -- This message was sent by Atlassian JIRA (v6.2#6252)