HDFS-5956. A file size is multiplied by the replication factor in 'hdfs oiv -p FileDistribution' option. Contributed by Akira Ajisaka.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1573078 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
44c5c778f0
commit
fec1e2eed9
|
@ -511,6 +511,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)
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue