Skip to content

HDDS-12932. Rewrite OMDBDefinition. #8362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 2 commits into from
Apr 30, 2025
Merged

HDDS-12932. Rewrite OMDBDefinition. #8362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c775aea
HDDS-12932. Rewrite OMDBDefinition.
szetszwo Apr 29, 2025
dd1b36e
Fix javadoc and indentations.
szetszwo Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions ...-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/package-info.java
View file
Open in desktop

This file was deleted.

137 changes: 22 additions & 115 deletions ...p-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,99 +136,6 @@ public class OmMetadataManagerImpl implements OMMetadataManager,
private static final Logger LOG =
LoggerFactory.getLogger(OmMetadataManagerImpl.class);

/**
* OM RocksDB Structure .
* <p>
* OM DB stores metadata as KV pairs iThis n different column families.
* <p>
* OM DB Schema:
*
* <pre>
* {@code
* Common Tables:
* |----------------------------------------------------------------------|
* | Column Family | VALUE |
* |----------------------------------------------------------------------|
* | userTable | /user->UserVolumeInfo |
* |----------------------------------------------------------------------|
* | volumeTable | /volume->VolumeInfo |
* |----------------------------------------------------------------------|
* | bucketTable | /volume/bucket-> BucketInfo |
* |----------------------------------------------------------------------|
* | s3SecretTable | s3g_access_key_id -> s3Secret |
* |----------------------------------------------------------------------|
* | dTokenTable | OzoneTokenID -> renew_time |
* |----------------------------------------------------------------------|
* | prefixInfoTable | prefix -> PrefixInfo |
* |----------------------------------------------------------------------|
* | multipartInfoTable | /volumeName/bucketName/keyName/uploadId ->... |
* |----------------------------------------------------------------------|
* | transactionInfoTable| #TRANSACTIONINFO -> OMTransactionInfo |
* |----------------------------------------------------------------------|
* }
* </pre>
* <pre>
* {@code
* Multi-Tenant Tables:
* |----------------------------------------------------------------------|
* | tenantStateTable | tenantId -> OmDBTenantState |
* |----------------------------------------------------------------------|
* | tenantAccessIdTable | accessId -> OmDBAccessIdInfo |
* |----------------------------------------------------------------------|
* | principalToAccessIdsTable | userPrincipal -> OmDBUserPrincipalInfo |
* |----------------------------------------------------------------------|
* }
* </pre>
* <pre>
* {@code
* Simple Tables:
* |----------------------------------------------------------------------|
* | Column Family | VALUE |
* |----------------------------------------------------------------------|
* | keyTable | /volumeName/bucketName/keyName->KeyInfo |
* |----------------------------------------------------------------------|
* | deletedTable | /volumeName/bucketName/keyName->RepeatedKeyInfo |
* |----------------------------------------------------------------------|
* | openKey | /volumeName/bucketName/keyName/id->KeyInfo |
* |----------------------------------------------------------------------|
* }
* </pre>
* <pre>
* {@code
* Prefix Tables:
* |----------------------------------------------------------------------|
* | Column Family | VALUE |
* |----------------------------------------------------------------------|
* | directoryTable | /volumeId/bucketId/parentId/dirName -> DirInfo |
* |----------------------------------------------------------------------|
* | fileTable | /volumeId/bucketId/parentId/fileName -> KeyInfo |
* |----------------------------------------------------------------------|
* | openFileTable | /volumeId/bucketId/parentId/fileName/id -> KeyInfo|
* |----------------------------------------------------------------------|
* | deletedDirTable | /volumeId/bucketId/parentId/dirName/objectId -> |
* | | KeyInfo |
* |----------------------------------------------------------------------|
* }
* </pre>
* <pre>
* {@code
* Snapshot Tables:
* |-------------------------------------------------------------------------|
* | Column Family | VALUE |
* |-------------------------------------------------------------------------|
* | snapshotInfoTable | /volume/bucket/snapshotName -> SnapshotInfo |
* |-------------------------------------------------------------------------|
* | snapshotRenamedTable | /volumeName/bucketName/objectID -> One of: |
* | | 1. /volumeId/bucketId/parentId/dirName |
* | | 2. /volumeId/bucketId/parentId/fileName |
* | | 3. /volumeName/bucketName/keyName |
* |-------------------------------------------------------------------------|
* | compactionLogTable | dbTrxId-compactionTime -> compactionLogEntry |
* |-------------------------------------------------------------------------|
* }
* </pre>
*/

public static final String USER_TABLE = "userTable";
public static final String VOLUME_TABLE = "volumeTable";
public static final String BUCKET_TABLE = "bucketTable";
Expand Down Expand Up @@ -566,48 +473,48 @@ protected void initializeOmTables(CacheType cacheType,
throws IOException {
final TableInitializer initializer = new TableInitializer(addCacheMetrics);

userTable = initializer.get(OMDBDefinition.USER_TABLE);
userTable = initializer.get(OMDBDefinition.USER_TABLE_DEF);

volumeTable = initializer.get(OMDBDefinition.VOLUME_TABLE, cacheType);
bucketTable = initializer.get(OMDBDefinition.BUCKET_TABLE, cacheType);
keyTable = initializer.get(OMDBDefinition.KEY_TABLE);
volumeTable = initializer.get(OMDBDefinition.VOLUME_TABLE_DEF, cacheType);
bucketTable = initializer.get(OMDBDefinition.BUCKET_TABLE_DEF, cacheType);
keyTable = initializer.get(OMDBDefinition.KEY_TABLE_DEF);

openKeyTable = initializer.get(OMDBDefinition.OPEN_KEY_TABLE);
multipartInfoTable = initializer.get(OMDBDefinition.MULTIPART_INFO_TABLE);
deletedTable = initializer.get(OMDBDefinition.DELETED_TABLE);
openKeyTable = initializer.get(OMDBDefinition.OPEN_KEY_TABLE_DEF);
multipartInfoTable = initializer.get(OMDBDefinition.MULTIPART_INFO_TABLE_DEF);
deletedTable = initializer.get(OMDBDefinition.DELETED_TABLE_DEF);

dirTable = initializer.get(OMDBDefinition.DIRECTORY_TABLE);
fileTable = initializer.get(OMDBDefinition.FILE_TABLE);
openFileTable = initializer.get(OMDBDefinition.OPEN_FILE_TABLE);
deletedDirTable = initializer.get(OMDBDefinition.DELETED_DIR_TABLE);
dirTable = initializer.get(OMDBDefinition.DIRECTORY_TABLE_DEF);
fileTable = initializer.get(OMDBDefinition.FILE_TABLE_DEF);
openFileTable = initializer.get(OMDBDefinition.OPEN_FILE_TABLE_DEF);
deletedDirTable = initializer.get(OMDBDefinition.DELETED_DIR_TABLE_DEF);

dTokenTable = initializer.get(OMDBDefinition.DELEGATION_TOKEN_TABLE);
s3SecretTable = initializer.get(OMDBDefinition.S3_SECRET_TABLE);
prefixTable = initializer.get(OMDBDefinition.PREFIX_TABLE);
dTokenTable = initializer.get(OMDBDefinition.DELEGATION_TOKEN_TABLE_DEF);
s3SecretTable = initializer.get(OMDBDefinition.S3_SECRET_TABLE_DEF);
prefixTable = initializer.get(OMDBDefinition.PREFIX_TABLE_DEF);

transactionInfoTable = initializer.get(OMDBDefinition.TRANSACTION_INFO_TABLE);
transactionInfoTable = initializer.get(OMDBDefinition.TRANSACTION_INFO_TABLE_DEF);

metaTable = initializer.get(OMDBDefinition.META_TABLE);
metaTable = initializer.get(OMDBDefinition.META_TABLE_DEF);

// accessId -> OmDBAccessIdInfo (tenantId, secret, Kerberos principal)
tenantAccessIdTable = initializer.get(OMDBDefinition.TENANT_ACCESS_ID_TABLE);
tenantAccessIdTable = initializer.get(OMDBDefinition.TENANT_ACCESS_ID_TABLE_DEF);

// User principal -> OmDBUserPrincipalInfo (a list of accessIds)
principalToAccessIdsTable = initializer.get(OMDBDefinition.PRINCIPAL_TO_ACCESS_IDS_TABLE);
principalToAccessIdsTable = initializer.get(OMDBDefinition.PRINCIPAL_TO_ACCESS_IDS_TABLE_DEF);

// tenant name -> tenant (tenant states)
tenantStateTable = initializer.get(OMDBDefinition.TENANT_STATE_TABLE);
tenantStateTable = initializer.get(OMDBDefinition.TENANT_STATE_TABLE_DEF);

// TODO: [SNAPSHOT] Consider FULL_CACHE for snapshotInfoTable since
// exclusiveSize in SnapshotInfo can be frequently updated.
// path -> snapshotInfo (snapshot info for snapshot)
snapshotInfoTable = initializer.get(OMDBDefinition.SNAPSHOT_INFO_TABLE);
snapshotInfoTable = initializer.get(OMDBDefinition.SNAPSHOT_INFO_TABLE_DEF);

// volumeName/bucketName/objectID -> renamedKey or renamedDir
snapshotRenamedTable = initializer.get(OMDBDefinition.SNAPSHOT_RENAMED_TABLE);
snapshotRenamedTable = initializer.get(OMDBDefinition.SNAPSHOT_RENAMED_TABLE_DEF);
// TODO: [SNAPSHOT] Initialize table lock for snapshotRenamedTable.

compactionLogTable = initializer.get(OMDBDefinition.COMPACTION_LOG_TABLE);
compactionLogTable = initializer.get(OMDBDefinition.COMPACTION_LOG_TABLE_DEF);
}

/**
Expand Down
Loading