Skip to content

HDDS-12633. KEY_NOT_FOUND in OzoneRpcClientTests for LEGACY bucket with enableFileSystemPaths=true #8108

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 5 commits into from
Mar 19, 2025
Merged

HDDS-12633. KEY_NOT_FOUND in OzoneRpcClientTests for LEGACY bucket with enableFileSystemPaths=true #8108

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dde764b
HDDS-12633. [ERROR] org.apache.hadoop.ozone.client.rpc.OzoneRpcClient…
Mar 19, 2025
9aa1dd3
Refactor code based on review comments
Mar 19, 2025
b9d12d9
Update setFileSystemPathEnabled under OzoneRpcClientTests.testBucketU…
tanvipenumudy Mar 19, 2025
d1b4114
Addresss review comment to reset enablePaths configuration
Mar 19, 2025
f44e987
Fix checkstyle errors
Mar 19, 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
54 changes: 46 additions & 8 deletions ...ntegration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/OzoneRpcClientTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.Collections.singletonMap;
import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.FS_DEFAULT_NAME_KEY;
import static org.apache.hadoop.hdds.StringUtils.string2Bytes;
import static org.apache.hadoop.hdds.client.ReplicationFactor.ONE;
import static org.apache.hadoop.hdds.client.ReplicationFactor.THREE;
Expand All @@ -36,6 +37,7 @@
import static org.apache.hadoop.ozone.OzoneConsts.ETAG;
import static org.apache.hadoop.ozone.OzoneConsts.GB;
import static org.apache.hadoop.ozone.OzoneConsts.MD5_HASH;
import static org.apache.hadoop.ozone.OzoneConsts.OZONE_URI_DELIMITER;
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.KEY_NOT_FOUND;
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.NO_SUCH_MULTIPART_UPLOAD_ERROR;
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.PARTIAL_RENAME;
Expand Down Expand Up @@ -100,6 +102,7 @@
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.RandomUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.hdds.client.DefaultReplicationConfig;
import org.apache.hadoop.hdds.client.ECReplicationConfig;
import org.apache.hadoop.hdds.client.ECReplicationConfig.EcCodec;
Expand Down Expand Up @@ -198,6 +201,7 @@
import org.junit.jupiter.api.TestMethodOrder;
import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.CsvSource;
import org.junit.jupiter.params.provider.EnumSource;
import org.junit.jupiter.params.provider.MethodSource;
Expand Down Expand Up @@ -1598,6 +1602,14 @@ static Stream<BucketLayout> bucketLayouts() {
);
}

static Stream<Arguments> bucketLayoutsWithEnablePaths() {
return bucketLayouts()
.flatMap(layout -> Stream.of(
Arguments.of(layout, true),
Arguments.of(layout, false)
));
}

@ParameterizedTest
@MethodSource("bucketLayouts")
void bucketUsedBytesOverWrite(BucketLayout bucketLayout)
Expand Down Expand Up @@ -1683,8 +1695,10 @@ private void bucketQuotaTestHelper(int keyLength, ReplicationConfig repConfig)
}

@ParameterizedTest
@MethodSource("bucketLayouts")
public void testBucketUsedNamespace(BucketLayout layout) throws IOException {
@MethodSource("bucketLayoutsWithEnablePaths")
public void testBucketUsedNamespace(BucketLayout layout, boolean enablePaths) throws IOException {
boolean originalEnablePaths = cluster.getOzoneManager().getConfig().isFileSystemPathEnabled();
cluster.getOzoneManager().getConfig().setFileSystemPathEnabled(enablePaths);
String volumeName = UUID.randomUUID().toString();
String bucketName = UUID.randomUUID().toString();
String value = "sample value";
Expand Down Expand Up @@ -1721,22 +1735,46 @@ public void testBucketUsedNamespace(BucketLayout layout) throws IOException {
// Test create a directory twice will not increase usedNamespace twice
client.createDirectory(volumeName, bucketName, directoryName2);
assertEquals(2L, getBucketUsedNamespace(volumeName, bucketName));
client.deleteKey(volumeName, bucketName,
OzoneFSUtils.addTrailingSlashIfNeeded(directoryName1), false);
assertEquals(1L, getBucketUsedNamespace(volumeName, bucketName));
client.deleteKey(volumeName, bucketName,
OzoneFSUtils.addTrailingSlashIfNeeded(directoryName2), false);
assertEquals(0L, getBucketUsedNamespace(volumeName, bucketName));

if (layout == BucketLayout.LEGACY) {
handleLegacyBucketDelete(volumeName, bucketName, directoryName1, directoryName2);
} else {
handleNonLegacyBucketDelete(client, volumeName, bucketName, directoryName1, directoryName2);
}

String multiComponentsDir = "dir1/dir2/dir3/dir4";
client.createDirectory(volumeName, bucketName, multiComponentsDir);
assertEquals(OzoneFSUtils.getFileCount(multiComponentsDir),
getBucketUsedNamespace(volumeName, bucketName));
} finally {
client.close();
cluster.getOzoneManager().getConfig().setFileSystemPathEnabled(originalEnablePaths);
}
}

private void handleLegacyBucketDelete(String volumeName, String bucketName, String dir1, String dir2)
throws IOException {
String rootPath = String.format("%s://%s.%s/", OzoneConsts.OZONE_URI_SCHEME, bucketName, volumeName);
cluster.getConf().set(FS_DEFAULT_NAME_KEY, rootPath);
FileSystem fs = FileSystem.get(cluster.getConf());

org.apache.hadoop.fs.Path dir1Path = new org.apache.hadoop.fs.Path(OZONE_URI_DELIMITER, dir1);
org.apache.hadoop.fs.Path dir2Path = new org.apache.hadoop.fs.Path(OZONE_URI_DELIMITER, dir2);

fs.delete(dir1Path, false);
assertEquals(1L, getBucketUsedNamespace(volumeName, bucketName));
fs.delete(dir2Path, false);
assertEquals(0L, getBucketUsedNamespace(volumeName, bucketName));
}

private void handleNonLegacyBucketDelete(RpcClient client, String volumeName, String bucketName, String dir1,
String dir2) throws IOException {
client.deleteKey(volumeName, bucketName, OzoneFSUtils.addTrailingSlashIfNeeded(dir1), false);
assertEquals(1L, getBucketUsedNamespace(volumeName, bucketName));
client.deleteKey(volumeName, bucketName, OzoneFSUtils.addTrailingSlashIfNeeded(dir2), false);
assertEquals(0L, getBucketUsedNamespace(volumeName, bucketName));
}

@ParameterizedTest
@MethodSource("bucketLayouts")
public void testMissingParentBucketUsedNamespace(BucketLayout layout)
Expand Down