From 6a0aeea60f0d715ff62aeed8799f3613594a82e9 Mon Sep 17 00:00:00 2001 From: Masatake Iwasaki Date: Thu, 7 May 2020 12:00:47 +0900 Subject: [PATCH] HADOOP-17025. Fix invalid metastore configuration in S3GuardTool tests. (#1994) (cherry picked from commit 99840aaba662e7bb6187206b74e35132102a3b38) --- .../hadoop/fs/s3a/s3guard/AbstractS3GuardToolTestBase.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/s3guard/AbstractS3GuardToolTestBase.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/s3guard/AbstractS3GuardToolTestBase.java index 3fda0eb014..3e187a1515 100644 --- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/s3guard/AbstractS3GuardToolTestBase.java +++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/s3guard/AbstractS3GuardToolTestBase.java @@ -54,7 +54,6 @@ import org.apache.hadoop.util.ExitUtil; import org.apache.hadoop.util.StringUtils; -import static org.apache.hadoop.fs.s3a.Constants.METADATASTORE_AUTHORITATIVE; import static org.apache.hadoop.fs.s3a.Constants.S3GUARD_DDB_REGION_KEY; import static org.apache.hadoop.fs.s3a.Constants.S3GUARD_DDB_TABLE_CREATE_KEY; import static org.apache.hadoop.fs.s3a.Constants.S3GUARD_DDB_TABLE_NAME_KEY; @@ -188,7 +187,7 @@ public void setup() throws Exception { conf.set(S3_METADATA_STORE_IMPL, S3GUARD_METASTORE_NULL); URI fsUri = fs.getUri(); S3AUtils.setBucketOption(conf,fsUri.getHost(), - METADATASTORE_AUTHORITATIVE, + S3_METADATA_STORE_IMPL, S3GUARD_METASTORE_NULL); rawFs = (S3AFileSystem) FileSystem.newInstance(fsUri, conf); }