Skip to content

HDDS-6973. Refactor ObjectEndpoint. #3569

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
captainzmc merged 2 commits into from
Jun 30, 2022
Merged

HDDS-6973. Refactor ObjectEndpoint. #3569

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7af78e
HDDS-6973. Refactor ObjectEndpoint.
szetszwo Jun 29, 2022
31faae3
fix checkstyle.
szetszwo Jun 29, 2022
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
52 changes: 21 additions & 31 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 @@ -199,14 +199,13 @@ public Response put(
"Connection", "close").build();
}

output =
bucket.createKey(keyPath, length, replicationConfig, new HashMap<>());

if ("STREAMING-AWS4-HMAC-SHA256-PAYLOAD"
.equals(headers.getHeaderString("x-amz-content-sha256"))) {
body = new SignedChunksInputStream(body);
}

output = bucket.createKey(
keyPath, length, replicationConfig, new HashMap<>());
IOUtils.copy(body, output);

getMetrics().incCreateKeySuccess();
Expand Down Expand Up @@ -386,7 +385,7 @@ public Response get(
}
}

private void addLastModifiedDate(
static void addLastModifiedDate(
ResponseBuilder responseBuilder, OzoneKey key) {

ZonedDateTime lastModificationTime = key.getModificationTime()
Expand Down Expand Up @@ -594,6 +593,10 @@ public Response initializeMultipartUpload(

private ReplicationConfig getReplicationConfig(OzoneBucket ozoneBucket,
String storageType) throws OS3Exception {
if (StringUtils.isEmpty(storageType)) {
storageType = S3StorageType.getDefault(ozoneConfiguration).toString();
}

ReplicationConfig clientConfiguredReplicationConfig = null;
String replication = ozoneConfiguration.get(OZONE_REPLICATION);
if (replication != null) {
Expand Down Expand Up @@ -839,6 +842,15 @@ public void setHeaders(HttpHeaders headers) {
this.headers = headers;
}

static void copy(InputStream src, long srcKeyLen,
String destKey, OzoneBucket destBucket,
ReplicationConfig replication) throws IOException {
try (OzoneOutputStream dest = destBucket.createKey(
destKey, srcKeyLen, replication, new HashMap<>())) {
IOUtils.copy(src, dest);
}
}

private CopyObjectResponse copyObject(String copyHeader,
OzoneBucket destBucket,
String destkey,
Expand All @@ -850,9 +862,6 @@ private CopyObjectResponse copyObject(String copyHeader,

String sourceBucket = result.getLeft();
String sourceKey = result.getRight();
OzoneInputStream sourceInputStream = null;
OzoneOutputStream destOutputStream = null;
boolean closed = false;
try {
// Checking whether we trying to copying to it self.

Expand Down Expand Up @@ -883,25 +892,15 @@ private CopyObjectResponse copyObject(String copyHeader,


OzoneBucket sourceOzoneBucket = getBucket(sourceBucket);
OzoneBucket destOzoneBucket = destBucket;

OzoneKeyDetails sourceKeyDetails = sourceOzoneBucket.getKey(sourceKey);
long sourceKeyLen = sourceKeyDetails.getDataSize();

sourceInputStream = sourceOzoneBucket.readKey(sourceKey);

destOutputStream = destOzoneBucket
.createKey(destkey, sourceKeyLen, replicationConfig, new HashMap<>());

IOUtils.copy(sourceInputStream, destOutputStream);

// Closing here, as if we don't call close this key will not commit in
// OM, and getKey fails.
sourceInputStream.close();
destOutputStream.close();
closed = true;
try (OzoneInputStream src = sourceOzoneBucket.readKey(sourceKey)) {
copy(src, sourceKeyLen, destkey, destBucket, replicationConfig);
}

OzoneKeyDetails destKeyDetails = destOzoneBucket.getKey(destkey);
final OzoneKeyDetails destKeyDetails = destBucket.getKey(destkey);

getMetrics().incCopyObjectSuccess();
CopyObjectResponse copyObjectResponse = new CopyObjectResponse();
Expand All @@ -918,15 +917,6 @@ private CopyObjectResponse copyObject(String copyHeader,
destBucket + "/" + destkey, ex);
}
throw ex;
} finally {
if (!closed) {
if (sourceInputStream != null) {
sourceInputStream.close();
}
if (destOutputStream != null) {
destOutputStream.close();
}
}
}
}

Expand Down Expand Up @@ -991,7 +981,7 @@ private static OptionalLong parseAndValidateDate(String ozoneDateStr) {
}
}

private boolean checkCopySourceModificationTime(Long lastModificationTime,
static boolean checkCopySourceModificationTime(Long lastModificationTime,
String copySourceIfModifiedSinceStr,
String copySourceIfUnmodifiedSinceStr) {
long copySourceIfModifiedSince = Long.MIN_VALUE;
Expand Down