Skip to content

HDDS-8437. [FSO] S3A compatibility - dfs -mkdir creates a zero byte file instead of a directory #5124

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
errose28 merged 6 commits into from
Sep 5, 2023
Merged

HDDS-8437. [FSO] S3A compatibility - dfs -mkdir creates a zero byte file instead of a directory #5124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
15ea2c7
Create directory if body is empty
mladjan-gadzic Jul 19, 2023
750158e
Merge remote-tracking branch 'upstream/master' into HDDS-8437
mladjan-gadzic Aug 14, 2023
b2440b6
Create dir if key path has trailing slash
mladjan-gadzic Aug 15, 2023
43dbf72
Revert non necessary change
mladjan-gadzic Aug 16, 2023
208012e
Uze x-amz-decoded-content-length header instead of trailing slash
mladjan-gadzic Aug 29, 2023
8730ee1
Address review comments
mladjan-gadzic Aug 29, 2023
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
18 changes: 12 additions & 6 deletions hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
import org.apache.hadoop.ozone.s3.util.RFC1123Util;
import org.apache.hadoop.ozone.s3.util.RangeHeader;
import org.apache.hadoop.ozone.s3.util.RangeHeaderParserUtil;
import org.apache.hadoop.ozone.s3.util.S3Consts;
import org.apache.hadoop.ozone.s3.util.S3StorageType;
import org.apache.hadoop.ozone.s3.util.S3Utils;
import org.apache.hadoop.ozone.web.utils.OzoneUtils;
Expand Down Expand Up @@ -241,13 +242,18 @@ public Response put(
"Connection", "close").build();
}

if (length == 0 &&
ozoneConfiguration
.getBoolean(OZONE_S3G_FSO_DIRECTORY_CREATION_ENABLED,
OZONE_S3G_FSO_DIRECTORY_CREATION_ENABLED_DEFAULT) &&
bucket.getBucketLayout() == BucketLayout.FILE_SYSTEM_OPTIMIZED) {
boolean canCreateDirectory = ozoneConfiguration
.getBoolean(OZONE_S3G_FSO_DIRECTORY_CREATION_ENABLED,
OZONE_S3G_FSO_DIRECTORY_CREATION_ENABLED_DEFAULT) &&
bucket.getBucketLayout() == BucketLayout.FILE_SYSTEM_OPTIMIZED;

String amzDecodedLength =
headers.getHeaderString(S3Consts.DECODED_CONTENT_LENGTH_HEADER);
boolean hasAmzDecodedLengthZero = amzDecodedLength != null &&
Long.parseLong(amzDecodedLength) == 0;
if (canCreateDirectory &&
(length == 0 || hasAmzDecodedLengthZero)) {
s3GAction = S3GAction.CREATE_DIRECTORY;
// create directory
getClientProtocol()
.createDirectory(volume.getName(), bucketName, keyPath);
return Response.ok().status(HttpStatus.SC_OK).build();
Expand Down
3 changes: 3 additions & 0 deletions hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/S3Consts.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,7 @@ private S3Consts() {

public static final String CUSTOM_METADATA_HEADER_PREFIX = "x-amz-meta-";

public static final String DECODED_CONTENT_LENGTH_HEADER =
"x-amz-decoded-content-length";

}