From 7e6624c218f759ca0a6cf58c6fff177e2a6ecd5b Mon Sep 17 00:00:00 2001 From: Arpit Agarwal Date: Tue, 3 Mar 2015 10:55:22 -0800 Subject: [PATCH] HDFS-7757. Misleading error messages in FSImage.java. (Contributed by Brahma Reddy Battula) --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../org/apache/hadoop/hdfs/server/namenode/FSImage.java | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 354b99b121d..df5520e9015 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -768,6 +768,9 @@ Release 2.7.0 - UNRELEASED HDFS-7871. NameNodeEditLogRoller can keep printing "Swallowing exception" message. (jing9) + HDFS-7757. Misleading error messages in FSImage.java. (Brahma Reddy Battula + via Arpit Agarwal) + BREAKDOWN OF HDFS-7584 SUBTASKS AND RELATED JIRAS HDFS-7720. Quota by Storage Type API, tools and ClientNameNode diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java index 56d946f7971..c108886d907 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java @@ -887,7 +887,7 @@ private static void updateCountForQuotaRecursively(BlockStoragePolicySuite bsps, final long namespace = counts.getNameSpace() - parentNamespace; final long nsQuota = q.getNameSpace(); if (Quota.isViolated(nsQuota, namespace)) { - LOG.error("BUG: Namespace quota violation in image for " + LOG.warn("Namespace quota violation in image for " + dir.getFullPathName() + " quota = " + nsQuota + " < consumed = " + namespace); } @@ -895,7 +895,7 @@ private static void updateCountForQuotaRecursively(BlockStoragePolicySuite bsps, final long ssConsumed = counts.getStorageSpace() - parentStoragespace; final long ssQuota = q.getStorageSpace(); if (Quota.isViolated(ssQuota, ssConsumed)) { - LOG.error("BUG: Storagespace quota violation in image for " + LOG.warn("Storagespace quota violation in image for " + dir.getFullPathName() + " quota = " + ssQuota + " < consumed = " + ssConsumed); } @@ -907,7 +907,7 @@ private static void updateCountForQuotaRecursively(BlockStoragePolicySuite bsps, parentTypeSpaces.get(t); final long typeQuota = q.getTypeSpaces().get(t); if (Quota.isViolated(typeQuota, typeSpace)) { - LOG.error("BUG: Storage type quota violation in image for " + LOG.warn("Storage type quota violation in image for " + dir.getFullPathName() + " type = " + t.toString() + " quota = " + typeQuota + " < consumed " + typeSpace);