Skip to content

HDDS-10084. Replace LEGACY in integration test with default layout from config#5940

Merged
errose28 merged 3 commits intoapache:masterfrom
adoroszlai:HDDS-10084
Jan 8, 2024
Merged

HDDS-10084. Replace LEGACY in integration test with default layout from config#5940
errose28 merged 3 commits intoapache:masterfrom
adoroszlai:HDDS-10084

Conversation

@adoroszlai
Copy link
Contributor

What changes were proposed in this pull request?

Replace hard-coded BucketLayout.LEGACY with the configured default bucket layout:

public static OzoneBucket createVolumeAndBucket(OzoneClient client)
throws IOException {
return createVolumeAndBucket(client, BucketLayout.LEGACY);
}

and similarly here:

public static OzoneBucket createVolumeAndBucket(OzoneClient client,
String volumeName, String bucketName) throws IOException {
return createVolumeAndBucket(client, volumeName, bucketName,
BucketLayout.LEGACY);

Keep using LEGACY in two tests that fail with the default FILE_SYSTEM_OPTIMIZED layout.

https://issues.apache.org/jira/browse/HDDS-10084

How was this patch tested?

CI:
https://github.com/adoroszlai/ozone/actions/runs/7440054515

@adoroszlai adoroszlai added the test label Jan 7, 2024
@adoroszlai adoroszlai self-assigned this Jan 7, 2024
@SaketaChalamchala
Copy link
Contributor

cc @SaketaChalamchala

Copy link
Contributor

@errose28 errose28 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @adoroszlai. Functionally LGTM. Maybe we want to add comments to that refer to the Jira(s) to fix the tests that are manually specifying LEGACY layout?

@errose28 errose28 merged commit c24fd8e into apache:master Jan 8, 2024
@adoroszlai adoroszlai deleted the HDDS-10084 branch January 8, 2024 21:58
@adoroszlai
Copy link
Contributor Author

Thanks @errose28 for reviewing and merging this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants