This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 75e7ca64999 HDDS-13982. OmKeyInfo fileName possible inconsistency
between cache and DB (#9381)
75e7ca64999 is described below
commit 75e7ca6499950be743529108aab09cc46ffea101
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Mon Dec 1 15:57:59 2025 +0100
HDDS-13982. OmKeyInfo fileName possible inconsistency between cache and DB
(#9381)
---
.../client/checksum/TestFileChecksumHelper.java | 6 ++---
.../apache/hadoop/ozone/om/helpers/OmKeyInfo.java | 31 ++++++++++++----------
.../hadoop/ozone/om/helpers/TestOmKeyInfo.java | 3 +++
.../apache/hadoop/ozone/om/TestKeyManagerImpl.java | 14 +++++-----
.../org/apache/hadoop/ozone/om/KeyManagerImpl.java | 1 -
.../hadoop/ozone/om/OzoneListStatusHelper.java | 1 -
.../request/file/OMFileCreateRequestWithFSO.java | 3 +--
.../ozone/om/request/file/OMFileRequest.java | 8 +-----
.../request/key/OMAllocateBlockRequestWithFSO.java | 3 +--
.../om/request/key/OMKeyCommitRequestWithFSO.java | 6 ++---
.../om/request/key/OMKeyCreateRequestWithFSO.java | 3 +--
.../om/request/key/OMKeyRenameRequestWithFSO.java | 1 -
.../hadoop/ozone/om/request/key/OMKeyRequest.java | 1 -
.../S3InitiateMultipartUploadRequestWithFSO.java | 2 +-
.../S3MultipartUploadCompleteRequestWithFSO.java | 5 ++--
.../hadoop/ozone/om/TestOmMetadataManager.java | 5 ----
.../ozone/om/request/OMRequestTestUtils.java | 2 --
.../request/key/TestOMOpenKeysDeleteRequest.java | 6 -----
.../key/TestOMKeyRenameResponseWithFSO.java | 5 ----
.../response/key/TestOMOpenKeysDeleteResponse.java | 1 -
...TestS3ExpiredMultipartUploadsAbortResponse.java | 2 --
.../s3/multipart/TestS3MultipartResponse.java | 2 --
.../recon/tasks/AbstractNSSummaryTaskTest.java | 3 ---
23 files changed, 41 insertions(+), 73 deletions(-)
diff --git
a/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/checksum/TestFileChecksumHelper.java
b/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/checksum/TestFileChecksumHelper.java
index 8f3cbe9f4ce..e8fd8a76657 100644
---
a/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/checksum/TestFileChecksumHelper.java
+++
b/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/checksum/TestFileChecksumHelper.java
@@ -127,9 +127,9 @@ private OmKeyInfo omKeyInfo(ReplicationType type,
FileChecksum cachedChecksum, L
: RatisReplicationConfig.getInstance(HddsProtos.ReplicationFactor.ONE);
return new OmKeyInfo.Builder()
- .setVolumeName(null)
- .setBucketName(null)
- .setKeyName(null)
+ .setVolumeName("vol1")
+ .setBucketName("bucket")
+ .setKeyName("key")
.setOmKeyLocationInfos(Collections.singletonList(
new OmKeyLocationInfoGroup(0, locationInfo)))
.setCreationTime(Time.now())
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyInfo.java
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyInfo.java
index 4fb1a628f22..5e64b87f1c9 100644
---
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyInfo.java
+++
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyInfo.java
@@ -159,7 +159,8 @@ public String getKeyName() {
}
public void setKeyName(String keyName) {
- this.keyName = keyName;
+ this.keyName = Objects.requireNonNull(keyName, "keyName == null");
+ this.fileName = OzoneFSUtils.getFileName(keyName);
}
public long getDataSize() {
@@ -174,10 +175,6 @@ public void setDataSize(long size) {
this.dataSize = size;
}
- public void setFileName(String fileName) {
- this.fileName = fileName;
- }
-
public String getFileName() {
return fileName;
}
@@ -560,8 +557,11 @@ public Builder setBucketName(String bucket) {
return this;
}
- public Builder setKeyName(String key) {
- this.keyName = key;
+ public Builder setKeyName(String newValue) {
+ if (!Objects.equals(newValue, keyName)) {
+ this.keyName = newValue;
+ this.fileName = null;
+ }
return this;
}
@@ -655,11 +655,6 @@ public Builder setUpdateID(long id) {
return this;
}
- public Builder setFileName(String keyFileName) {
- this.fileName = keyFileName;
- return this;
- }
-
@Override
public Builder setParentObjectID(long parentID) {
super.setParentObjectID(parentID);
@@ -697,8 +692,18 @@ public Builder setExpectedDataGeneration(Long
existingGeneration) {
return this;
}
+ @Override
+ protected void validate() {
+ super.validate();
+ Objects.requireNonNull(keyName, "keyName == null");
+ }
+
@Override
protected OmKeyInfo buildObject() {
+ // not persisted to DB
+ if (fileName == null) {
+ fileName = OzoneFSUtils.getFileName(keyName);
+ }
return new OmKeyInfo(this);
}
}
@@ -863,8 +868,6 @@ public static Builder builderFromProtobuf(KeyInfo keyInfo) {
if (keyInfo.hasOwnerName()) {
builder.setOwnerName(keyInfo.getOwnerName());
}
- // not persisted to DB. FileName will be filtered out from keyName
- builder.setFileName(OzoneFSUtils.getFileName(keyInfo.getKeyName()));
return builder;
}
diff --git
a/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/helpers/TestOmKeyInfo.java
b/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/helpers/TestOmKeyInfo.java
index e35a2518cfe..9e293d0f5b2 100644
---
a/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/helpers/TestOmKeyInfo.java
+++
b/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/helpers/TestOmKeyInfo.java
@@ -24,6 +24,7 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
@@ -61,7 +62,9 @@ public void protobufConversion() throws IOException {
OmKeyInfo keyAfterSerialization = OmKeyInfo.getFromProtobuf(
key.getProtobuf(ClientVersion.CURRENT_VERSION));
+ assertNotNull(keyAfterSerialization);
assertEquals(key, keyAfterSerialization);
+ assertEquals(key.getFileName(), keyAfterSerialization.getFileName());
assertFalse(key.isHsync());
key = key.withMetadataMutations(
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java
index 3969a643c9f..584752ab852 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java
@@ -363,18 +363,20 @@ public void testCreateDirectory() throws IOException {
// Create directory where the parent directory does not exist
StringBuffer keyNameBuf = new StringBuffer();
keyNameBuf.append(RandomStringUtils.secure().nextAlphabetic(5));
- OmKeyArgs keyArgs = createBuilder()
- .setKeyName(keyNameBuf.toString())
- .build();
for (int i = 0; i < 5; i++) {
keyNameBuf.append('/').append(RandomStringUtils.secure().nextAlphabetic(5));
}
String keyName = keyNameBuf.toString();
+ OmKeyArgs keyArgs = createBuilder()
+ .setKeyName(keyName)
+ .build();
+
writeClient.createDirectory(keyArgs);
+
Path path = Paths.get(keyName);
while (path != null) {
// verify parent directories are created
- assertTrue(keyManager.getFileStatus(keyArgs).isDirectory());
+ assertIsDirectory(BUCKET_NAME, path.toString());
path = path.getParent();
}
@@ -1905,7 +1907,8 @@ private void assertIsDirectory(String bucketName, String
keyName) {
OmKeyInfo keyInfo = ozoneFileStatus.getKeyInfo();
assertEquals(VOLUME_NAME, keyInfo.getVolumeName());
assertEquals(bucketName, keyInfo.getBucketName());
- assertEquals(keyName, keyInfo.getFileName());
+ assertEquals(keyName + '/', keyInfo.getKeyName());
+ assertEquals(Paths.get(keyName).getFileName().toString(),
keyInfo.getFileName());
assertTrue(ozoneFileStatus.isDirectory());
} catch (IOException e) {
throw new RuntimeException(e);
@@ -1946,7 +1949,6 @@ private static void addDirectory(OmKeyArgs keyArgs)
throws Exception {
.setVolumeName(keyArgs.getVolumeName())
.setBucketName(keyArgs.getBucketName())
.setKeyName(keyArgs.getKeyName() + "/")
- .setFileName(OzoneFSUtils.getFileName(keyArgs.getKeyName()))
.setOmKeyLocationInfos(null)
.setCreationTime(Time.now())
.setModificationTime(Time.now())
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
index a0dd69a9752..ece197a2b40 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
@@ -1726,7 +1726,6 @@ private OmKeyInfo createDirectoryKey(OmKeyInfo keyInfo,
String keyName)
.setVolumeName(keyInfo.getVolumeName())
.setBucketName(keyInfo.getBucketName())
.setKeyName(dir)
- .setFileName(OzoneFSUtils.getFileName(keyName))
.setOmKeyLocationInfos(Collections.singletonList(
new OmKeyLocationInfoGroup(0, new ArrayList<>())))
.setCreationTime(Time.now())
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneListStatusHelper.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneListStatusHelper.java
index 14343c3469d..c0fa8f20bb3 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneListStatusHelper.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneListStatusHelper.java
@@ -277,7 +277,6 @@ private OzoneFileStatus getStatus(String prefixPath, long
scmBlockSz,
} else {
Preconditions.checkArgument(value instanceof OmKeyInfo);
keyInfo = (OmKeyInfo) value;
- keyInfo.setFileName(keyInfo.getKeyName());
String fullKeyPath = OMFileRequest.getAbsolutePath(prefixPath,
keyInfo.getKeyName());
keyInfo.setKeyName(fullKeyPath);
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequestWithFSO.java
index d04c9f421e4..6036fe90dbb 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequestWithFSO.java
@@ -198,8 +198,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager
ozoneManager, Execut
// Even if bucket gets deleted, when commitKey we shall identify if
// bucket gets deleted.
OMFileRequest.addOpenFileTableCacheEntry(omMetadataManager,
- dbOpenFileName, omFileInfo, pathInfoFSO.getLeafNodeName(),
keyName,
- trxnLogIndex);
+ dbOpenFileName, omFileInfo, keyName, trxnLogIndex);
// Add cache entries for the prefix directories.
// Skip adding for the file key itself, until Key Commit.
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileRequest.java
index 75ec1d5b727..6e6bc426964 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileRequest.java
@@ -463,12 +463,11 @@ public static void addDirectoryTableCacheEntries(
* @param omMetadataManager OM Metadata Manager
* @param dbOpenFileName open file name key
* @param omFileInfo key info
- * @param fileName file name
* @param trxnLogIndex transaction log index
*/
public static void addOpenFileTableCacheEntry(
OMMetadataManager omMetadataManager, String dbOpenFileName,
- @Nullable OmKeyInfo omFileInfo, String fileName, String keyName,
long trxnLogIndex) {
+ @Nullable OmKeyInfo omFileInfo, String keyName, long trxnLogIndex) {
final Table<String, OmKeyInfo> table = omMetadataManager.getOpenKeyTable(
BucketLayout.FILE_SYSTEM_OPTIMIZED);
@@ -478,8 +477,6 @@ public static void addOpenFileTableCacheEntry(
// This is required as in some cases like hsync, Keys inside
openKeyTable is used for auto commit after expiry.
// (Full key path is required in commit key request)
omFileInfo.setKeyName(keyName);
- // fileName will contain only the leaf(file1) which is actual file name.
- omFileInfo.setFileName(fileName);
table.addCacheEntry(dbOpenFileName, omFileInfo, trxnLogIndex);
} else {
table.addCacheEntry(dbOpenFileName, trxnLogIndex);
@@ -504,7 +501,6 @@ public static void addFileTableCacheEntry(
// For example, the user given key path is '/a/b/c/d/e/file1', then in DB
// keyName field stores only the leaf node name, which is 'file1'.
omFileInfo.setKeyName(fileName);
- omFileInfo.setFileName(fileName);
BucketLayout bucketLayout =
getBucketLayout(omMetadataManager, omFileInfo.getVolumeName(),
@@ -729,7 +725,6 @@ public static OmKeyInfo getKeyInfoWithFullPath(OmKeyInfo
parentInfo, OmDirectory
}
public static OmKeyInfo getKeyInfoWithFullPath(OmKeyInfo parentInfo,
OmKeyInfo omKeyInfo) {
- omKeyInfo.setFileName(omKeyInfo.getKeyName());
String fullKeyPath = OMFileRequest.getAbsolutePath(
parentInfo.getKeyName(), omKeyInfo.getKeyName());
omKeyInfo.setKeyName(fullKeyPath);
@@ -760,7 +755,6 @@ public static OmKeyInfo getOmKeyInfo(String volumeName,
String bucketName,
.setModificationTime(dirInfo.getModificationTime())
.setObjectID(dirInfo.getObjectID())
.setUpdateID(dirInfo.getUpdateID())
- .setFileName(dirInfo.getName())
.setReplicationConfig(RatisReplicationConfig
.getInstance(HddsProtos.ReplicationFactor.ONE))
.setOmKeyLocationInfos(Collections.singletonList(
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequestWithFSO.java
index 5716a073564..3b63ed9d8b1 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequestWithFSO.java
@@ -222,9 +222,8 @@ private String getOpenKeyName(String volumeName, String
bucketName,
private void addOpenTableCacheEntry(long trxnLogIndex,
OMMetadataManager omMetadataManager, String openKeyName, String keyName,
OmKeyInfo openKeyInfo) {
- String fileName = openKeyInfo.getFileName();
OMFileRequest.addOpenFileTableCacheEntry(omMetadataManager, openKeyName,
- openKeyInfo, fileName, keyName, trxnLogIndex);
+ openKeyInfo, keyName, trxnLogIndex);
}
@Nonnull
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequestWithFSO.java
index 51cebd6c9b5..25b5a4b15d4 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequestWithFSO.java
@@ -208,7 +208,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager
ozoneManager, Execut
.build();
openKeyToDelete.setModificationTime(Time.now());
OMFileRequest.addOpenFileTableCacheEntry(omMetadataManager,
- dbOpenKeyToDeleteKey, openKeyToDelete, keyName, fileName,
trxnLogIndex);
+ dbOpenKeyToDeleteKey, openKeyToDelete, keyName, trxnLogIndex);
}
omKeyInfo.setModificationTime(commitKeyArgs.getModificationTime());
@@ -327,7 +327,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager
ozoneManager, Execut
// indicating the key is removed from OpenKeyTable.
// So that this key can't be committed again.
OMFileRequest.addOpenFileTableCacheEntry(omMetadataManager,
- dbOpenFileKey, null, fileName, keyName, trxnLogIndex);
+ dbOpenFileKey, null, keyName, trxnLogIndex);
// Prevent hsync metadata from getting committed to the final key
omKeyInfo = omKeyInfo.withMetadataMutations(
@@ -339,7 +339,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager
ozoneManager, Execut
} else if (newOpenKeyInfo != null) {
// isHSync is true and newOpenKeyInfo is set, update OpenKeyTable
OMFileRequest.addOpenFileTableCacheEntry(omMetadataManager,
- dbOpenFileKey, newOpenKeyInfo, fileName, keyName, trxnLogIndex);
+ dbOpenFileKey, newOpenKeyInfo, keyName, trxnLogIndex);
}
OMFileRequest.addFileTableCacheEntry(omMetadataManager, dbFileKey,
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequestWithFSO.java
index aa1338fa8cf..980bb5871c3 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequestWithFSO.java
@@ -189,8 +189,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager
ozoneManager, Execut
// Even if bucket gets deleted, when commitKey we shall identify if
// bucket gets deleted.
OMFileRequest.addOpenFileTableCacheEntry(omMetadataManager,
- dbOpenFileName, omFileInfo, pathInfoFSO.getLeafNodeName(),
keyName,
- trxnLogIndex);
+ dbOpenFileName, omFileInfo, keyName, trxnLogIndex);
// Add cache entries for the prefix directories.
// Skip adding for the file key itself, until Key Commit.
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestWithFSO.java
index b848c2edab4..3800886a849 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestWithFSO.java
@@ -293,7 +293,6 @@ private OMClientResponse renameKey(OmKeyInfo toKeyParent,
String toKeyName,
.build();
// Set toFileName
fromKeyValue.setKeyName(toKeyFileName);
- fromKeyValue.setFileName(toKeyFileName);
// Set toKeyObjectId
if (toKeyParent != null) {
fromKeyValue.setParentObjectID(toKeyParent.getObjectID());
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java
index 1697bd01087..f260e24fe46 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java
@@ -1045,7 +1045,6 @@ protected OmKeyInfo createFileInfo(
= (OMFileRequest.OMPathInfoWithFSO) omPathInfo;
objectID = omPathInfoFSO.getLeafNodeObjectId();
builder.setParentObjectID(omPathInfoFSO.getLastKnownParentId());
- builder.setFileName(omPathInfoFSO.getLeafNodeName());
}
builder.setObjectID(objectID);
return builder.build();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequestWithFSO.java
index 7e781635603..f7e3e009e8e 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequestWithFSO.java
@@ -204,7 +204,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager
ozoneManager, Execut
missingParentInfos, null);
OMFileRequest.addOpenFileTableCacheEntry(omMetadataManager,
- multipartOpenKey, omKeyInfo, pathInfoFSO.getLeafNodeName(), keyName,
+ multipartOpenKey, omKeyInfo, keyName,
transactionLogIndex);
// Add to cache
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequestWithFSO.java
index ff967e73117..cf888c50e6c 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequestWithFSO.java
@@ -94,7 +94,7 @@ protected void addMultiPartToCache(
// Add multi part to cache
OMFileRequest.addOpenFileTableCacheEntry(omMetadataManager,
- multipartOpenKey, omKeyInfo, pathInfoFSO.getLeafNodeName(),
+ multipartOpenKey, omKeyInfo,
keyName, transactionLogIndex);
}
@@ -126,9 +126,8 @@ protected void addKeyTableCacheEntry(OMMetadataManager
omMetadataManager,
@Override
protected void updatePrefixFSOInfo(OmKeyInfo dbOpenKeyInfo,
OmKeyInfo.Builder builder) {
- // updates parentID and fileName
+ // updates parentID
builder.setParentObjectID(dbOpenKeyInfo.getParentObjectID());
- builder.setFileName(dbOpenKeyInfo.getFileName());
}
@Override
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOmMetadataManager.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOmMetadataManager.java
index bebc5880788..43219d5bd01 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOmMetadataManager.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOmMetadataManager.java
@@ -91,7 +91,6 @@
import org.apache.hadoop.ozone.om.helpers.OmMultipartUpload;
import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs;
import org.apache.hadoop.ozone.om.helpers.OpenKeySession;
-import org.apache.hadoop.ozone.om.helpers.OzoneFSUtils;
import org.apache.hadoop.ozone.om.helpers.SnapshotInfo;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
import org.apache.hadoop.ozone.om.request.util.OMMultipartUploadUtils;
@@ -703,7 +702,6 @@ public void testListOpenFiles(BucketLayout bucketLayout)
throws Exception {
final String dbOpenKeyName;
if (bucketLayout.isFileSystemOptimized()) {
keyInfo.setParentObjectID(i);
- keyInfo.setFileName(OzoneFSUtils.getFileName(keyInfo.getKeyName()));
OMRequestTestUtils.addFileToKeyTable(true, false,
keyInfo.getFileName(), keyInfo, clientID, 0L, omMetadataManager);
dbOpenKeyName = omMetadataManager.getOpenFileName(volumeId, bucketId,
@@ -821,7 +819,6 @@ public void testGetExpiredOpenKeys(BucketLayout
bucketLayout)
final String dbOpenKeyName;
if (bucketLayout.isFileSystemOptimized()) {
keyInfo.setParentObjectID(i);
- keyInfo.setFileName(OzoneFSUtils.getFileName(keyInfo.getKeyName()));
OMRequestTestUtils.addFileToKeyTable(true, false,
keyInfo.getFileName(), keyInfo, clientID, 0L, omMetadataManager);
dbOpenKeyName = omMetadataManager.getOpenFileName(volumeId, bucketId,
@@ -900,7 +897,6 @@ public void testGetExpiredOpenKeysExcludeMPUKeys(
if (bucketLayout.isFileSystemOptimized()) {
keyInfo.setParentObjectID(i);
- keyInfo.setFileName(OzoneFSUtils.getFileName(keyInfo.getKeyName()));
OMRequestTestUtils.addMultipartKeyToOpenFileTable(false,
keyInfo.getFileName(), keyInfo, uploadId, 0L, omMetadataManager);
} else {
@@ -933,7 +929,6 @@ public void testGetExpiredOpenKeysExcludeMPUKeys(
if (bucketLayout.isFileSystemOptimized()) {
keyInfo.setParentObjectID(i);
- keyInfo.setFileName(OzoneFSUtils.getFileName(keyInfo.getKeyName()));
OMRequestTestUtils.addMultipartKeyToOpenFileTable(false,
keyInfo.getFileName(), keyInfo, uploadId, 0L, omMetadataManager);
} else {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/OMRequestTestUtils.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/OMRequestTestUtils.java
index 7ba928fd457..873801abf50 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/OMRequestTestUtils.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/OMRequestTestUtils.java
@@ -68,7 +68,6 @@
import org.apache.hadoop.ozone.om.helpers.OmMultipartUpload;
import org.apache.hadoop.ozone.om.helpers.OmPrefixInfo;
import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs;
-import org.apache.hadoop.ozone.om.helpers.OzoneFSUtils;
import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.SnapshotInfo;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
@@ -591,7 +590,6 @@ public static OmKeyInfo.Builder createOmKeyInfo(String
volumeName, String bucket
.setVolumeName(volumeName)
.setBucketName(bucketName)
.setKeyName(keyName)
- .setFileName(OzoneFSUtils.getFileName(keyName))
.setReplicationConfig(replicationConfig)
.setObjectID(0L)
.setUpdateID(0L)
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMOpenKeysDeleteRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMOpenKeysDeleteRequest.java
index 57a7b5a1f9d..6634f1ec20f 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMOpenKeysDeleteRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMOpenKeysDeleteRequest.java
@@ -48,7 +48,6 @@
import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
-import org.apache.hadoop.ozone.om.helpers.OzoneFSUtils;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
import org.apache.hadoop.ozone.om.response.OMClientResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
@@ -235,14 +234,12 @@ public void testDeleteKeyWithHigherUpdateID(
List<Pair<Long, OmKeyInfo>> keysWithHigherUpdateID = new ArrayList<>(1);
keysWithHigherUpdateID.add(Pair.of(clientID,
builder.setKeyName("key")
- .setFileName("key")
.setUpdateID(updateId)
.build()));
List<Pair<Long, OmKeyInfo>> keysWithSameUpdateID = new ArrayList<>(1);
keysWithSameUpdateID.add(Pair.of(clientID,
builder.setKeyName("key2")
- .setFileName("key2")
.setUpdateID(transactionId)
.build()));
@@ -461,9 +458,6 @@ private List<Pair<Long, OmKeyInfo>> makeOpenKeys(
for (int i = 0; i < count; i++) {
final String name = key != null ? key : UUID.randomUUID().toString();
builder.setKeyName(name);
- if (getBucketLayout().isFileSystemOptimized()) {
- builder.setFileName(OzoneFSUtils.getFileName(name));
- }
long clientID = random.nextLong();
keys.add(Pair.of(clientID, builder.build()));
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyRenameResponseWithFSO.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyRenameResponseWithFSO.java
index c054eb10f54..073d9ccb489 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyRenameResponseWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyRenameResponseWithFSO.java
@@ -25,7 +25,6 @@
import org.apache.hadoop.hdds.client.RatisReplicationConfig;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
-import org.apache.hadoop.ozone.om.helpers.OzoneFSUtils;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
import org.apache.hadoop.ozone.om.response.TestOMResponseUtils;
@@ -89,10 +88,6 @@ protected void createParent() {
.build();
fromKeyParent.setParentObjectID(bucketId);
toKeyParent.setParentObjectID(bucketId);
- fromKeyParent.setFileName(OzoneFSUtils.getFileName(
- fromKeyParent.getKeyName()));
- toKeyParent.setFileName(OzoneFSUtils.getFileName(
- toKeyParent.getKeyName()));
String volumeName = UUID.randomUUID().toString();
String bucketName = UUID.randomUUID().toString();
bucketInfo = TestOMResponseUtils.createBucket(volumeName, bucketName);
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMOpenKeysDeleteResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMOpenKeysDeleteResponse.java
index b5c6b686c1c..653934698ea 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMOpenKeysDeleteResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMOpenKeysDeleteResponse.java
@@ -223,7 +223,6 @@ private Map<String, Pair<Long, OmKeyInfo>>
addOpenKeysToDB(String volume, int nu
String file = OzoneFSUtils.getFileName(key);
final long volumeId = omMetadataManager.getVolumeId(volume);
final long bucketId = omMetadataManager.getBucketId(volume, bucket);
- omKeyInfo.setFileName(file);
omKeyInfo.setParentObjectID(parentID);
OMRequestTestUtils.addFileToKeyTable(true, false, file, omKeyInfo,
clientID, 0L, omMetadataManager);
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3ExpiredMultipartUploadsAbortResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3ExpiredMultipartUploadsAbortResponse.java
index e8de58041b9..9e8ad383655 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3ExpiredMultipartUploadsAbortResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3ExpiredMultipartUploadsAbortResponse.java
@@ -39,7 +39,6 @@
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfoGroup;
import org.apache.hadoop.ozone.om.helpers.OmMultipartAbortInfo;
import org.apache.hadoop.ozone.om.helpers.OmMultipartKeyInfo;
-import org.apache.hadoop.ozone.om.helpers.OzoneFSUtils;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
import org.apache.hadoop.ozone.om.request.util.OMMultipartUploadUtils;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
@@ -284,7 +283,6 @@ private Map<OmBucketInfo, List<OmMultipartAbortInfo>>
addMPUsToDB(
if (getBucketLayout().equals(BucketLayout.FILE_SYSTEM_OPTIMIZED)) {
omKeyInfo.setParentObjectID(omBucketInfo.getObjectID());
- omKeyInfo.setFileName(OzoneFSUtils.getFileName(keyName));
OMRequestTestUtils.addMultipartKeyToOpenFileTable(false,
omKeyInfo.getFileName(), omKeyInfo, uploadId, 0L,
omMetadataManager);
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartResponse.java
index 7da6c3d64b2..ac56273d628 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartResponse.java
@@ -201,7 +201,6 @@ public S3InitiateMultipartUploadResponse
createS3InitiateMPUResponseFSO(
.setVolumeName(volumeName)
.setBucketName(bucketName)
.setKeyName(fileName)
- .setFileName(fileName)
.setCreationTime(Time.now())
.setModificationTime(Time.now())
.setReplicationConfig(RatisReplicationConfig.getInstance(
@@ -265,7 +264,6 @@ public S3MultipartUploadCommitPartResponse
createS3CommitMPUResponseFSO(
.setVolumeName(volumeName)
.setBucketName(bucketName)
.setKeyName(fileName)
- .setFileName(fileName)
.setCreationTime(Time.now())
.setModificationTime(Time.now())
.setReplicationConfig(RatisReplicationConfig.getInstance(
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/AbstractNSSummaryTaskTest.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/AbstractNSSummaryTaskTest.java
index 68b891cc428..73876dcb5f3 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/AbstractNSSummaryTaskTest.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/AbstractNSSummaryTaskTest.java
@@ -208,7 +208,6 @@ protected static OmKeyInfo buildOmKeyInfo(String volume,
String bucket, String k
.setBucketName(bucket)
.setVolumeName(volume)
.setKeyName(key)
- .setFileName(fileName)
.setReplicationConfig(StandaloneReplicationConfig.getInstance(HddsProtos.ReplicationFactor.ONE))
.setObjectID(objectID)
.setParentObjectID(parentObjectId)
@@ -233,7 +232,6 @@ protected static OmKeyInfo buildOmKeyInfo(String volume,
String bucket, String k
.setBucketName(bucket)
.setVolumeName(volume)
.setKeyName(key)
- .setFileName(fileName)
.setReplicationConfig(StandaloneReplicationConfig.getInstance(HddsProtos.ReplicationFactor.ONE))
.setObjectID(objectID)
.setParentObjectID(parentObjectId)
@@ -267,7 +265,6 @@ protected static OmKeyInfo buildOmDirKeyInfo(String volume,
.setBucketName(bucket)
.setVolumeName(volume)
.setKeyName(key)
- .setFileName(fileName)
.setReplicationConfig(
StandaloneReplicationConfig.getInstance(
HddsProtos.ReplicationFactor.ONE))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
