Author: wheat9
Date: Fri Feb 28 21:10:23 2014
New Revision: 1573081
URL: http://svn.apache.org/r1573081
Log:
HDFS-5956. Merge change r1573078 from trunk.
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/FileDistributionCalculator.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1573081&r1=1573080&r2=1573081&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Fri Feb 28 21:10:23 2014
@@ -264,6 +264,9 @@ Release 2.4.0 - UNRELEASED
HDFS-5821. TestHDFSCLI fails for user names with the dash character.
(Gera Shegalov via Arpit Agarwal)
+ HDFS-5956. A file size is multiplied by the replication factor in 'hdfs oiv
+ -p FileDistribution' option. (Akira Ajisaka via wheat9)
+
BREAKDOWN OF HDFS-5698 SUBTASKS AND RELATED JIRAS
HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9)
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/FileDistributionCalculator.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/FileDistributionCalculator.java?rev=1573081&r1=1573080&r2=1573081&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/FileDistributionCalculator.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/FileDistributionCalculator.java
Fri Feb 28 21:10:23 2014
@@ -123,10 +123,10 @@ final class FileDistributionCalculator {
totalBlocks += f.getBlocksCount();
long fileSize = 0;
for (BlockProto b : f.getBlocksList()) {
- fileSize += b.getNumBytes() * f.getReplication();
+ fileSize += b.getNumBytes();
}
maxFileSize = Math.max(fileSize, maxFileSize);
- totalSpace += fileSize;
+ totalSpace += fileSize * f.getReplication();
int bucket = fileSize > maxSize ? distribution.length - 1 : (int) Math
.ceil((double)fileSize / steps);
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java?rev=1573081&r1=1573080&r2=1573081&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java
Fri Feb 28 21:10:23 2014
@@ -28,6 +28,8 @@ import java.io.PrintWriter;
import java.io.RandomAccessFile;
import java.io.StringReader;
import java.io.StringWriter;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -241,7 +243,7 @@ public class TestOfflineImageViewer {
}
@Test
- public void testFileDistributionVisitor() throws IOException {
+ public void testFileDistributionCalculator() throws IOException {
StringWriter output = new StringWriter();
PrintWriter o = new PrintWriter(output);
new FileDistributionCalculator(new Configuration(), 0, 0, o)
@@ -250,10 +252,29 @@ public class TestOfflineImageViewer {
Pattern p = Pattern.compile("totalFiles = (\\d+)\n");
Matcher matcher = p.matcher(output.getBuffer());
-
assertTrue(matcher.find() && matcher.groupCount() == 1);
int totalFiles = Integer.parseInt(matcher.group(1));
- assertEquals(totalFiles, NUM_DIRS * FILES_PER_DIR);
+ assertEquals(NUM_DIRS * FILES_PER_DIR, totalFiles);
+
+ p = Pattern.compile("totalDirectories = (\\d+)\n");
+ matcher = p.matcher(output.getBuffer());
+ assertTrue(matcher.find() && matcher.groupCount() == 1);
+ int totalDirs = Integer.parseInt(matcher.group(1));
+ // totalDirs includes root directory
+ assertEquals(NUM_DIRS + 1, totalDirs);
+
+ FileStatus maxFile = Collections.max(writtenFiles.values(),
+ new Comparator<FileStatus>() {
+ @Override
+ public int compare(FileStatus first, FileStatus second) {
+ return first.getLen() < second.getLen() ? -1 :
+ ((first.getLen() == second.getLen()) ? 0 : 1);
+ }
+ });
+ p = Pattern.compile("maxFileSize = (\\d+)\n");
+ matcher = p.matcher(output.getBuffer());
+ assertTrue(matcher.find() && matcher.groupCount() == 1);
+ assertEquals(maxFile.getLen(), Long.parseLong(matcher.group(1)));
}
@Test
