From f6bfe986394ba6ff8daf164d6da7da7cd57478df Mon Sep 17 00:00:00 2001 From: Colin McCabe Date: Fri, 31 Jan 2014 23:08:23 +0000 Subject: [PATCH] HDFS-5859. DataNode#checkBlockToken should check block tokens even if security is not enabled (cmccabe) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1563328 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/hdfs/server/datanode/DataNode.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 6ae103f7c42..490dc9beced 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -303,6 +303,9 @@ Release 2.4.0 - UNRELEASED HDFS-5804. HDFS NFS Gateway fails to mount and proxy when using Kerberos. (Abin Shahab via jing9) + HDFS-5859. DataNode#checkBlockToken should check block tokens even if + security is not enabled. (cmccabe) + OPTIMIZATIONS HDFS-5790. LeaseManager.findPath is very slow when many leases need recovery 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 6bf98b69465..1dabd4a94c6 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 @@ -1194,7 +1194,7 @@ public HdfsBlocksMetadata getHdfsBlocksMetadata(List blocks, private void checkBlockToken(ExtendedBlock block, Token token, AccessMode accessMode) throws IOException { - if (isBlockTokenEnabled && UserGroupInformation.isSecurityEnabled()) { + if (isBlockTokenEnabled) { BlockTokenIdentifier id = new BlockTokenIdentifier(); ByteArrayInputStream buf = new ByteArrayInputStream(token.getIdentifier()); DataInputStream in = new DataInputStream(buf);