This is an automated email from the ASF dual-hosted git repository.
sammichen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 4a9b7e0 HDDS-3614. Remove S3Table from OmMetadataManager. (#940)
4a9b7e0 is described below
commit 4a9b7e071c5ffb6ca18e30fdbb0a67be41af0125
Author: Bharat Viswanadham <[email protected]>
AuthorDate: Mon May 25 05:45:09 2020 -0700
HDDS-3614. Remove S3Table from OmMetadataManager. (#940)
---
.../java/org/apache/hadoop/ozone/om/OMMetadataManager.java | 8 --------
.../org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java | 13 -------------
.../hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java | 1 -
3 files changed, 22 deletions(-)
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
index ce509ea..9a13cb9 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
@@ -302,14 +302,6 @@ public interface OMMetadataManager {
Table<OzoneTokenIdentifier, Long> getDelegationTokenTable();
/**
- * Gets the S3Bucket to Ozone Volume/bucket mapping table.
- *
- * @return Table.
- */
-
- Table<String, String> getS3Table();
-
- /**
* Gets the Ozone prefix path to its acl mapping table.
* @return 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 9bfbca0..39a093a 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
@@ -110,8 +110,6 @@ public class OmMetadataManagerImpl implements
OMMetadataManager {
* |----------------------------------------------------------------------|
* | openKey | /volumeName/bucketName/keyName/id->KeyInfo |
* |----------------------------------------------------------------------|
- * | s3Table | s3BucketName -> /volumeName/bucketName |
- * |----------------------------------------------------------------------|
* | s3SecretTable | s3g_access_key_id -> s3Secret |
* |----------------------------------------------------------------------|
* | dTokenTable | s3g_access_key_id -> s3Secret |
@@ -131,7 +129,6 @@ public class OmMetadataManagerImpl implements
OMMetadataManager {
public static final String KEY_TABLE = "keyTable";
public static final String DELETED_TABLE = "deletedTable";
public static final String OPEN_KEY_TABLE = "openKeyTable";
- public static final String S3_TABLE = "s3Table";
public static final String MULTIPARTINFO_TABLE = "multipartInfoTable";
public static final String S3_SECRET_TABLE = "s3SecretTable";
public static final String DELEGATION_TOKEN_TABLE = "dTokenTable";
@@ -150,7 +147,6 @@ public class OmMetadataManagerImpl implements
OMMetadataManager {
private Table keyTable;
private Table deletedTable;
private Table openKeyTable;
- private Table s3Table;
private Table<String, OmMultipartKeyInfo> multipartInfoTable;
private Table s3SecretTable;
private Table dTokenTable;
@@ -216,11 +212,6 @@ public class OmMetadataManagerImpl implements
OMMetadataManager {
}
@Override
- public Table<String, String> getS3Table() {
- return s3Table;
- }
-
- @Override
public Table<String, OmPrefixInfo> getPrefixTable() {
return prefixTable;
}
@@ -285,7 +276,6 @@ public class OmMetadataManagerImpl implements
OMMetadataManager {
.addTable(KEY_TABLE)
.addTable(DELETED_TABLE)
.addTable(OPEN_KEY_TABLE)
- .addTable(S3_TABLE)
.addTable(MULTIPARTINFO_TABLE)
.addTable(DELEGATION_TOKEN_TABLE)
.addTable(S3_SECRET_TABLE)
@@ -338,9 +328,6 @@ public class OmMetadataManagerImpl implements
OMMetadataManager {
this.store.getTable(OPEN_KEY_TABLE, String.class, OmKeyInfo.class);
checkTableStatus(openKeyTable, OPEN_KEY_TABLE);
- s3Table = this.store.getTable(S3_TABLE, String.class, String.class);
- checkTableStatus(s3Table, S3_TABLE);
-
multipartInfoTable = this.store.getTable(MULTIPARTINFO_TABLE,
String.class, OmMultipartKeyInfo.class);
checkTableStatus(multipartInfoTable, MULTIPARTINFO_TABLE);
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java
index c968efb..8ea145e 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java
@@ -301,7 +301,6 @@ public final class OzoneManagerDoubleBuffer {
omMetadataManager.getOpenKeyTable().cleanupCache(lastRatisTransactionIndex);
omMetadataManager.getKeyTable().cleanupCache(lastRatisTransactionIndex);
omMetadataManager.getDeletedTable().cleanupCache(lastRatisTransactionIndex);
- omMetadataManager.getS3Table().cleanupCache(lastRatisTransactionIndex);
omMetadataManager.getMultipartInfoTable().cleanupCache(
lastRatisTransactionIndex);
omMetadataManager.getS3SecretTable().cleanupCache(
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
