HDFS-12584. [READ] Fix errors in image generation tool from latest rebase
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/50c8b91c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/50c8b91c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/50c8b91c Branch: refs/heads/HDFS-9806 Commit: 50c8b91cf4ca4506e176c24331c234c7b04b5af4 Parents: 7eabf01 Author: Virajith Jalaparti <viraj...@apache.org> Authored: Tue Oct 3 14:44:17 2017 -0700 Committer: Virajith Jalaparti <viraj...@apache.org> Committed: Fri Dec 1 18:16:58 2017 -0800 ---------------------------------------------------------------------- hadoop-tools/hadoop-fs2img/pom.xml | 4 +-- .../hdfs/server/namenode/RandomTreeWalk.java | 28 +++++++++----------- 2 files changed, 14 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/50c8b91c/hadoop-tools/hadoop-fs2img/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-fs2img/pom.xml b/hadoop-tools/hadoop-fs2img/pom.xml index 36096b7..e1411f8 100644 --- a/hadoop-tools/hadoop-fs2img/pom.xml +++ b/hadoop-tools/hadoop-fs2img/pom.xml @@ -17,12 +17,12 @@ <parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-project</artifactId> - <version>3.0.0-alpha3-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <relativePath>../../hadoop-project</relativePath> </parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-fs2img</artifactId> - <version>3.0.0-alpha3-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <description>fs2img</description> <name>fs2img</name> <packaging>jar</packaging> http://git-wip-us.apache.org/repos/asf/hadoop/blob/50c8b91c/hadoop-tools/hadoop-fs2img/src/test/java/org/apache/hadoop/hdfs/server/namenode/RandomTreeWalk.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-fs2img/src/test/java/org/apache/hadoop/hdfs/server/namenode/RandomTreeWalk.java b/hadoop-tools/hadoop-fs2img/src/test/java/org/apache/hadoop/hdfs/server/namenode/RandomTreeWalk.java index c82c489..d002e4a 100644 --- a/hadoop-tools/hadoop-fs2img/src/test/java/org/apache/hadoop/hdfs/server/namenode/RandomTreeWalk.java +++ b/hadoop-tools/hadoop-fs2img/src/test/java/org/apache/hadoop/hdfs/server/namenode/RandomTreeWalk.java @@ -113,22 +113,18 @@ public class RandomTreeWalk extends TreeWalk { final long len = isDir ? 0 : r.nextInt(Integer.MAX_VALUE); final int nblocks = 0 == len ? 0 : (((int)((len - 1) / blocksize)) + 1); BlockLocation[] blocks = genBlocks(r, nblocks, blocksize, len); - try { - return new LocatedFileStatus(new FileStatus( - len, /* long length, */ - isDir, /* boolean isdir, */ - 1, /* int block_replication, */ - blocksize, /* long blocksize, */ - 0L, /* long modification_time, */ - 0L, /* long access_time, */ - null, /* FsPermission permission, */ - "hadoop", /* String owner, */ - "hadoop", /* String group, */ - name), /* Path path */ - blocks); - } catch (IOException e) { - throw new RuntimeException(e); - } + return new LocatedFileStatus(new FileStatus( + len, /* long length, */ + isDir, /* boolean isdir, */ + 1, /* int block_replication, */ + blocksize, /* long blocksize, */ + 0L, /* long modification_time, */ + 0L, /* long access_time, */ + null, /* FsPermission permission, */ + "hadoop", /* String owner, */ + "hadoop", /* String group, */ + name), /* Path path */ + blocks); } BlockLocation[] genBlocks(Random r, int nblocks, int blocksize, long len) { --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
