HADOOP-15416. Clear error message in S3Guard diff if source not found. Contributed by Gabor Bota.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/55fad6a3 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/55fad6a3 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/55fad6a3 Branch: refs/heads/HDFS-12943 Commit: 55fad6a3de3125d9e7e2e9a5f8fa5b1b22a1de60 Parents: 6432128 Author: Sean Mackrory <[email protected]> Authored: Fri Jun 22 11:36:36 2018 -0600 Committer: Sean Mackrory <[email protected]> Committed: Fri Jun 22 11:36:56 2018 -0600 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/fs/s3a/s3guard/S3GuardTool.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/55fad6a3/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/s3guard/S3GuardTool.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/s3guard/S3GuardTool.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/s3guard/S3GuardTool.java index fbffba9..ac10e08 100644 --- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/s3guard/S3GuardTool.java +++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/s3guard/S3GuardTool.java @@ -805,7 +805,9 @@ public abstract class S3GuardTool extends Configured implements Tool { */ private void compareDir(FileStatus msDir, FileStatus s3Dir, PrintStream out) throws IOException { - Preconditions.checkArgument(!(msDir == null && s3Dir == null)); + Preconditions.checkArgument(!(msDir == null && s3Dir == null), + "The path does not exist in metadata store and on s3."); + if (msDir != null && s3Dir != null) { Preconditions.checkArgument(msDir.getPath().equals(s3Dir.getPath()), String.format("The path from metadata store and s3 are different:" + --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
