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 vi...@apache.org on 2016/02/03 06:05:09 UTC

[1/3] hadoop git commit: HDFS-9739. DatanodeStorage.isValidStorageId() is broken (Contributed by Mingliang Liu)

Repository: hadoop
Updated Branches:
  refs/heads/branch-2 8577c0b6a -> e8a9a69a2
  refs/heads/branch-2.8 847158811 -> e045856ed
  refs/heads/trunk 04375756a -> d6b1acb94


HDFS-9739. DatanodeStorage.isValidStorageId() is broken (Contributed by Mingliang Liu)


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

Branch: refs/heads/trunk
Commit: d6b1acb940180befeb4c855d0e4a339dbc035e7d
Parents: 0437575
Author: Vinayakumar B <vi...@apache.org>
Authored: Wed Feb 3 10:33:33 2016 +0530
Committer: Vinayakumar B <vi...@apache.org>
Committed: Wed Feb 3 10:33:33 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/d6b1acb9/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/d6b1acb9/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 61b9544..4eabce5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -2690,6 +2690,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


[3/3] hadoop git commit: HDFS-9739. DatanodeStorage.isValidStorageId() is broken (Contributed by Mingliang Liu)

Posted by vi...@apache.org.
HDFS-9739. DatanodeStorage.isValidStorageId() is broken (Contributed by Mingliang Liu)

(cherry picked from commit d6b1acb940180befeb4c855d0e4a339dbc035e7d)
(cherry picked from commit e8a9a69a2756f998f08c7b8452b84fd309921443)


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

Branch: refs/heads/branch-2.8
Commit: e045856eda017a427eea43df187d418375c0e2b4
Parents: 8471588
Author: Vinayakumar B <vi...@apache.org>
Authored: Wed Feb 3 10:33:33 2016 +0530
Committer: Vinayakumar B <vi...@apache.org>
Committed: Wed Feb 3 10:34:35 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/e045856e/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/e045856e/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 4a5a047..4010d10 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1707,6 +1707,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


[2/3] hadoop git commit: HDFS-9739. DatanodeStorage.isValidStorageId() is broken (Contributed by Mingliang Liu)

Posted by vi...@apache.org.
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 <vi...@apache.org>
Authored: Wed Feb 3 10:33:33 2016 +0530
Committer: Vinayakumar B <vi...@apache.org>
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