Return-Path: 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 BB01A18177 for ; Wed, 3 Feb 2016 05:05:10 +0000 (UTC) Received: (qmail 97516 invoked by uid 500); 3 Feb 2016 05:05:10 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 97451 invoked by uid 500); 3 Feb 2016 05:05:10 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 97424 invoked by uid 99); 3 Feb 2016 05:05:09 -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; Wed, 03 Feb 2016 05:05:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8D291DFD7D; Wed, 3 Feb 2016 05:05:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vinayakumarb@apache.org To: common-commits@hadoop.apache.org Date: Wed, 03 Feb 2016 05:05:10 -0000 Message-Id: <5511007a2e2d4f63a8fff020a0f0456f@git.apache.org> In-Reply-To: <511e6ba0225e4c139f62cd1f866e5a63@git.apache.org> References: <511e6ba0225e4c139f62cd1f866e5a63@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] hadoop git commit: HDFS-9739. DatanodeStorage.isValidStorageId() is broken (Contributed by Mingliang Liu) HDFS-9739. DatanodeStorage.isValidStorageId() is broken (Contributed by Mingliang Liu) (cherry picked from commit d6b1acb940180befeb4c855d0e4a339dbc035e7d) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e8a9a69a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e8a9a69a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e8a9a69a Branch: refs/heads/branch-2 Commit: e8a9a69a2756f998f08c7b8452b84fd309921443 Parents: 8577c0b Author: Vinayakumar B Authored: Wed Feb 3 10:33:33 2016 +0530 Committer: Vinayakumar B Committed: Wed Feb 3 10:33:55 2016 +0530 ---------------------------------------------------------------------- .../org/apache/hadoop/hdfs/server/protocol/DatanodeStorage.java | 1 + hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e8a9a69a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/protocol/DatanodeStorage.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/protocol/DatanodeStorage.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/protocol/DatanodeStorage.java index 770c41b..de4ff25 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/protocol/DatanodeStorage.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/protocol/DatanodeStorage.java @@ -93,6 +93,7 @@ public class DatanodeStorage { try { // Attempt to parse the UUID. if (storageID != null && storageID.indexOf(STORAGE_ID_PREFIX) == 0) { + UUID.fromString(storageID.substring(STORAGE_ID_PREFIX.length())); return true; } } catch (IllegalArgumentException ignored) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/e8a9a69a/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 2a14a29..11a3191 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1786,6 +1786,9 @@ Release 2.8.0 - UNRELEASED HDFS-9718. HAUtil#getConfForOtherNodes should unset independent generic keys before initialize (DENG FEI via vinayakumarb) + HDFS-9739. DatanodeStorage.isValidStorageId() is broken + (Mingliang Liu via vinayakumarb) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES