Repository: hadoop Updated Branches: refs/heads/branch-2 60e65a3e5 -> 9e7f8cbf9
HDFS-11592. Closing a file has a wasteful preconditions in NameNode. Contributed by Eric Badger (cherry picked from commit e5f0622a6f40706d360d45200c8f259c79046438) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9e7f8cbf Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9e7f8cbf Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9e7f8cbf Branch: refs/heads/branch-2 Commit: 9e7f8cbf9ac52e5a3c22881e56b0bb513cd827dd Parents: 60e65a3 Author: Mingliang Liu <[email protected]> Authored: Thu Mar 30 15:44:06 2017 -0700 Committer: Mingliang Liu <[email protected]> Committed: Thu Mar 30 15:44:44 2017 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hdfs/server/namenode/INodeFile.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e7f8cbf/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java index ef48aa4..0ea4a9c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java @@ -216,9 +216,11 @@ public class INodeFile extends INodeWithAdditionalFields for (int i = 0; i < blocks.length; i++) { final String err = checkBlockComplete(blocks, i, numCommittedAllowed, minReplication); - Preconditions.checkState(err == null, - "Unexpected block state: %s, file=%s (%s), blocks=%s (i=%s)", - err, this, getClass().getSimpleName(), Arrays.asList(blocks), i); + if(err != null) { + throw new IllegalStateException(String.format("Unexpected block state: " + + "%s, file=%s (%s), blocks=%s (i=%s)", err, this, + getClass().getSimpleName(), Arrays.asList(blocks), i)); + } } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
