From 1436e89fb7c628804da7c1c678b340e9bda5dd06 Mon Sep 17 00:00:00 2001 From: Konstantin V Shvachko Date: Wed, 5 Nov 2014 09:39:02 -0800 Subject: [PATCH] HDFS-7335. Redundant checkOperation() in FSN.analyzeFileState(). Contributed by Milan Desai. --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index cbac594fb57..fb42f46ad24 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -81,6 +81,9 @@ Release 2.7.0 - UNRELEASED HDFS-7357. FSNamesystem.checkFileProgress should log file path. (Tsz Wo Nicholas Sze via wheat9) + HDFS-7335. Redundant checkOperation() in FSN.analyzeFileState(). + (Milan Desai via shv) + OPTIMIZATIONS BUG FIXES diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java index 900bac18267..1477eb5b896 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java @@ -3294,7 +3294,6 @@ public class FSNamesystem implements Namesystem, FSClusterStats, checkBlock(previous); onRetryBlock[0] = null; - checkOperation(OperationCategory.WRITE); checkNameNodeSafeMode("Cannot add block to " + src); // have we exceeded the configured limit of fs objects.