HDDS-15182. [STS] Remove latent extra read on CopyObject api - make CopyPart work similarly #10203
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,6 +22,7 @@ | |
| import java.io.IOException; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.OptionalLong; | ||
| import java.util.UUID; | ||
| import org.apache.hadoop.fs.SafeModeAction; | ||
| import org.apache.hadoop.hdds.scm.container.common.helpers.ExcludeList; | ||
|
|
@@ -252,6 +253,17 @@ default void commitKey(OmKeyArgs args, long clientID) | |
| "this to be implemented, as write requests use a new approach."); | ||
| } | ||
|
|
||
| /** | ||
| * Commit a key and optionally return the stored modification time (epoch millis). | ||
| * <p> | ||
| * This is backward compatible with older OM versions which do not return | ||
| * the value in {@code CommitKeyResponse}. | ||
| */ | ||
| default OptionalLong commitKeyWithModificationTime(OmKeyArgs args, long clientID) throws IOException { | ||
|
Contributor
There was a problem hiding this comment. It looks like that LastModified element is a mandatory part of CopyObject and UploadPartCopy. https://docs.aws.amazon.com/AmazonS3/latest/API/API_CopyObject.html So without this patch, Ozone now returns incorrect LastModified? Since there is already lastModified field in CopyObjectResponse and CopyPartResult. Since it's mandatory for S3, we don't need to maintain both commitKeyWithModificationTime and commitKey, update commitKey to return long, instead of OptionalLong, making sure lastModified is returned after a successful commit, so we can get a clean logic and code.
Contributor
Author
There was a problem hiding this comment.
There were two cases previously per my understanding:
For both these cases, the patch now returns the actual lastModified that was set at the time the key was committed in the response itself so that a) no extra fetch is needed and b) it is more accurate
Contributor
Author
There was a problem hiding this comment.
@ChenSammi - would this be a breaking api change to commitKey for older clients or mixed client versions? |
||
| commitKey(args, clientID); | ||
| return OptionalLong.empty(); | ||
| } | ||
|
|
||
| /** | ||
| * Synchronize the key length. This will make the change from the client | ||
| * visible. The client is identified by the clientID. | ||
|
|
@@ -1146,7 +1158,6 @@ default CancelPrepareResponse cancelOzoneManagerPrepare() throws IOException { | |
| EchoRPCResponse echoRPCReq(byte[] payloadReq, int payloadSizeResp, | ||
| boolean writeToRatis) throws IOException; | ||
|
|
||
|
|
||
| /** | ||
| * Start the lease recovery of a file. | ||
| * | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.hadoop.ozone.s3.endpoint; | ||
|
|
||
| /** | ||
| * Result of a copy operation. | ||
| */ | ||
| public class CopyResult { | ||
| private final String eTag; | ||
| private final long size; | ||
| private final long modificationTime; | ||
|
|
||
| public CopyResult(String eTag, long size, long modificationTime) { | ||
| this.eTag = eTag; | ||
| this.size = size; | ||
| this.modificationTime = modificationTime; | ||
| } | ||
|
|
||
| public String getETag() { | ||
| return eTag; | ||
| } | ||
|
|
||
| public long getSize() { | ||
| return size; | ||
| } | ||
|
|
||
| public long getModificationTime() { | ||
| return modificationTime; | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
metadata is to persist in OM DB, a different goal. Please add a new field for LastModified value.