commit 102ee5b4855855c7e2c5466da538626f23a6e6c6
author Todd Lipcon <todd@apache.org> Sat May 14 04:27:59 2011 +0000
committer Todd Lipcon <todd@apache.org> Sat May 14 04:27:59 2011 +0000
tree 5d60df3ecb7459df850a5edecda119c326f1774b
parent 2e445ac96d96cbad7b760358fa780e0f3079b714

HDFS-1835. DataNode should not depend on SHA1PRNG secure random generator to generate a storage ID. Contributed by John Carrino.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hdfs/trunk@1102948 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

diff --git a/CHANGES.txt b/CHANGES.txt
index b727dec..150df40 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -797,6 +797,9 @@
     HDFS-1052. HDFS Federation - Merge of umbrella jira changes from
     HDFS-1052 branch into trunk.
 
+    HDFS-1835. DataNode should not depend on SHA1PRNG secure random generator
+    to generate a storage ID. (John Carrino via todd)
+
   OPTIMIZATIONS
 
     HDFS-1140. Speedup INode.getPathComponents. (Dmytro Molkov via shv)

src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java

diff --git a/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java b/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
index a01ac9b..920c685 100644
--- a/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
+++ b/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
@@ -1583,13 +1583,7 @@
       LOG.warn("Could not find ip address of \"default\" inteface.");
     }
     
-    int rand = 0;
-    try {
-      rand = SecureRandom.getInstance("SHA1PRNG").nextInt(Integer.MAX_VALUE);
-    } catch (NoSuchAlgorithmException e) {
-      LOG.warn("Could not use SecureRandom");
-      rand = R.nextInt(Integer.MAX_VALUE);
-    }
+    int rand = new SecureRandom().nextInt(Integer.MAX_VALUE);
     return "DS-" + rand + "-" + ip + "-" + port + "-"
         + System.currentTimeMillis();
   }