Repository: hadoop Updated Branches: refs/heads/HDDS-4 38861ebd2 -> dbdd77eb9
HDDS-937. Create an S3 Auth Table. Contributed by Dinesh Chitlangia. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dbdd77eb Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dbdd77eb Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dbdd77eb Branch: refs/heads/HDDS-4 Commit: dbdd77eb95ea68e2c4ea81bb92e5a6b461ac2c8e Parents: 38861eb Author: Bharat Viswanadham <[email protected]> Authored: Fri Dec 21 13:26:34 2018 -0800 Committer: Bharat Viswanadham <[email protected]> Committed: Fri Dec 21 13:26:34 2018 -0800 ---------------------------------------------------------------------- .../org/apache/hadoop/ozone/om/OMMetadataManager.java | 7 +++++++ .../apache/hadoop/ozone/om/OmMetadataManagerImpl.java | 13 +++++++++++++ 2 files changed, 20 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/dbdd77eb/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java ---------------------------------------------------------------------- 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 8989a68..6f7bd5f 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 @@ -247,6 +247,13 @@ public interface OMMetadataManager { */ Table<byte[], byte[]> getS3Table(); + + /** + * 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. http://git-wip-us.apache.org/repos/asf/hadoop/blob/dbdd77eb/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java ---------------------------------------------------------------------- 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 706a10f..e19a61a 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 @@ -91,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"; @@ -100,6 +102,7 @@ public class OmMetadataManagerImpl implements OMMetadataManager { private static final String DELETED_TABLE = "deletedTable"; private static final String OPEN_KEY_TABLE = "openKeyTable"; private static final String S3_TABLE = "s3Table"; + private static final String S3_SECRET_TABLE = "s3SecretTable"; private DBStore store; @@ -113,6 +116,7 @@ public class OmMetadataManagerImpl implements OMMetadataManager { private Table deletedTable; private Table openKeyTable; private Table s3Table; + private Table s3SecretTable; public OmMetadataManagerImpl(OzoneConfiguration conf) throws IOException { this.lock = new OzoneManagerLock(conf); @@ -188,6 +192,7 @@ public class OmMetadataManagerImpl implements OMMetadataManager { .addTable(DELETED_TABLE) .addTable(OPEN_KEY_TABLE) .addTable(S3_TABLE) + .addTable(S3_SECRET_TABLE) .build(); userTable = this.store.getTable(USER_TABLE); @@ -210,6 +215,9 @@ public class OmMetadataManagerImpl implements OMMetadataManager { s3Table = this.store.getTable(S3_TABLE); checkTableStatus(s3Table, S3_TABLE); + + s3SecretTable = this.store.getTable(S3_SECRET_TABLE); + checkTableStatus(s3SecretTable, S3_SECRET_TABLE); } } @@ -653,4 +661,9 @@ public class OmMetadataManagerImpl implements OMMetadataManager { } return count; } + + @Override + public Table<byte[], byte[]> getS3SecretTable() { + return s3SecretTable; + } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
