This is an automated email from the ASF dual-hosted git repository. xyao pushed a commit to branch HDDS-4 in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit ddaef67181997c2830f77a972ebbad8f4a50ed70 Author: Bharat Viswanadham <bha...@apache.org> AuthorDate: Fri Dec 21 13:26:34 2018 -0800 HDDS-937. Create an S3 Auth Table. Contributed by Dinesh Chitlangia. --- .../java/org/apache/hadoop/ozone/om/OMMetadataManager.java | 7 +++++++ .../org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java | 14 ++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java index 94ff0db..ec230cd 100644 --- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java +++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java @@ -254,6 +254,7 @@ public interface OMMetadataManager { Table<byte[], byte[]> getS3Table(); /** +<<<<<<< HEAD * Returns the DB key name of a multipart upload key in OM metadata store. * * @param volume - volume name @@ -274,6 +275,12 @@ public interface OMMetadataManager { Table<String, OmMultipartKeyInfo> getMultipartInfoTable(); /** + * Gets the S3 Secrets table. + * @return Table + */ + Table<byte[], byte[]> getS3SecretTable(); + + /** * Returns number of rows in a table. This should not be used for very * large tables. * @param table diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java index bfab48c..7a75ec8 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java @@ -59,6 +59,8 @@ import org.eclipse.jetty.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.ws.rs.HEAD; + /** * Ozone metadata manager interface. */ @@ -89,6 +91,8 @@ public class OmMetadataManagerImpl implements OMMetadataManager { * |-------------------------------------------------------------------| * | s3Table | s3BucketName -> /volumeName/bucketName | * |-------------------------------------------------------------------| + * | s3SecretTable | s3g_access_key_id -> s3Secret | + * |-------------------------------------------------------------------| */ private static final String USER_TABLE = "userTable"; @@ -99,6 +103,7 @@ public class OmMetadataManagerImpl implements OMMetadataManager { private static final String OPEN_KEY_TABLE = "openKeyTable"; private static final String S3_TABLE = "s3Table"; private static final String MULTIPARTINFO_TABLE = "multipartInfoTable"; + private static final String S3_SECRET_TABLE = "s3SecretTable"; private DBStore store; @@ -113,6 +118,7 @@ public class OmMetadataManagerImpl implements OMMetadataManager { private Table openKeyTable; private Table s3Table; private Table<String, OmMultipartKeyInfo> multipartInfoTable; + private Table s3SecretTable; public OmMetadataManagerImpl(OzoneConfiguration conf) throws IOException { this.lock = new OzoneManagerLock(conf); @@ -195,6 +201,7 @@ public class OmMetadataManagerImpl implements OMMetadataManager { .addTable(OPEN_KEY_TABLE) .addTable(S3_TABLE) .addTable(MULTIPARTINFO_TABLE) + .addTable(S3_SECRET_TABLE) .addCodec(OmKeyInfo.class, new OmKeyInfoCodec()) .addCodec(OmBucketInfo.class, new OmBucketInfoCodec()) .addCodec(OmVolumeArgs.class, new OmVolumeArgsCodec()) @@ -233,6 +240,8 @@ public class OmMetadataManagerImpl implements OMMetadataManager { String.class, OmMultipartKeyInfo.class); checkTableStatus(multipartInfoTable, MULTIPARTINFO_TABLE); + s3SecretTable = this.store.getTable(S3_SECRET_TABLE); + checkTableStatus(s3SecretTable, S3_SECRET_TABLE); } } @@ -655,4 +664,9 @@ public class OmMetadataManagerImpl implements OMMetadataManager { } return count; } + + @Override + public Table<byte[], byte[]> getS3SecretTable() { + return s3SecretTable; + } } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org